Add transaction checks to the new IndexDefinition methods.

neo4j · Aug 9, 2018 · a222a17 · a222a17
1 parent 4004cc2
commit a222a17
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.../community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java b/.../community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java
@@ -23,12 +23,21 @@
 
 import org.neo4j.graphdb.schema.IndexDefinition;
 
+import static org.neo4j.graphdb.FacadeMethod.consume;
+
 public enum IndexDefinitionFacadeMethods implements Consumer<IndexDefinition>
 {
     GET_LABEL( new FacadeMethod<>( "Label getLabel()", IndexDefinition::getLabel ) ),
+    GET_LABELS( new FacadeMethod<>( "Iterable<Label> getLabels()", self -> consume( self.getLabels() ) ) ),
+    GET_RELATIONSHIP_TYPE( new FacadeMethod<>( "RelationshipType getRelationshipType()", IndexDefinition::getRelationshipType ) ),
+    GET_RELATIONSHIP_TYPES( new FacadeMethod<>( "Iterable<RelationshipType> getRelationshipTypes()", self -> consume( self.getRelationshipTypes() ) ) ),
     GET_PROPERTY_KEYS( new FacadeMethod<>( "Iterable<String> getPropertyKeys()", IndexDefinition::getPropertyKeys ) ),
     DROP( new FacadeMethod<>( "void drop()", IndexDefinition::drop ) ),
-    IS_CONSTRAINT_INDEX( new FacadeMethod<>( "boolean isConstraintIndex()", IndexDefinition::isConstraintIndex ) );
+    IS_CONSTRAINT_INDEX( new FacadeMethod<>( "boolean isConstraintIndex()", IndexDefinition::isConstraintIndex ) ),
+    IS_NODE_INDEX( new FacadeMethod<>( "boolean isNodeIndex()", IndexDefinition::isNodeIndex ) ),
+    IS_RELATIONSHIP_INDEX( new FacadeMethod<>( "boolean isRelationshipIndex()", IndexDefinition::isRelationshipIndex ) ),
+    IS_MULTI_TOKEN_INDEX( new FacadeMethod<>( "boolean isMultiTokenIndex()", IndexDefinition::isMultiTokenIndex ) ),
+    IS_COMPOSITE_INDEX( new FacadeMethod<>( "boolean isCompositeIndex()", IndexDefinition::isCompositeIndex ) );
 
     private final FacadeMethod<IndexDefinition> facadeMethod;
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/IndexDefinitionImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/IndexDefinitionImpl.java
@@ -144,24 +144,28 @@ public boolean isConstraintIndex()
     @Override
     public boolean isNodeIndex()
     {
+        assertInUnterminatedTransaction();
         return labels != null;
     }
 
     @Override
     public boolean isRelationshipIndex()
     {
+        assertInUnterminatedTransaction();
         return relTypes != null;
     }
 
     @Override
     public boolean isMultiTokenIndex()
     {
+        assertInUnterminatedTransaction();
         return labels != null ? labels.length > 1 : relTypes.length > 1;
     }
 
     @Override
     public boolean isCompositeIndex()
     {
+        assertInUnterminatedTransaction();
         return propertyKeys.length > 1;
     }