Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CARBONDATA-1256] Rectify Vector Buffer Overflow Calculation #1111

Closed
wants to merge 1 commit into from
Closed

[CARBONDATA-1256] Rectify Vector Buffer Overflow Calculation #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .../org/apache/carbondata/core/scan/collector/impl/DictionaryBasedVectorResultCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ protected void prepareDimensionAndMeasureColumnVectors() {
}
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;
Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private Object getMeasureDefaultValue(CarbonMeasure carbonMeasure) {
}
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;
Expand Down