Merge dc0b8bb into 851dd2c

apache · Nov 15, 2018 · c5e8b0e · c5e8b0e
2 parents 851dd2c + dc0b8bb
commit c5e8b0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.../main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveCodec.java b/.../main/java/org/apache/carbondata/core/datastore/page/encoding/adaptive/AdaptiveCodec.java
@@ -241,6 +241,7 @@ public byte[] encodeAndCompressPage(ColumnPage input, ColumnPageValueConverter c
     }
     ColumnPage columnPage = getSortedColumnPageIfRequired(input);
     columnPage.convertValue(converter);
+    columnPage.freeMemory();
     byte[] result = encodedPage.compress(compressor);
     return result;
   }

diff --git a/...src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java b/...src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
@@ -161,8 +161,8 @@ public void initialize(InputSplit inputSplit, TaskAttemptContext taskAttemptCont
 
   @Override
   public void close() throws IOException {
-    logStatistics(rowCount, queryModel.getStatisticsRecorder());
     if (vectorProxy != null) {
+      logStatistics(rowCount, queryModel.getStatisticsRecorder());
       vectorProxy.close();
       vectorProxy = null;
     }
@@ -198,7 +198,7 @@ public boolean nextKeyValue() throws IOException, InterruptedException {
   @Override
   public Object getCurrentValue() throws IOException, InterruptedException {
     if (returnColumnarBatch) {
-      int value = vectorProxy.numRows();
+      int value = carbonColumnarBatch.getActualSize();
       rowCount += value;
       if (inputMetricsStats != null) {
         inputMetricsStats.incrementRecordRead((long) value);