You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2018/06/30 15:38:28 UTC
carbondata git commit: [CARBONDATA-2653][BloomDataMap] Fix bugs in
incorrect blocklet number in bloomfilter
Repository: carbondata
Updated Branches:
refs/heads/master 8cb37dd75 -> dac5d3ce3
[CARBONDATA-2653][BloomDataMap] Fix bugs in incorrect blocklet number in bloomfilter
In non-deferred reuibuild scenario, the last bloomfilter index file has already been written onBlockletEnd, no need to write again, otherwise an extra blocklet number will be
generated in the bloom index file.
This closes #2408
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/dac5d3ce
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/dac5d3ce
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/dac5d3ce
Branch: refs/heads/master
Commit: dac5d3ce3c888012f20bd85f01b244dc45df4b10
Parents: 8cb37dd
Author: xuchuanyin <xu...@hust.edu.cn>
Authored: Mon Jun 25 17:18:49 2018 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Sat Jun 30 23:22:10 2018 +0800
----------------------------------------------------------------------
.../apache/carbondata/datamap/bloom/BloomDataMapBuilder.java | 8 +++++++-
.../apache/carbondata/datamap/bloom/BloomDataMapWriter.java | 3 ---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/dac5d3ce/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
----------------------------------------------------------------------
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
index e9929e3..d16af06 100644
--- a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
+++ b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapBuilder.java
@@ -78,7 +78,13 @@ public class BloomDataMapBuilder extends BloomDataMapWriter implements DataMapBu
@Override
public void finish() throws IOException {
- super.finish();
+ if (!isWritingFinished()) {
+ if (indexBloomFilters.size() > 0) {
+ writeBloomDataMapFile();
+ }
+ releaseResouce();
+ setWritingFinished(true);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/carbondata/blob/dac5d3ce/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
----------------------------------------------------------------------
diff --git a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
index 1f960e2..dc24415 100644
--- a/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
+++ b/datamap/bloom/src/main/java/org/apache/carbondata/datamap/bloom/BloomDataMapWriter.java
@@ -197,9 +197,6 @@ public class BloomDataMapWriter extends DataMapWriter {
@Override
public void finish() throws IOException {
if (!isWritingFinished()) {
- if (indexBloomFilters.size() > 0) {
- writeBloomDataMapFile();
- }
releaseResouce();
setWritingFinished(true);
}