Extended the SpecialQueryType to include "NONE", which indicates a query

that should have no results. Using this NONE value for "doublebuffer"-ed queries that should have no results.
phxd88 · Jan 30, 2020 · a949d63 · a949d63
1 parent 4b6303a
commit a949d63
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/BimServer/src/org/bimserver/database/queries/QueryStackFrame.java b/BimServer/src/org/bimserver/database/queries/QueryStackFrame.java
@@ -24,6 +24,7 @@
 import org.bimserver.database.queries.om.Query;
 import org.bimserver.database.queries.om.QueryException;
 import org.bimserver.database.queries.om.QueryPart;
+import org.bimserver.database.queries.om.SpecialQueryType;
 import org.bimserver.shared.QueryContext;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -46,8 +47,12 @@ public QueryStackFrame(QueryObjectProvider queryObjectProvider, QueryContext reu
 	@Override
 	public boolean process() throws BimserverDatabaseException, QueryException {
 		if (query.getSpecialQueryType() != null) {
-			queryObjectProvider.push(new AllStackFrame(queryObjectProvider, reusable));
-			return true;
+			if (query.getSpecialQueryType() == SpecialQueryType.ALL) {
+				queryObjectProvider.push(new AllStackFrame(queryObjectProvider, reusable));
+				return true;
+			} else if (query.getSpecialQueryType() == SpecialQueryType.NONE) {
+				return true;
+			}
 		}
 		if (queryIterator.hasNext()) {
 			QueryPart next = queryIterator.next();

diff --git a/BimServer/src/org/bimserver/longaction/LongStreamingDownloadAction.java b/BimServer/src/org/bimserver/longaction/LongStreamingDownloadAction.java
@@ -55,6 +55,7 @@
 import org.bimserver.database.queries.om.JsonQueryObjectModelConverter;
 import org.bimserver.database.queries.om.Query;
 import org.bimserver.database.queries.om.QueryPart;
+import org.bimserver.database.queries.om.SpecialQueryType;
 import org.bimserver.emf.PackageMetaData;
 import org.bimserver.interfaces.objects.SCheckoutResult;
 import org.bimserver.interfaces.objects.SProgressTopicType;
@@ -179,7 +180,13 @@ public LongStreamingDownloadAction(BimServer bimServer, String username, String
 							newQueryPart.addOid(next.getOid());
 							next = queryObjectProvider.next();
 						}
-						query = newQuery;
+						if (!newQueryPart.hasOids()) {
+							// When the original query has not returned any objects, we need to make sure the resulting new query is not interpreted to return all objects
+							query = new Query(packageMetaData);
+							query.setSpecialQueryType(SpecialQueryType.NONE);
+						} else {
+							query = newQuery;
+						}
 					}
 					// TODO passing a databasesession here, make sure it will be closed!!
 					QueryObjectProvider queryObjectProvider = new QueryObjectProvider(databaseSession, getBimServer(), query, roids, packageMetaData);

diff --git a/PluginBase/src/org/bimserver/database/queries/om/SpecialQueryType.java b/PluginBase/src/org/bimserver/database/queries/om/SpecialQueryType.java
@@ -1,5 +1,5 @@
 package org.bimserver.database.queries.om;
 
 public enum SpecialQueryType {
-	ALL
+	ALL, NONE
 }