Fix problem in shouldSampleUpdatesIfConfiguredForOnlineSampling

Because we compared Values as Objects instead of as Values the expected sample results where wrong even though actual sample results where correct.
neo4j · Feb 18, 2019 · d3bf054 · d3bf054
1 parent 6e0a076
commit d3bf054
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 30 deletions.
diff --git a/...ty/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulatorTests.java b/...ty/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexPopulatorTests.java
@@ -46,6 +46,7 @@
 import org.neo4j.storageengine.api.NodePropertyAccessor;
 import org.neo4j.storageengine.api.schema.IndexDescriptor;
 import org.neo4j.storageengine.api.schema.IndexSample;
+import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
 import static java.util.Arrays.asList;
@@ -602,44 +603,50 @@ public void updaterShouldApplyDuplicateValues() throws Exception
         public void shouldSampleUpdatesIfConfiguredForOnlineSampling() throws Exception
         {
             // GIVEN
-            populator.create();
+            try
-            IndexEntryUpdate<IndexDescriptor>[] scanUpdates = valueCreatorUtil.someUpdates( random );
-            populator.add( Arrays.asList( scanUpdates ) );
-            Iterator<IndexEntryUpdate<IndexDescriptor>> generator = valueCreatorUtil.randomUpdateGenerator( random );
-            Object[] updates = new Object[5];
-            updates[0] = generator.next().values()[0].asObject();
-            updates[1] = generator.next().values()[0].asObject();
-            updates[2] = updates[1];
-            updates[3] = generator.next().values()[0].asObject();
-            updates[4] = updates[3];
-            try ( IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ) )
             {
-                long nodeId = 1000;
+                populator.create();
-                for ( Object value : updates )
+                IndexEntryUpdate<IndexDescriptor>[] scanUpdates = valueCreatorUtil.someUpdates( random );
+                populator.add( Arrays.asList( scanUpdates ) );
+                Iterator<IndexEntryUpdate<IndexDescriptor>> generator = valueCreatorUtil.randomUpdateGenerator( random );
+                Value[] updates = new Value[5];
+                updates[0] = generator.next().values()[0];
+                updates[1] = generator.next().values()[0];
+                updates[2] = updates[1];
+                updates[3] = generator.next().values()[0];
+                updates[4] = updates[3];
+                try ( IndexUpdater updater = populator.newPopulatingUpdater( null_property_accessor ) )
                 {
-                    IndexEntryUpdate<IndexDescriptor> update = valueCreatorUtil.add( nodeId++, Values.of( value ) );
+                    long nodeId = 1000;
-                    updater.process( update );
+                    for ( Value value : updates )
+                    {
+                        IndexEntryUpdate<IndexDescriptor> update = valueCreatorUtil.add( nodeId++, value );
+                        updater.process( update );
+                    }
                 }
-            }
 
-            // WHEN
+                // WHEN
-            IndexSample sample = populator.sampleResult();
+                IndexSample sample = populator.sampleResult();
 
-            // THEN
+                // THEN
-            Object[] allValues = Arrays.copyOf( updates, updates.length + scanUpdates.length );
+                Value[] allValues = Arrays.copyOf( updates, updates.length + scanUpdates.length );
-            System.arraycopy( asValues( scanUpdates ), 0, allValues, updates.length, scanUpdates.length );
+                System.arraycopy( asValues( scanUpdates ), 0, allValues, updates.length, scanUpdates.length );
-            assertEquals( updates.length + scanUpdates.length, sample.sampleSize() );
+                assertEquals( updates.length + scanUpdates.length, sample.sampleSize() );
-            assertEquals( countUniqueValues( allValues ), sample.uniqueValues() );
+                assertEquals( countUniqueValues( allValues ), sample.uniqueValues() );
-            assertEquals( updates.length + scanUpdates.length, sample.indexSize() );
+                assertEquals( updates.length + scanUpdates.length, sample.indexSize() );
-            populator.close( true );
+            }
+            finally
+            {
+                populator.close( true );
+            }
         }
 
-        private Object[] asValues( IndexEntryUpdate<IndexDescriptor>[] updates )
+        private Value[] asValues( IndexEntryUpdate<IndexDescriptor>[] updates )
         {
-            Object[] values = new Object[updates.length];
+            Value[] values = new Value[updates.length];
             for ( int i = 0; i < updates.length; i++ )
             {
-                values[i] = updates[i].values()[0].asObject();
+                values[i] = updates[i].values()[0];
             }
             return values;
         }

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ValueCreatorUtil.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/ValueCreatorUtil.java
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -173,9 +174,11 @@ static int countUniqueValues( IndexEntryUpdate<IndexDescriptor>[] updates )
         return Stream.of( updates ).map( update -> update.values()[0] ).collect( Collectors.toSet() ).size();
     }
 
-    static int countUniqueValues( Object[] updates )
+    static int countUniqueValues( Value[] updates )
     {
-        return Stream.of( updates ).collect( Collectors.toSet() ).size();
+        Set<Value> set = new TreeSet<>( Values.COMPARATOR );
+        set.addAll( Arrays.asList( updates ) );
+        return set.size();
     }
 
     void sort( IndexEntryUpdate<IndexDescriptor>[] updates )