This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from c4d8854b8b Bump the maven-patch-group group with 5 updates
new ccc23d7823 GH-3026: spatial index per graph and kryo serialization
new 2523f5a7ac Spatial indexer: restricted graphs, list visible graphs,
separated tasks from servlet, empty dataset, warn if srs or index file not set,
disabled geometry serde, consolidated buildOrLoad methods, cleaned logging.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/jena/sparql/util/Context.java | 10 +-
.../main/java/org/apache/jena/system/AutoTxn.java | 55 ++
.../src/main/java/org/apache/jena/system/Txn.java | 44 ++
.../src/main/java/org/apache/jena/web/HttpSC.java | 2 +-
.../test/java/org/apache/jena/system/TestTxn.java | 77 ++-
jena-benchmarks/jena-benchmarks-jmh/pom.xml | 7 +
.../spatial/index/BenchmarkSpatialIndex.java} | 90 ++-
.../geosparql/spatial/index/SpatialIndex510.java | 94 ++++
.../spatial/index/SpatialIndexCurrent.java | 96 ++++
.../spatial/index/SpatialIndexLifeCycle.java | 12 +-
.../jena-benchmarks-shadedJena510/pom.xml | 5 +
.../org/apache/jena/fuseki/build/FusekiConfig.java | 2 +-
jena-fuseki2/jena-fuseki-geosparql/pom.xml | 12 +-
.../jena/fuseki/geosparql/DatasetOperations.java | 4 +-
jena-fuseki2/jena-fuseki-main/pom.xml | 24 +-
jena-fuseki2/jena-fuseki-mod-geosparql/.gitignore | 1 +
jena-fuseki2/jena-fuseki-mod-geosparql/pom.xml | 169 ++++++
.../fuseki/mod/geosparql/FMod_SpatialIndexer.java | 125 +++++
.../mod/geosparql/SpatialIndexerService.java | 625 +++++++++++++++++++++
...rg.apache.jena.fuseki.main.sys.FusekiAutoModule | 1 +
.../src/main/resources/spatial-indexer/index.html | 389 +++++++++++++
.../mod/geosparql/TestFMod_SpatialIndexer.java | 168 ++++++
.../mod/geosparql/TestSpatialIndexerTasks.java | 209 +++++++
.../src/test/resources/log4j2-test.properties | 2 +-
jena-fuseki2/jena-fuseki-server/pom.xml | 12 +-
jena-fuseki2/pom.xml | 2 +
jena-geosparql/pom.xml | 28 +-
.../org/apache/jena/geosparql/InitGeoSPARQL.java | 2 +-
.../jena/geosparql/assembler/GeoAssembler.java | 54 +-
.../jena/geosparql/assembler/VocabGeoSPARQL.java | 4 +
.../geosparql/configuration/GeoSPARQLConfig.java | 29 +-
.../configuration/GeoSPARQLOperations.java | 88 ++-
.../jena/geosparql/configuration/SrsException.java | 1 +
.../geo/topological/GenericPropertyFunction.java | 16 +-
.../topological/SpatialObjectGeometryLiteral.java | 3 -
.../geosparql/implementation/DimensionInfo.java | 5 +-
.../geosparql/implementation/GeometryWrapper.java | 11 +-
.../geosparql/implementation/SRSInfoException.java | 1 +
.../implementation/UnitsConversionException.java | 1 +
.../geosparql/implementation/UnitsOfMeasure.java | 6 +-
.../implementation/datatype/GMLDatatype.java | 7 +-
.../implementation/datatype/GeoJSONDatatype.java | 6 -
.../implementation/datatype/WKTDatatype.java | 5 -
.../jts/CustomCoordinateSequence.java | 5 +-
.../jts/CustomCoordinateSequenceFactory.java | 2 +
.../implementation/jts/CustomGeometryFactory.java | 5 +-
.../implementation/jts/GeometryTransformation.java | 9 +-
.../registry/MathTransformRegistry.java | 4 -
.../implementation/registry/SRSRegistry.java | 5 +-
.../implementation/registry/UnitsURIException.java | 1 +
.../jena/geosparql/kryo/EnvelopeSerializer.java | 50 ++
.../geosparql/kryo/GeometrySerializerJtsWkb.java | 72 +++
.../apache/jena/geosparql/kryo/NodeSerializer.java | 346 ++++++++++++
.../jena/geosparql/kryo/TripleSerializer.java | 37 +-
.../jena/geosparql/spatial/SearchEnvelope.java | 29 +-
.../jena/geosparql/spatial/SpatialIndex.java | 519 +----------------
.../geosparql/spatial/SpatialIndexConstants.java | 16 +-
.../geosparql/spatial/SpatialIndexException.java | 1 +
.../geosparql/spatial/SpatialIndexFindUtils.java | 205 +++++++
.../jena/geosparql/spatial/SpatialIndexItem.java | 24 +-
.../geosparql/spatial/SpatialIndexStorage.java | 14 +-
.../spatial/index/compat/SpatialIndexIo.java | 66 +++
.../spatial/index/v1/SpatialIndexAdapterV1.java | 84 +++
.../v1/SpatialIndexV1.java} | 92 ++-
.../spatial/index/v2/GeometryGenerator.java | 175 ++++++
.../index/v2/KryoRegistratorSpatialIndexV2.java | 105 ++++
.../spatial/index/v2/STRtreePerGraph.java | 192 +++++++
.../index/v2/STRtreePerGraphSerializer.java | 50 ++
.../geosparql/spatial/index/v2/STRtreeUtils.java | 106 ++++
.../spatial/index/v2/SpatialIndexHeader.java | 83 +++
.../spatial/index/v2/SpatialIndexIoKryo.java | 244 ++++++++
.../spatial/index/v2/SpatialIndexLib.java | 409 ++++++++++++++
.../spatial/index/v2/SpatialIndexPerGraph.java | 160 ++++++
.../index/v2/SpatialIndexerComputation.java | 205 +++++++
.../GenericSpatialPropertyFunction.java | 16 +-
.../jena/geosparql/spatial/task/BasicTask.java | 57 ++
.../jena/geosparql/spatial/task/TaskState.java | 19 +-
.../jena/geosparql/spatial/task/TaskThread.java | 222 ++++++++
.../jts/index/strtree/STRtreeSerializer.java | 168 ++++++
.../geosparql/geo/topological/CancelQueryTest.java | 5 +-
.../topological/GenericPropertyFunctionTest.java | 93 +--
.../geo/topological/QueryRewriteTestData.java | 107 ++--
.../SpatialObjectGeometryLiteralTest.java | 25 +-
.../AbstractSpatialIndexGraphLookpTest.java | 199 +++++++
.../jena/geosparql/spatial/SearchEnvelopeTest.java | 18 +-
.../geosparql/spatial/SpatialIndexTestData.java | 44 +-
.../spatial/TestSpatialIndexGraphLookupV1.java | 28 +-
.../spatial/TestSpatialIndexGraphLookupV2.java | 14 +-
.../spatial/index/v2/SimpleGraphSerializer.java | 57 ++
.../spatial/index/v2/SpatialIndexTest.java | 139 +++++
.../spatial/index/v2/TestNodeSerializer.java | 118 ++++
.../GenericSpatialPropertyFunctionTest.java | 8 +-
.../cardinal/EastGeomPFTest.java | 19 +-
.../property_functions/cardinal/EastPFTest.java | 15 +-
.../cardinal/WestGeomPFTest.java | 16 +-
.../property_functions/cardinal/WestPFTest.java | 15 +-
pom.xml | 80 ++-
97 files changed, 6300 insertions(+), 1001 deletions(-)
create mode 100644 jena-arq/src/main/java/org/apache/jena/system/AutoTxn.java
copy
jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/{sparql/engine/join/BenchmarkHashJoin.java
=> geosparql/spatial/index/BenchmarkSpatialIndex.java} (53%)
create mode 100644
jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/geosparql/spatial/index/SpatialIndex510.java
create mode 100644
jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/geosparql/spatial/index/SpatialIndexCurrent.java
copy jena-arq/src/main/java/org/apache/jena/atlas/json/JsonPrimitive.java =>
jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/geosparql/spatial/index/SpatialIndexLifeCycle.java
(74%)
create mode 100644 jena-fuseki2/jena-fuseki-mod-geosparql/.gitignore
create mode 100644 jena-fuseki2/jena-fuseki-mod-geosparql/pom.xml
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/FMod_SpatialIndexer.java
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/main/java/org/apache/jena/fuseki/mod/geosparql/SpatialIndexerService.java
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/main/resources/META-INF/services/org.apache.jena.fuseki.main.sys.FusekiAutoModule
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/main/resources/spatial-indexer/index.html
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/test/java/org/apache/jena/fuseki/mod/geosparql/TestFMod_SpatialIndexer.java
create mode 100644
jena-fuseki2/jena-fuseki-mod-geosparql/src/test/java/org/apache/jena/fuseki/mod/geosparql/TestSpatialIndexerTasks.java
copy jena-fuseki2/{jena-fuseki-main =>
jena-fuseki-mod-geosparql}/src/test/resources/log4j2-test.properties (96%)
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/kryo/EnvelopeSerializer.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/kryo/GeometrySerializerJtsWkb.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/kryo/NodeSerializer.java
copy
jena-arq/src/main/java/org/apache/jena/sparql/util/graph/FindableGraph.java =>
jena-geosparql/src/main/java/org/apache/jena/geosparql/kryo/TripleSerializer.java
(50%)
copy
jena-arq/src/main/java/org/apache/jena/sparql/function/scripting/ScriptLangSymbols.java
=>
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexConstants.java
(62%)
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/SpatialIndexFindUtils.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/compat/SpatialIndexIo.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v1/SpatialIndexAdapterV1.java
copy
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/{SpatialIndex.java
=> index/v1/SpatialIndexV1.java} (84%)
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/GeometryGenerator.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/KryoRegistratorSpatialIndexV2.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/STRtreePerGraph.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/STRtreePerGraphSerializer.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/STRtreeUtils.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexHeader.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexIoKryo.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexLib.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexPerGraph.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexerComputation.java
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/BasicTask.java
copy
jena-arq/src/main/java/org/apache/jena/atlas/data/SerializationFactory.java =>
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/TaskState.java
(62%)
create mode 100644
jena-geosparql/src/main/java/org/apache/jena/geosparql/spatial/task/TaskThread.java
create mode 100644
jena-geosparql/src/main/java/org/locationtech/jts/index/strtree/STRtreeSerializer.java
create mode 100644
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/AbstractSpatialIndexGraphLookpTest.java
copy
jena-integration-tests/src/test/java/org/apache/jena/test/rdflink/TestRDFLinkLocalTDB1.java
=>
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/TestSpatialIndexGraphLookupV1.java
(55%)
copy
jena-db/jena-dboe-storage/src/test/java/org/apache/jena/dboe/storage/storage/TestDatasetGraphStorageFindTests.java
=>
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/TestSpatialIndexGraphLookupV2.java
(70%)
create mode 100644
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/index/v2/SimpleGraphSerializer.java
create mode 100644
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/index/v2/SpatialIndexTest.java
create mode 100644
jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/index/v2/TestNodeSerializer.java
