vikramahuja1001 commented on a change in pull request #4005: URL: https://github.com/apache/carbondata/pull/4005#discussion_r531454877
########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/cleanfiles/TestCleanFilesCommandPartitionTable.scala ########## @@ -0,0 +1,412 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.spark.testsuite.cleanfiles + +import java.io.{File, PrintWriter} + +import scala.io.Source + +import org.apache.spark.sql.{CarbonEnv, Row} +import org.apache.spark.sql.test.util.QueryTest +import org.scalatest.BeforeAndAfterAll + +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.util.CarbonProperties +import org.apache.carbondata.core.util.path.CarbonTablePath + +class TestCleanFilesCommandPartitionTable extends QueryTest with BeforeAndAfterAll { + + var count = 0 + + test("clean up table and test trash folder with IN PROGRESS segments") { + // do not send the segment folders to trash + createParitionTable() + loadData() + val path = CarbonEnv.getCarbonTable(Some("default"), "cleantest")(sqlContext.sparkSession) + .getTablePath + val trashFolderPath = path + CarbonCommonConstants.FILE_SEPARATOR + CarbonTablePath.TRASH_DIR + editTableStatusFile(path) + assert(!FileFactory.isFileExist(trashFolderPath)) + val segmentNumber1 = sql(s"""show segments for table cleantest""").count() + assert(segmentNumber1 == 4) + sql(s"CLEAN FILES FOR TABLE cleantest").show + val segmentNumber2 = sql(s"""show segments for table cleantest""").count() + assert(0 == segmentNumber2) + assert(!FileFactory.isFileExist(trashFolderPath)) + count = 0 + var list = getFileCountInTrashFolder(trashFolderPath) + // no carbondata file is added to the trash + assert(list == 0) + sql("""DROP TABLE IF EXISTS CLEANTEST""") + } + + test("clean up table and test trash folder with Marked For Delete segments") { + // do not send MFD folders to trash + createParitionTable() + loadData() + val path = CarbonEnv.getCarbonTable(Some("default"), "cleantest")(sqlContext.sparkSession) + .getTablePath + val trashFolderPath = path + CarbonCommonConstants.FILE_SEPARATOR + CarbonTablePath.TRASH_DIR + assert(!FileFactory.isFileExist(trashFolderPath)) + sql(s"""Delete from table cleantest where segment.id in(1)""") + val segmentNumber1 = sql(s"""show segments for table cleantest""").count() + sql(s"CLEAN FILES FOR TABLE cleantest").show + val segmentNumber2 = sql(s"""show segments for table cleantest""").count() + assert(segmentNumber1 == segmentNumber2 + 1) + assert(!FileFactory.isFileExist(trashFolderPath)) + count = 0 + var list = getFileCountInTrashFolder(trashFolderPath) + // no carbondata file is added to the trash Review comment: changed ########## File path: core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java ########## @@ -2086,6 +2087,34 @@ public int getMaxSIRepairLimit(String dbName, String tableName) { return Math.abs(Integer.parseInt(thresholdValue)); } + /** + * The below method returns the time(in milliseconds) for which timestamp folder retention in + * trash folder will take place. + */ + public long getTrashFolderRetentionTime() { + String propertyValue = getProperty(CarbonCommonConstants.CARBON_TRASH_RETENTION_DAYS); Review comment: done ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
