Do not add limit or offset when not needed in SPARQL queries

silk-framework · Nov 23, 2020 · 4c88f0a · 4c88f0a
1 parent 4355ae2
commit 4c88f0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...c/main/scala/org/silkframework/plugins/dataset/rdf/endpoint/PagingSparqlTraversable.scala b/...c/main/scala/org/silkframework/plugins/dataset/rdf/endpoint/PagingSparqlTraversable.scala
@@ -65,8 +65,12 @@ object PagingSparqlTraversable {
           if(Thread.currentThread().isInterrupted) {
             return
           }
-          parsedQuery.setLimit(math.min(params.pageSize, limit - offset))
-          parsedQuery.setOffset(offset)
+          if(params.pageSize != Int.MaxValue && limit > params.pageSize) {
+            parsedQuery.setOffset(offset)
+          }
+          if(limit != Int.MaxValue || params.pageSize != Int.MaxValue) {
+            parsedQuery.setLimit(math.min(params.pageSize, limit - offset))
+          }
           val inputStream = executeQuery(parsedQuery.serialize(Syntax.syntaxSPARQL_11))
           try {
             val resultCount = outputResults(inputStream, f)

diff --git a/.../src/main/scala/org/silkframework/plugins/dataset/rdf/endpoint/RemoteSparqlEndpoint.scala b/.../src/main/scala/org/silkframework/plugins/dataset/rdf/endpoint/RemoteSparqlEndpoint.scala
@@ -174,4 +174,4 @@ object RemoteSparqlEndpoint {
     val rt = cfg.getInt("silk.remoteSparqlEndpoint.defaults.read.timeout.ms")
     (ct, rt)
   }
-}
+}