Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
fe593d24
提交
fe593d24
authored
3月 28, 2014
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Geometry: the returned geometry object is copied when needed.
上级
a268defe
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
71 行增加
和
16 行删除
+71
-16
changelog.html
h2/src/docsrc/html/changelog.html
+1
-1
SpatialTreeIndex.java
h2/src/main/org/h2/index/SpatialTreeIndex.java
+1
-1
MVSpatialIndex.java
h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
+2
-2
ValueGeometry.java
h2/src/main/org/h2/value/ValueGeometry.java
+37
-10
TestSpatial.java
h2/src/test/org/h2/test/db/TestSpatial.java
+30
-2
没有找到文件。
h2/src/docsrc/html/changelog.html
浏览文件 @
fe593d24
...
...
@@ -24,7 +24,7 @@ Change Log
</li><li>
Column constraints are also visible in views (patch from Nicolas Fortin for H2GIS).
</li><li>
Granting a additional right to a role that already had a right for that table was not working.
</li><li>
Spatial index: a few bugs have been fixed (using spatial constraints in views,
transferring geometry objects over TCP/IP).
transferring geometry objects over TCP/IP
, the returned geometry object is copied when needed
).
</li><li>
Issue 551: the datatype documentation was incorrect (found by Bernd Eckenfels).
</li><li>
Issue 368: ON DUPLICATE KEY UPDATE did not work for multi-row inserts.
Test case from Angus Macdonald.
...
...
h2/src/main/org/h2/index/SpatialTreeIndex.java
浏览文件 @
fe593d24
...
...
@@ -131,7 +131,7 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
private
SpatialKey
getEnvelope
(
SearchRow
row
)
{
Value
v
=
row
.
getValue
(
columnIds
[
0
]);
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
();
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
NoCopy
();
Envelope
env
=
g
.
getEnvelopeInternal
();
return
new
SpatialKey
(
row
.
getKey
(),
(
float
)
env
.
getMinX
(),
(
float
)
env
.
getMaxX
(),
...
...
h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
浏览文件 @
fe593d24
...
...
@@ -168,7 +168,7 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
return
null
;
}
Value
v
=
r
.
getValue
(
columnIds
[
0
]);
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
();
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
NoCopy
();
Envelope
env
=
g
.
getEnvelopeInternal
();
return
new
SpatialKey
(
r
.
getKey
(),
(
float
)
env
.
getMinX
(),
(
float
)
env
.
getMaxX
(),
...
...
@@ -222,7 +222,7 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
private
SpatialKey
getEnvelope
(
SearchRow
row
)
{
Value
v
=
row
.
getValue
(
columnIds
[
0
]);
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
();
Geometry
g
=
((
ValueGeometry
)
v
.
convertTo
(
Value
.
GEOMETRY
)).
getGeometry
NoCopy
();
Envelope
env
=
g
.
getEnvelopeInternal
();
return
new
SpatialKey
(
row
.
getKey
(),
(
float
)
env
.
getMinX
(),
(
float
)
env
.
getMaxX
(),
...
...
h2/src/main/org/h2/value/ValueGeometry.java
浏览文件 @
fe593d24
...
...
@@ -12,6 +12,7 @@ import java.util.Arrays;
import
com.vividsolutions.jts.geom.CoordinateSequence
;
import
com.vividsolutions.jts.geom.CoordinateSequenceFilter
;
import
com.vividsolutions.jts.geom.PrecisionModel
;
import
org.h2.message.DbException
;
import
org.h2.util.StringUtils
;
import
com.vividsolutions.jts.geom.Envelope
;
...
...
@@ -106,6 +107,22 @@ public class ValueGeometry extends Value {
}
}
/**
* Get or create a geometry value for the given geometry.
*
* @param s the WKT representation of the geometry
* @return the value
*/
public
static
ValueGeometry
get
(
String
s
,
int
srid
)
{
try
{
GeometryFactory
geometryFactory
=
new
GeometryFactory
(
new
PrecisionModel
(),
srid
);
Geometry
g
=
new
WKTReader
(
geometryFactory
).
read
(
s
);
return
get
(
g
);
}
catch
(
ParseException
ex
)
{
throw
DbException
.
convert
(
ex
);
}
}
/**
* Get or create a geometry value for the given geometry.
*
...
...
@@ -116,7 +133,17 @@ public class ValueGeometry extends Value {
return
(
ValueGeometry
)
Value
.
cache
(
new
ValueGeometry
(
bytes
,
null
));
}
/**
* Get a copy of geometry object. Geometry object is mutable. The returned
* object is therefore copied before returning.
*
* @return a copy of the geometry object
*/
public
Geometry
getGeometry
()
{
return
(
Geometry
)
getGeometryNoCopy
().
clone
();
}
public
Geometry
getGeometryNoCopy
()
{
if
(
geometry
==
null
)
{
try
{
geometry
=
new
WKBReader
().
read
(
bytes
);
...
...
@@ -136,8 +163,8 @@ public class ValueGeometry extends Value {
*/
public
boolean
intersectsBoundingBox
(
ValueGeometry
r
)
{
// the Geometry object caches the envelope
return
getGeometry
().
getEnvelopeInternal
().
intersects
(
r
.
getGeometry
().
getEnvelopeInternal
());
return
getGeometry
NoCopy
().
getEnvelopeInternal
().
intersects
(
r
.
getGeometry
NoCopy
().
getEnvelopeInternal
());
}
/**
...
...
@@ -148,8 +175,8 @@ public class ValueGeometry extends Value {
*/
public
Value
getEnvelopeUnion
(
ValueGeometry
r
)
{
GeometryFactory
gf
=
new
GeometryFactory
();
Envelope
mergedEnvelope
=
new
Envelope
(
getGeometry
().
getEnvelopeInternal
());
mergedEnvelope
.
expandToInclude
(
r
.
getGeometry
().
getEnvelopeInternal
());
Envelope
mergedEnvelope
=
new
Envelope
(
getGeometry
NoCopy
().
getEnvelopeInternal
());
mergedEnvelope
.
expandToInclude
(
r
.
getGeometry
NoCopy
().
getEnvelopeInternal
());
return
get
(
gf
.
toGeometry
(
mergedEnvelope
));
}
...
...
@@ -160,8 +187,8 @@ public class ValueGeometry extends Value {
* @return the intersection of this geometry envelope and another
*/
public
ValueGeometry
getEnvelopeIntersection
(
ValueGeometry
r
)
{
Envelope
e1
=
getGeometry
().
getEnvelopeInternal
();
Envelope
e2
=
r
.
getGeometry
().
getEnvelopeInternal
();
Envelope
e1
=
getGeometry
NoCopy
().
getEnvelopeInternal
();
Envelope
e2
=
r
.
getGeometry
NoCopy
().
getEnvelopeInternal
();
Envelope
e3
=
e1
.
intersection
(
e2
);
// try to re-use the object
if
(
e3
==
e1
)
{
...
...
@@ -188,8 +215,8 @@ public class ValueGeometry extends Value {
@Override
protected
int
compareSecure
(
Value
v
,
CompareMode
mode
)
{
Geometry
g
=
((
ValueGeometry
)
v
).
getGeometry
();
return
getGeometry
().
compareTo
(
g
);
Geometry
g
=
((
ValueGeometry
)
v
).
getGeometry
NoCopy
();
return
getGeometry
NoCopy
().
compareTo
(
g
);
}
@Override
...
...
@@ -225,7 +252,7 @@ public class ValueGeometry extends Value {
@Override
public
void
set
(
PreparedStatement
prep
,
int
parameterIndex
)
throws
SQLException
{
prep
.
setObject
(
parameterIndex
,
getGeometry
());
prep
.
setObject
(
parameterIndex
,
getGeometry
NoCopy
());
}
@Override
...
...
@@ -252,7 +279,7 @@ public class ValueGeometry extends Value {
* @return the well-known-text
*/
public
String
getWKT
()
{
return
new
WKTWriter
().
write
(
getGeometry
());
return
new
WKTWriter
().
write
(
getGeometry
NoCopy
());
}
/**
...
...
h2/src/test/org/h2/test/db/TestSpatial.java
浏览文件 @
fe593d24
...
...
@@ -15,6 +15,8 @@ import java.sql.Types;
import
java.util.Random
;
import
com.vividsolutions.jts.geom.Envelope
;
import
com.vividsolutions.jts.geom.Point
;
import
com.vividsolutions.jts.geom.util.AffineTransformation
;
import
org.h2.api.Aggregate
;
import
org.h2.test.TestBase
;
import
org.h2.tools.SimpleResultSet
;
...
...
@@ -84,6 +86,7 @@ public class TestSpatial extends TestBase {
testAggregateWithGeometry
();
testTableViewSpatialPredicate
();
testValueGeometryScript
();
testInPlaceUpdate
();
}
private
void
testHashCode
()
{
...
...
@@ -582,13 +585,12 @@ public class TestSpatial extends TestBase {
*/
private
void
testWKB
()
{
ValueGeometry
geom3d
=
ValueGeometry
.
get
(
"POLYGON ((67 13 6, 67 18 5, 59 18 4, 59 13 6, 67 13 6))"
);
"POLYGON ((67 13 6, 67 18 5, 59 18 4, 59 13 6, 67 13 6))"
,
27572
);
ValueGeometry
copy
=
ValueGeometry
.
get
(
geom3d
.
getBytes
());
assertEquals
(
6
,
copy
.
getGeometry
().
getCoordinates
()[
0
].
z
);
assertEquals
(
5
,
copy
.
getGeometry
().
getCoordinates
()[
1
].
z
);
assertEquals
(
4
,
copy
.
getGeometry
().
getCoordinates
()[
2
].
z
);
// Test SRID
geom3d
.
getGeometry
().
setSRID
(
27572
);
copy
=
ValueGeometry
.
get
(
geom3d
.
getBytes
());
assertEquals
(
27572
,
copy
.
getGeometry
().
getSRID
());
}
...
...
@@ -802,4 +804,30 @@ public class TestSpatial extends TestBase {
conn
.
close
();
}
}
/**
* If the user mutate the geometry of the object, the object cache must not
* be updated.
*/
private
void
testInPlaceUpdate
()
throws
SQLException
{
Connection
conn
=
getConnection
(
url
);
try
{
ResultSet
rs
=
conn
.
createStatement
().
executeQuery
(
"SELECT 'POINT(1 1)'::geometry"
);
assertTrue
(
rs
.
next
());
// Mutate the geometry
((
Geometry
)
rs
.
getObject
(
1
)).
apply
(
new
AffineTransformation
(
1
,
0
,
1
,
1
,
0
,
1
));
rs
.
close
();
rs
=
conn
.
createStatement
().
executeQuery
(
"SELECT 'POINT(1 1)'::geometry"
);
assertTrue
(
rs
.
next
());
// Check if the geometry is the one requested
assertEquals
(
1
,
((
Point
)
rs
.
getObject
(
1
)).
getX
());
assertEquals
(
1
,
((
Point
)
rs
.
getObject
(
1
)).
getY
());
rs
.
close
();
}
finally
{
conn
.
close
();
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论