You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/07/03 09:38:01 UTC
[1/2] carbondata git commit: Rectify Vector Buffer Calculation
Repository: carbondata
Updated Branches:
refs/heads/master 924f0b7a7 -> 27d520cc0
Rectify Vector Buffer Calculation
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/03d484ab
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/03d484ab
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/03d484ab
Branch: refs/heads/master
Commit: 03d484abf2cf5c57aeda11ca9355cfbfbdf137c2
Parents: 924f0b7
Author: sounakr <so...@gmail.com>
Authored: Thu Jun 29 01:15:21 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Jul 3 15:06:43 2017 +0530
----------------------------------------------------------------------
.../collector/impl/DictionaryBasedVectorResultCollector.java | 5 +++--
.../collector/impl/RestructureBasedVectorResultCollector.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/03d484ab/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java
index 73ccb5d..c857a47 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java
@@ -139,8 +139,9 @@ public class DictionaryBasedVectorResultCollector extends AbstractScannedResultC
}
int rowCounter = scannedResult.getRowCounter();
int availableRows = currentPageRowCount - rowCounter;
- int requiredRows =
- columnarBatch.getBatchSize() - (columnarBatch.getActualSize() + filteredRows);
+ // getRowCounter holds total number or rows being placed in Vector. Calculate the
+ // Left over space through getRowCounter only.
+ int requiredRows = columnarBatch.getBatchSize() - columnarBatch.getRowCounter();
requiredRows = Math.min(requiredRows, availableRows);
if (requiredRows < 1) {
return;
http://git-wip-us.apache.org/repos/asf/carbondata/blob/03d484ab/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
index 6f45c47..8ae0d96 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
@@ -103,7 +103,7 @@ public class RestructureBasedVectorResultCollector extends DictionaryBasedVector
}
int rowCounter = scannedResult.getRowCounter();
int availableRows = currentPageRowCount - rowCounter;
- int requiredRows = columnarBatch.getBatchSize() - columnarBatch.getActualSize();
+ int requiredRows = columnarBatch.getBatchSize() - columnarBatch.getRowCounter();
requiredRows = Math.min(requiredRows, availableRows);
if (requiredRows < 1) {
return;
[2/2] carbondata git commit: [CARBONDATA-1256] Rectify Vector Buffer
Overflow Calculation. This closes #1111
Posted by ra...@apache.org.
[CARBONDATA-1256] Rectify Vector Buffer Overflow Calculation. This closes #1111
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/27d520cc
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/27d520cc
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/27d520cc
Branch: refs/heads/master
Commit: 27d520cc0be71ab23c705e8c2e2a8fdcdbe589be
Parents: 924f0b7 03d484a
Author: ravipesala <ra...@gmail.com>
Authored: Mon Jul 3 15:07:37 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon Jul 3 15:07:37 2017 +0530
----------------------------------------------------------------------
.../collector/impl/DictionaryBasedVectorResultCollector.java | 5 +++--
.../collector/impl/RestructureBasedVectorResultCollector.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------