You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2017/08/30 05:17:32 UTC
carbondata git commit: [CARBONDATA-1329] The first carbonindex file
needs to be deleted during clean files operation
Repository: carbondata
Updated Branches:
refs/heads/master f70f23049 -> 03c1774f7
[CARBONDATA-1329] The first carbonindex file needs to be deleted during clean files operation
This closes #1277
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/03c1774f
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/03c1774f
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/03c1774f
Branch: refs/heads/master
Commit: 03c1774f772f0dc3241886e272d10f12cdfc5c9f
Parents: f70f230
Author: root <pa...@gmail.com>
Authored: Mon Aug 21 06:38:22 2017 +0000
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Wed Aug 30 10:46:37 2017 +0530
----------------------------------------------------------------------
.../core/statusmanager/SegmentUpdateStatusManager.java | 6 ++----
.../org/apache/carbondata/core/util/path/CarbonTablePath.java | 5 +++++
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/03c1774f/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
index 9abc58f..20c7ad7 100644
--- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
+++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java
@@ -984,10 +984,8 @@ public class SegmentUpdateStatusManager {
}
// get carbon index files of the block.
- String taskNum = CarbonTablePath.DataFileUtil.getTaskNo(actualBlockName);
- // String indexFileEndsWith = timestamp + CarbonTablePath.getCarbonIndexExtension();
- if (eachFile.getName().endsWith(CarbonTablePath.getCarbonIndexExtension()) && eachFile
- .getName().startsWith(taskNum)) {
+ String indexFileName = CarbonTablePath.getCarbonIndexFileName(actualBlockName);
+ if (eachFile.getName().equalsIgnoreCase(indexFileName)) {
files.add(eachFile);
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/03c1774f/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
index fb9b783..0910afc 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
@@ -733,4 +733,9 @@ public class CarbonTablePath extends Path {
public static String addSegmentPrefix(String value) {
return SEGMENT_PREFIX + value;
}
+
+ public static String getCarbonIndexFileName(String actualBlockName) {
+ return DataFileUtil.getTaskNo(actualBlockName) + "-" + DataFileUtil.getBucketNo(actualBlockName)
+ + "-" + DataFileUtil.getTimeStampFromFileName(actualBlockName) + INDEX_FILE_EXT;
+ }
}
\ No newline at end of file