Repository: carbondata Updated Branches: refs/heads/branch-1.3 b704c1aa8 -> 30bc68c8b
[CARBONDATA-2298][BACKPORT-1.3]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 #2129 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/30bc68c8 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/30bc68c8 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/30bc68c8 Branch: refs/heads/branch-1.3 Commit: 30bc68c8bcc9b42be800e1c2064a7ba35aaa12de Parents: b704c1a Author: Zhang Zhichao <[email protected]> Authored: Mon Apr 2 00:18:06 2018 +0800 Committer: Jacky Li <[email protected]> Committed: Mon Apr 2 20:49:29 2018 +0800 ---------------------------------------------------------------------- .../scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/30bc68c8/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala index a60e593..02cdfd3 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/DataLoadingUtil.scala @@ -372,6 +372,8 @@ object DataLoadingUtil { isForceDeletion: Boolean, carbonTable: CarbonTable, specs: util.List[PartitionSpec]): Unit = { + // delete the expired segment lock files + CarbonLockUtil.deleteExpiredSegmentLockFiles(carbonTable) if (isLoadDeletionRequired(carbonTable.getMetaDataFilepath)) { val absoluteTableIdentifier = carbonTable.getAbsoluteTableIdentifier @@ -437,8 +439,6 @@ object DataLoadingUtil { } } } - // delete the expired segment lock files - CarbonLockUtil.deleteExpiredSegmentLockFiles(carbonTable) } private def isUpdationRequired(isForceDeletion: Boolean,
