Type sharding: Revert min/max shard ordinal calculation, rename varia…

…ble to enhance clarity
pelly-ryu · Jan 26, 2017 · 3ed20ff · 3ed20ff
1 parent c27eeb2
commit 3ed20ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/hollow/src/main/java/com/netflix/hollow/core/write/HollowListTypeWriteState.java b/hollow/src/main/java/com/netflix/hollow/core/write/HollowListTypeWriteState.java
@@ -74,9 +74,9 @@ private void gatherStatistics() {
         int maxElementOrdinal = 0;
 
         maxShardOrdinal = new int[numShards];
-        int minOrdinalsPerShard = (maxOrdinal + 1) / numShards; 
+        int minRecordLocationsPerShard = (maxOrdinal + 1) / numShards; 
         for(int i=0;i<numShards;i++)
-            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minOrdinalsPerShard + 1 : minOrdinalsPerShard;
+            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minRecordLocationsPerShard : minRecordLocationsPerShard - 1;
 
         ByteData data = ordinalMap.getByteData().getUnderlyingArray();
 

diff --git a/hollow/src/main/java/com/netflix/hollow/core/write/HollowMapTypeWriteState.java b/hollow/src/main/java/com/netflix/hollow/core/write/HollowMapTypeWriteState.java
@@ -79,9 +79,9 @@ private void gatherStatistics() {
         int maxOrdinal = ordinalMap.maxOrdinal();
 
         maxShardOrdinal = new int[numShards];
-        int minOrdinalsPerShard = (maxOrdinal + 1) / numShards; 
+        int minRecordLocationsPerShard = (maxOrdinal + 1) / numShards; 
         for(int i=0;i<numShards;i++)
-            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minOrdinalsPerShard + 1 : minOrdinalsPerShard;
+            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minRecordLocationsPerShard : minRecordLocationsPerShard - 1;
 
         int maxMapSize = 0;
         ByteData data = ordinalMap.getByteData().getUnderlyingArray();

diff --git a/hollow/src/main/java/com/netflix/hollow/core/write/HollowObjectTypeWriteState.java b/hollow/src/main/java/com/netflix/hollow/core/write/HollowObjectTypeWriteState.java
@@ -88,9 +88,9 @@ public void prepareForWrite() {
         }
 
         maxShardOrdinal = new int[numShards];
-        int minOrdinalsPerShard = (maxOrdinal + 1) / numShards; 
+        int minRecordLocationsPerShard = (maxOrdinal + 1) / numShards; 
         for(int i=0;i<numShards;i++)
-            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minOrdinalsPerShard + 1 : minOrdinalsPerShard;
+            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minRecordLocationsPerShard : minRecordLocationsPerShard - 1;
     }
 
     private void discoverObjectFieldStatisticsForRecord(FieldStatistics fieldStats, int ordinal) {

diff --git a/hollow/src/main/java/com/netflix/hollow/core/write/HollowSetTypeWriteState.java b/hollow/src/main/java/com/netflix/hollow/core/write/HollowSetTypeWriteState.java
@@ -76,9 +76,9 @@ private void gatherStatistics() {
         int maxOrdinal = ordinalMap.maxOrdinal();
 
         maxShardOrdinal = new int[numShards];
-        int minOrdinalsPerShard = (maxOrdinal + 1) / numShards; 
+        int minRecordLocationsPerShard = (maxOrdinal + 1) / numShards; 
         for(int i=0;i<numShards;i++)
-            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minOrdinalsPerShard + 1 : minOrdinalsPerShard;
+            maxShardOrdinal[i] = (i < ((maxOrdinal + 1) & (numShards - 1))) ? minRecordLocationsPerShard : minRecordLocationsPerShard - 1;
 
         int maxSetSize = 0;
         ByteData data = ordinalMap.getByteData().getUnderlyingArray();