Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
8516540e
提交
8516540e
authored
9 年前
作者:
Noel Grandin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix NPE in querying spatial data through a sub-select
上级
30ad944b
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
25 行增加
和
10 行删除
+25
-10
changelog.html
h2/src/docsrc/html/changelog.html
+2
-0
IndexCursor.java
h2/src/main/org/h2/index/IndexCursor.java
+1
-1
SpatialIndex.java
h2/src/main/org/h2/index/SpatialIndex.java
+1
-1
SpatialTreeIndex.java
h2/src/main/org/h2/index/SpatialTreeIndex.java
+2
-2
ViewIndex.java
h2/src/main/org/h2/index/ViewIndex.java
+2
-2
MVSpatialIndex.java
h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
+2
-2
TestSpatial.java
h2/src/test/org/h2/test/db/TestSpatial.java
+15
-2
没有找到文件。
h2/src/docsrc/html/changelog.html
浏览文件 @
8516540e
...
@@ -21,6 +21,8 @@ Change Log
...
@@ -21,6 +21,8 @@ Change Log
<h2>
Next Version (unreleased)
</h2>
<h2>
Next Version (unreleased)
</h2>
<ul>
<ul>
<li>
Fix NPE in querying spatial data through a sub-select.
</li>
<li>
Fix bug where a lock on the SYS table was not released when closing a session that contained a temp
<li>
Fix bug where a lock on the SYS table was not released when closing a session that contained a temp
table with an LOB column.
table with an LOB column.
</li>
</li>
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/index/IndexCursor.java
浏览文件 @
8516540e
...
@@ -164,7 +164,7 @@ public class IndexCursor implements Cursor {
...
@@ -164,7 +164,7 @@ public class IndexCursor implements Cursor {
if
(!
alwaysFalse
)
{
if
(!
alwaysFalse
)
{
if
(
intersects
!=
null
&&
index
instanceof
SpatialIndex
)
{
if
(
intersects
!=
null
&&
index
instanceof
SpatialIndex
)
{
cursor
=
((
SpatialIndex
)
index
).
findByGeometry
(
tableFilter
,
cursor
=
((
SpatialIndex
)
index
).
findByGeometry
(
tableFilter
,
intersects
);
start
,
end
,
intersects
);
}
else
{
}
else
{
cursor
=
index
.
find
(
tableFilter
,
start
,
end
);
cursor
=
index
.
find
(
tableFilter
,
start
,
end
);
}
}
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/index/SpatialIndex.java
浏览文件 @
8516540e
...
@@ -24,6 +24,6 @@ public interface SpatialIndex extends Index {
...
@@ -24,6 +24,6 @@ public interface SpatialIndex extends Index {
* null for anything
* null for anything
* @return the cursor to iterate over the results
* @return the cursor to iterate over the results
*/
*/
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
intersection
);
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
);
}
}
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/index/SpatialTreeIndex.java
浏览文件 @
8516540e
...
@@ -168,9 +168,9 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
...
@@ -168,9 +168,9 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
}
}
@Override
@Override
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
intersection
)
{
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
if
(
intersection
==
null
)
{
if
(
intersection
==
null
)
{
return
find
(
filter
.
getSession
());
return
find
(
filter
.
getSession
()
,
first
,
last
);
}
}
return
new
SpatialCursor
(
return
new
SpatialCursor
(
treeMap
.
findIntersectingKeys
(
getKey
(
intersection
)),
table
,
treeMap
.
findIntersectingKeys
(
getKey
(
intersection
)),
table
,
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/index/ViewIndex.java
浏览文件 @
8516540e
...
@@ -160,8 +160,8 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
...
@@ -160,8 +160,8 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
}
}
@Override
@Override
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
intersection
)
{
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
return
find
(
filter
.
getSession
(),
null
,
null
,
intersection
);
return
find
(
filter
.
getSession
(),
first
,
last
,
intersection
);
}
}
private
static
Query
prepareSubQuery
(
String
sql
,
Session
session
,
int
[]
masks
,
private
static
Query
prepareSubQuery
(
String
sql
,
Session
session
,
int
[]
masks
,
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
浏览文件 @
8516540e
...
@@ -197,10 +197,10 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
...
@@ -197,10 +197,10 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
}
}
@Override
@Override
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
intersection
)
{
public
Cursor
findByGeometry
(
TableFilter
filter
,
SearchRow
first
,
SearchRow
last
,
SearchRow
intersection
)
{
Session
session
=
filter
.
getSession
();
Session
session
=
filter
.
getSession
();
if
(
intersection
==
null
)
{
if
(
intersection
==
null
)
{
return
find
(
session
);
return
find
(
session
,
first
,
last
);
}
}
Iterator
<
SpatialKey
>
cursor
=
Iterator
<
SpatialKey
>
cursor
=
spatialMap
.
findIntersectingKeys
(
getKey
(
intersection
));
spatialMap
.
findIntersectingKeys
(
getKey
(
intersection
));
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestSpatial.java
浏览文件 @
8516540e
...
@@ -39,7 +39,7 @@ import org.h2.value.ValueGeometry;
...
@@ -39,7 +39,7 @@ import org.h2.value.ValueGeometry;
*/
*/
public
class
TestSpatial
extends
TestBase
{
public
class
TestSpatial
extends
TestBase
{
private
String
url
=
"spatial"
;
private
static
final
String
url
=
"spatial"
;
/**
/**
* Run just this test.
* Run just this test.
...
@@ -60,13 +60,13 @@ public class TestSpatial extends TestBase {
...
@@ -60,13 +60,13 @@ public class TestSpatial extends TestBase {
}
}
if
(
DataType
.
GEOMETRY_CLASS
!=
null
)
{
if
(
DataType
.
GEOMETRY_CLASS
!=
null
)
{
deleteDb
(
"spatial"
);
deleteDb
(
"spatial"
);
url
=
"spatial"
;
testSpatial
();
testSpatial
();
deleteDb
(
"spatial"
);
deleteDb
(
"spatial"
);
}
}
}
}
private
void
testSpatial
()
throws
SQLException
{
private
void
testSpatial
()
throws
SQLException
{
testBug1
();
testSpatialValues
();
testSpatialValues
();
testOverlap
();
testOverlap
();
testNotOverlap
();
testNotOverlap
();
...
@@ -94,6 +94,19 @@ public class TestSpatial extends TestBase {
...
@@ -94,6 +94,19 @@ public class TestSpatial extends TestBase {
testNullableGeometryInsert
();
testNullableGeometryInsert
();
testNullableGeometryUpdate
();
testNullableGeometryUpdate
();
}
}
private
void
testBug1
()
throws
SQLException
{
deleteDb
(
"spatial"
);
Connection
conn
=
getConnection
(
url
);
Statement
stat
=
conn
.
createStatement
();
stat
.
execute
(
"CREATE TABLE VECTORS (ID INTEGER NOT NULL, GEOM GEOMETRY, S INTEGER)"
);
stat
.
execute
(
"INSERT INTO VECTORS(ID, GEOM, S) VALUES(0, 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))', 1)"
);
stat
.
executeQuery
(
"select * from (select * from VECTORS) WHERE S=1 AND GEOM && 'POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))'"
);
conn
.
close
();
deleteDb
(
"spatial"
);
}
private
void
testHashCode
()
{
private
void
testHashCode
()
{
ValueGeometry
geomA
=
ValueGeometry
ValueGeometry
geomA
=
ValueGeometry
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论