Make setConstraintIndexOwner use RecordAccess

neo4j · Jul 4, 2017 · ad909d3 · ad909d3
1 parent b3c4390
commit ad909d3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordAccess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordAccess.java
@@ -38,7 +38,7 @@ public interface RecordAccess<KEY,RECORD,ADDITIONAL>
 
     RecordProxy<KEY, RECORD, ADDITIONAL> getIfLoaded( KEY key );
 
-    void setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData );
+    RecordProxy<KEY,RECORD,ADDITIONAL> setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData );
 
     /**
      * Creates a new record with the given {@code key}. Any {@code additionalData} is set in the

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java
@@ -76,12 +76,12 @@ public RecordProxy<KEY, RECORD, ADDITIONAL> getOrLoad( KEY key, ADDITIONAL addit
     }
 
     @Override
-    public void setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
+    public RecordProxy<KEY,RECORD,ADDITIONAL> setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
     {
         RecordChange<KEY, RECORD, ADDITIONAL> recordChange =
                 new RecordChange<>( recordChanges, changeCounter, key, newRecord, loader, false, additionalData );
         recordChanges.put( key, recordChange );
-        recordChange.forChangingData();
+        return recordChange;
     }
 
     @Override

diff --git a/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java b/.../kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java
@@ -605,6 +605,22 @@ public void dropSchemaRule( SchemaRule rule )
         }
     }
 
+    public void changeSchemaRule( SchemaRule rule, SchemaRule updatedRule )
+    {
+        //Read the current record
+        RecordProxy<Long,SchemaRecord,SchemaRule> change = recordChangeSet.getSchemaRuleChanges()
+                .getOrLoad( rule.getId(), rule );
+        SchemaRecord records = change.forReadingData();
+
+        //Register the change of the record
+        RecordProxy<Long,SchemaRecord,SchemaRule> recordChange = recordChangeSet.getSchemaRuleChanges()
+                .setTo( rule.getId(), records, updatedRule );
+        SchemaRecord dynamicRecords = recordChange.forChangingData();
+
+        //Update the record
+        dynamicRecords.setDynamicRecords( schemaStore.allocateFrom( updatedRule ) );
+    }
+
     public void addLabelToNode( int labelId, long nodeId )
     {
         NodeRecord nodeRecord = recordChangeSet.getNodeRecords().getOrLoad( nodeId, null ).forChangingData();
@@ -619,13 +635,8 @@ public void removeLabelFromNode( int labelId, long nodeId )
 
     public void setConstraintIndexOwner( IndexRule indexRule, long constraintId )
     {
-        RecordProxy<Long, SchemaRecord, SchemaRule> change =
+        IndexRule updatedIndexRule = indexRule.withOwningConstraint( constraintId );
-                recordChangeSet.getSchemaRuleChanges().getOrLoad( indexRule.getId(), indexRule );
+        changeSchemaRule( indexRule, updatedIndexRule );
-        SchemaRecord records = change.forChangingData();
-
-        indexRule = indexRule.withOwningConstraint( constraintId );
-
-        records.setDynamicRecords( schemaStore.allocateFrom( indexRule ) );
     }
 
     public interface PropertyReceiver<P extends StorageProperty>

diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccess.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccess.java
@@ -30,6 +30,7 @@
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.record.AbstractBaseRecord;
 import org.neo4j.kernel.impl.transaction.state.RecordAccess;
+import org.neo4j.kernel.impl.transaction.state.RecordChanges;
 import org.neo4j.kernel.impl.util.statistics.IntCounter;
 
 /**
@@ -82,7 +83,7 @@ public RecordProxy<KEY,RECORD,ADDITIONAL> getIfLoaded( KEY key )
     }
 
     @Override
-    public void setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
+    public RecordProxy<KEY,RECORD,ADDITIONAL> setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
     {
         throw new UnsupportedOperationException( "Not supported" );
     }

diff --git a/...ty/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingRecordAccess.java b/...ty/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingRecordAccess.java
@@ -23,6 +23,7 @@
 
 import org.neo4j.helpers.collection.IterableWrapper;
 import org.neo4j.kernel.impl.transaction.state.RecordAccess;
+import org.neo4j.kernel.impl.transaction.state.RecordChanges;
 import org.neo4j.kernel.impl.transaction.state.TransactionRecordState;
 import org.neo4j.kernel.impl.util.collection.ArrayCollection;
 
@@ -71,7 +72,7 @@ public RecordProxy<KEY,RECORD,ADDITIONAL> getIfLoaded( KEY key )
     }
 
     @Override
-    public void setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
+    public RecordProxy<KEY,RECORD,ADDITIONAL> setTo( KEY key, RECORD newRecord, ADDITIONAL additionalData )
     {
         throw new UnsupportedOperationException( "Not supported" );
     }

diff --git a/...ty/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TrackingRecordAccess.java b/...ty/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TrackingRecordAccess.java
@@ -59,9 +59,9 @@ public RecordProxy<Long,RECORD,ADDITIONAL> getIfLoaded( Long key )
     }
 
     @Override
-    public void setTo( Long key, RECORD newRecord, ADDITIONAL additionalData )
+    public RecordProxy<Long,RECORD,ADDITIONAL> setTo( Long key, RECORD newRecord, ADDITIONAL additionalData )
     {
-        delegate.setTo( key, newRecord, additionalData );
+        return delegate.setTo( key, newRecord, additionalData );
     }
 
     @Override