improve test: add mayCommitTx()

Change-Id: Iefc59747a2cb300a927a48c68a79d4988bc30b12
apache · Apr 1, 2022 · f293145 · f293145
1 parent 6a6d99c
commit f293145
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 241 deletions.
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphTransaction.java
@@ -777,9 +777,16 @@ public Iterator<Vertex> queryVertices() {
     }
 
     public Iterator<Vertex> queryVertices(Query query) {
-        E.checkArgument(this.removedVertices.isEmpty() || query.noLimit(),
-                        "It's not allowed to query with limit when " +
-                        "there are uncommitted delete records.");
+        if (this.hasUpdate()) {
+            E.checkArgument(this.removedVertices.isEmpty() ||
+                            query.noLimitAndOffset(),
+                            "It's not allowed to query with offser/limit " +
+                            "when there are uncommitted delete records.");
+            // TODO: also add check: no SCAN, no OLAP
+            E.checkArgument(!query.paging(),
+                            "It's not allowed to query by paging when " +
+                            "there are uncommitted records.");
+        }
 
         query.resetActualOffset();
 
@@ -935,9 +942,16 @@ public Iterator<Edge> queryEdges() {
 
     @Watched
     public Iterator<Edge> queryEdges(Query query) {
-        E.checkArgument(this.removedEdges.isEmpty() || query.noLimit(),
-                        "It's not allowed to query with limit when " +
-                        "there are uncommitted delete records.");
+        if (this.hasUpdate()) {
+            E.checkArgument(this.removedEdges.isEmpty() ||
+                            query.noLimitAndOffset(),
+                            "It's not allowed to query with offser/limit " +
+                            "when there are uncommitted delete records.");
+            // TODO: also add check: no SCAN, no OLAP
+            E.checkArgument(!query.paging(),
+                            "It's not allowed to query by paging when " +
+                            "there are uncommitted records.");
+        }
 
         query.resetActualOffset();
 

diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/core/BaseCoreTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/core/BaseCoreTest.java
@@ -111,6 +111,10 @@ protected void mayCommitTx() {
         }
     }
 
+    protected void commitTx() {
+        graph().tx().commit();
+    }
+
     protected BackendFeatures storeFeatures() {
         return graph().backendStoreFeatures();
     }