Fix broken performance test (#3466)

Signed-off-by: Florian Grieskamp <[email protected]>
JanusGraph · Jan 18, 2023 · 698a516 · 698a516
1 parent ed5b095
commit 698a516
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/janusgraph-benchmark/src/main/java/org/janusgraph/MgmtOlapJobBenchmark.java b/janusgraph-benchmark/src/main/java/org/janusgraph/MgmtOlapJobBenchmark.java
@@ -18,13 +18,15 @@
 import org.janusgraph.core.Cardinality;
 import org.janusgraph.core.JanusGraph;
 import org.janusgraph.core.JanusGraphFactory;
+import org.janusgraph.core.JanusGraphTransaction;
 import org.janusgraph.core.PropertyKey;
 import org.janusgraph.core.schema.JanusGraphManagement;
 import org.janusgraph.core.schema.SchemaAction;
 import org.janusgraph.core.schema.SchemaStatus;
 import org.janusgraph.diskstorage.configuration.ModifiableConfiguration;
 import org.janusgraph.diskstorage.configuration.WriteConfiguration;
 import org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration;
+import org.janusgraph.graphdb.database.StandardJanusGraph;
 import org.janusgraph.graphdb.database.management.ManagementSystem;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -74,6 +76,8 @@ public WriteConfiguration getConfiguration() {
     public void setUp() throws Exception {
         graph = JanusGraphFactory.open(getConfiguration());
 
+        ((StandardJanusGraph) graph).getOpenTransactions().forEach(JanusGraphTransaction::rollback);
+
         JanusGraphManagement mgmt = graph.openManagement();
         PropertyKey name = mgmt.makePropertyKey("name").dataType(String.class).cardinality(Cardinality.SINGLE).make();
         mgmt.buildIndex("nameIndex", Vertex.class).addKey(name).buildCompositeIndex();

diff --git a/janusgraph-core/src/main/java/org/janusgraph/core/schema/SchemaAction.java b/janusgraph-core/src/main/java/org/janusgraph/core/schema/SchemaAction.java
@@ -68,7 +68,7 @@ public enum SchemaAction {
     /**
      * Registers the index as empty which qualifies it for deletion.
      */
-    MARK_DISCARDED(Arrays.asList(DISABLED, REGISTERED));
+    MARK_DISCARDED(Arrays.asList(DISABLED, REGISTERED, DISCARDED));
 
     private final Set<SchemaStatus> applicableStatuses;
 

diff --git a/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/job/IndexRemoveJob.java b/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/job/IndexRemoveJob.java
@@ -111,8 +111,9 @@ protected void validateIndexStatus() {
         //Must be a relation type index or a composite graph index
         JanusGraphSchemaVertex schemaVertex = managementSystem.getSchemaVertex(index);
         SchemaStatus actualStatus = schemaVertex.getStatus();
-        Preconditions.checkArgument(actualStatus == SchemaStatus.REGISTERED || actualStatus == SchemaStatus.DISABLED,
-            "The index [%s] must be disabled before it can be removed", indexName);
+        Preconditions.checkArgument(
+            actualStatus == SchemaStatus.REGISTERED || actualStatus == SchemaStatus.DISABLED || actualStatus == SchemaStatus.DISCARDED,
+            "The index [%s] must be disabled before it can be removed, but is currently [%s].", indexName, actualStatus);
     }
 
     @Override