uncommitted change

Author: Aklakan

rdf-processing-toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java

@@ -81,8 +81,8 @@
 import org.aksw.jenax.dataaccess.sparql.link.transform.RDFLinkTransforms;
 import org.aksw.jenax.dataaccess.sparql.linksource.RDFLinkSource;
 import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourcePolyfill;
-import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithBnodeRewrite;
-import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithLocalCache;
+import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RDFDataSourceWithBnodeRewrite;
+import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RDFDataSourceWithLocalCache;
 import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithLocalLateral;
 import org.aksw.jenax.graphql.rdf.api.RdfGraphQlExecFactory;
 import org.aksw.jenax.graphql.sparql.GraphQlExecFactoryOverSparql;
@@ -108,6 +108,7 @@
 import org.apache.commons.compress.compressors.CompressorStreamFactory;
 import org.apache.commons.io.IOUtils;
 import org.apache.jena.geosparql.configuration.GeoSPARQLConfig;
+import org.apache.jena.geosparql.spatial.index.v2.SpatialIndexIoKryo;
 import org.apache.jena.geosparql.spatial.index.v2.SpatialIndexLib;
 import org.apache.jena.graph.Node;
 import org.apache.jena.irix.IRIx;
@@ -195,7 +196,7 @@ public static RDFEngineBuilder<?> setupRdfDataEngineBuilder(CmdSparqlIntegrateMa
             throw new RuntimeException("No RdfDataSourceFactory registered under name " + sourceType);
         }
 
-        RDFEngineBuilder<?> engineBuilder = factory.newEngineBuilder();
+        RDFEngineBuilder<?> engineBuilder = factory.newBuilder();
 
         RdfDataSourceSpecBasicFromMap spec = RdfDataSourceSpecBasicFromMap.create();
         spec.setTempDir(cmd.tempPath);
@@ -602,6 +603,13 @@ public static int sparqlIntegrate(CmdSparqlIntegrateMain cmd) throws Exception {
                 throw new RuntimeException(
                         "GeoIndex requested but the configured engine does not appear to be Jena-based as the dataset was null!");
             }
+
+            // If there is an existing index then try to load it.
+            Path geoIndexFile = cmd.arqConfig.geoindexFile;
+            if (geoIndexFile != null) {
+                GeoSPARQLConfig.setupSpatialIndex(finalDataset, cmd.arqConfig.geoindexSrs, geoIndexFile);
+                finalDataset.getContext().setTrue(SPATIAL_INDEX_IS_CLEAN);
+            }
         }
 
         Long resultSetPageSize = cmd.paginationConfig.queryPageSize;
@@ -673,7 +681,7 @@ public static int sparqlIntegrate(CmdSparqlIntegrateMain cmd) throws Exception {
 
             if (cmd.cacheRewriteGroupBy) {
                 rdfEngineDecorator = rdfEngineDecorator.decorate(
-                    RdfDataSourceWithLocalCache.TransformInjectCacheSyntax::rewriteQuery);
+                    RDFDataSourceWithLocalCache.TransformInjectCacheSyntax::rewriteQuery);
                 // dataSourceTmp = RdfDataEngines.of(new
                 // RdfDataSourceWithLocalCache(dataSourceTmp), dataSourceTmp);
             }
@@ -1086,7 +1094,7 @@ public static RDFDataSource applyMacroExpansion(CmdSparqlIntegrateMain cmd, RDFD
         BnodeRewriteMode bnodeRewriteMode = BnodeRewriteMode.LOOKUP_ONLY;
 
         if (!Strings.isNullOrEmpty(bnodeProfile)) {
-            dataSourceTmp = new RdfDataSourceWithBnodeRewrite(dataSourceTmp, bnodeProfile, BnodeRewriteMode.FULL);
+            dataSourceTmp = new RDFDataSourceWithBnodeRewrite(dataSourceTmp, bnodeProfile, BnodeRewriteMode.FULL);
 
 //            dataSourceTmp = RdfDataEngines.of(new RdfDataSourceWithBnodeRewrite(dataSourceTmp, bnodeProfile),
 //                    dataSourceTmp::close);
@@ -1095,7 +1103,7 @@ public static RDFDataSource applyMacroExpansion(CmdSparqlIntegrateMain cmd, RDFD
             // dataSourceTmp = RdfDataEngines.decorate(dataSourceTmp, decorator);
         } else {
             if (dbmsProfile != null) {
-                dataSourceTmp = new RdfDataSourceWithBnodeRewrite(dataSourceTmp, bnodeProfile, BnodeRewriteMode.LOOKUP_ONLY);
+                dataSourceTmp = new RDFDataSourceWithBnodeRewrite(dataSourceTmp, bnodeProfile, BnodeRewriteMode.LOOKUP_ONLY);
             }
 
             // Replace <http://ns.aksw.org/function/forceBnodeIri> with a default definition
@@ -1147,7 +1155,7 @@ public static void updateSpatialIndex(Dataset dataset, String srs, Path file) {
         Context cxt = dataset.getContext();
         // logger.info("(Re-)computing geo index");
         try {
-            GeoSPARQLConfig.setupSpatialIndex(dataset, srs, file);
+            SpatialIndexIoKryo.buildSpatialIndex(dataset, srs, file);
             cxt.setTrue(SPATIAL_INDEX_IS_CLEAN);
         } catch (Exception e) {
             if (e.getMessage().toLowerCase().contains("no srs found")) {