Merge d8b35ef into 759cb31

apache · Sep 24, 2018 · 2ca1c4a · 2ca1c4a
2 parents 759cb31 + d8b35ef
commit 2ca1c4a
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java
@@ -238,6 +238,10 @@ protected DataMapRowImpl loadBlockInfoForOldStore(CarbonRowSchema[] taskSummaryS
             blockMetaInfo, updatedMinValues, updatedMaxValues, minMaxFlag);
       }
     }
+    List<Short> blockletCountList = new ArrayList<>();
+    blockletCountList.add((short) 0);
+    byte[] blockletCount = convertRowCountFromShortToByteArray(blockletCountList);
+    summaryRow.setByteArray(blockletCount, taskSummarySchema.length - 1);
     setMinMaxFlagForTaskSummary(summaryRow, taskSummarySchema, segmentProperties, minMaxFlag);
     return summaryRow;
   }
@@ -627,17 +631,12 @@ protected int getTotalBlocks() {
 
   // get total blocklet number in this datamap
   protected int getTotalBlocklets() {
-    if (isLegacyStore) {
-      // dummy value
-      return 0;
-    } else {
-      ByteBuffer byteBuffer = ByteBuffer.wrap(getBlockletRowCountForEachBlock());
-      int sum = 0;
-      while (byteBuffer.hasRemaining()) {
-        sum += byteBuffer.getShort();
-      }
-      return sum;
+    ByteBuffer byteBuffer = ByteBuffer.wrap(getBlockletRowCountForEachBlock());
+    int sum = 0;
+    while (byteBuffer.hasRemaining()) {
+      sum += byteBuffer.getShort();
     }
+    return sum;
   }
 
   private List<Blocklet> prune(FilterResolverIntf filterExp) {
@@ -1000,7 +999,7 @@ protected CarbonRowSchema[] getTaskSummarySchema() {
         SegmentPropertiesAndSchemaHolder.getInstance()
             .getSegmentPropertiesWrapper(segmentPropertiesIndex);
     try {
-      return segmentPropertiesWrapper.getTaskSummarySchema(!isLegacyStore, isFilePathStored);
+      return segmentPropertiesWrapper.getTaskSummarySchema(true, isFilePathStored);
     } catch (MemoryException e) {
       throw new RuntimeException(e);
     }