Fixes an issue with applying external updates

And manages external updates after merge
neo4j · Feb 18, 2019 · 8723304 · 8723304
1 parent 22bd340
commit 8723304
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...unity-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/...unity-it/kernel-it/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java
@@ -422,7 +422,7 @@ private void assertIndexedNodesMatchesStoreNodes() throws Exception
                     }
                     if ( !found )
                     {
-                        mismatches.add( "Index is missing entry for " + name );
+                        mismatches.add( "Index is missing entry for " + name + " " + node );
                     }
                 }
                 if ( !mismatches.isEmpty() )

diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java
@@ -61,6 +61,7 @@ public class BlockBasedIndexPopulator<KEY extends NativeIndexKey<KEY>,VALUE exte
     private final int blockSize;
     private BlockStorage<KEY,VALUE> scanUpdates;
     private IndexUpdateStorage<KEY,VALUE> externalUpdates;
+    private boolean merged;
 
     BlockBasedIndexPopulator( PageCache pageCache, FileSystemAbstraction fs, File file, IndexLayout<KEY,VALUE> layout, IndexProvider.Monitor monitor,
             StoreIndexDescriptor descriptor, IndexSpecificSpaceFillingCurveSettingsCache spatialSettings,
@@ -151,6 +152,7 @@ public void scanCompleted() throws IndexEntryConflictException
 
             // Apply the external updates
             writeExternalUpdatesToTree();
+            merged = true;
         }
         catch ( IOException e )
         {
@@ -175,7 +177,7 @@ private void writeExternalUpdatesToTree() throws IOException
                     break;
                 case CHANGED:
                     writer.remove( updates.key() );
-                    writer.put( updates.key(), updates.value() );
+                    writer.put( updates.key2(), updates.value() );
                     break;
                 default:
                     throw new IllegalArgumentException( "Unknown update mode " + updates.updateMode() );
@@ -212,6 +214,11 @@ private void writeScanUpdatesToTree() throws IOException, IndexEntryConflictExce
     @Override
     public IndexUpdater newPopulatingUpdater( NodePropertyAccessor accessor )
     {
+        if ( merged )
+        {
+            return super.newPopulatingUpdater( accessor );
+        }
+
         return new IndexUpdater()
         {
             @Override