Repository: carbondata Updated Branches: refs/heads/master 0992b3b23 -> 6374d361b
[CARBONDATA-2298]Delete segment lock files before update metadata If there are some COMPACTED segments and their last modified time is within one hour, the segment lock files deletion operation will not be executed. This closes #2124 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/6374d361 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/6374d361 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/6374d361 Branch: refs/heads/master Commit: 6374d361b563470ce162788ff5377a323b57dde2 Parents: 0992b3b Author: Zhang Zhichao <[email protected]> Authored: Sat Mar 31 22:42:36 2018 +0800 Committer: Jacky Li <[email protected]> Committed: Mon Apr 2 20:54:34 2018 +0800 ---------------------------------------------------------------------- .../carbondata/core/statusmanager/SegmentStatusManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/6374d361/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java index bbc820c..be53f2b 100755 --- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java +++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java @@ -891,6 +891,8 @@ public class SegmentStatusManager { CarbonTable carbonTable, boolean isForceDeletion, List<PartitionSpec> partitionSpecs) throws IOException { + // delete the expired segment lock files + CarbonLockUtil.deleteExpiredSegmentLockFiles(carbonTable); if (isLoadDeletionRequired(carbonTable.getMetadataPath())) { AbsoluteTableIdentifier identifier = carbonTable.getAbsoluteTableIdentifier(); ReturnTuple tuple = isUpdationRequired(isForceDeletion, carbonTable, identifier); @@ -963,8 +965,6 @@ public class SegmentStatusManager { } } } - // delete the expired segment lock files - CarbonLockUtil.deleteExpiredSegmentLockFiles(carbonTable); } /**
