kunal642 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375650842 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,199 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections +import java.util.concurrent.Executors + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient var LOGGER: Logger = _ + + override def processData(spark: SparkSession): Seq[Row] = { + LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + FileFactory.getConfiguration.addResource(configuration) Review comment: Why is this required? ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
kunal642 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375649953 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,199 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections +import java.util.concurrent.Executors + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient var LOGGER: Logger = _ + + override def processData(spark: SparkSession): Seq[Row] = { + LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + FileFactory.getConfiguration.addResource(configuration) + setAuditTable(table) + if (!table.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + if (table.isChildTableForMV) { + throw new MalformedCarbonCommandException("Unsupported operation on MV table") + } + val tablePath = table.getTablePath + val startTime = System.currentTimeMillis() + val stageDataFileLocation = options.get("location") + if (stageDataFileLocation.isEmpty) { + throw new MalformedCarbonCommandException("Option [location] is not specified.") + } + val stageDataFileActiveTime = try { + Integer.valueOf(options.getOrElse("retain_hour", "0")) * 3600000 + } catch { + case _: NumberFormatException => + throw new MalformedCarbonCommandException( + "Option [retain_hour] is not a number.") + } + if (stageDataFileActiveTime < 0) { + throw new MalformedCarbonCommandException( + "Option [retain_hour] is negative.") + } + val stageDataFilesReferenced = + listStageDataFilesReferenced(listStageMetadataFiles(tablePath, configuration), configuration) + val stageDataFiles = listStageDataFiles(stageDataFileLocation.get, configuration) + stageDataFiles.map( + stageDataFile => { + // Which file will be deleted: + // 1. Not referenced by any stage file; + // 2. Has passed retain time. + if (stageDataFilesReferenced.contains(stageDataFile.getCanonicalPath)) { + null + } else if ((startTime - stageDataFile.getLastModifiedTime) < stageDataFileActiveTime) { + null + } else if (!stageDataFile.delete()) { + null + } else { + // Stage data file deleted. + stageDataFile.getCanonicalPath + } + } + ).filter( + stageDataFile => stageDataFile != null + ).map( + stageDataFile => Row.fromSeq(Seq(stageDataFile)) Review comment: replace with .collect() No need to loop 3 times ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
kunal642 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582749192 @niuge01 Why are you not using the executors to make this job parallel? Not recommended to open threads in the driver, it will impact the other queries ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
Indhumathi27 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375659391 ########## File path: docs/dml-of-carbondata.md ########## @@ -446,6 +446,46 @@ CarbonData DML statements are documented here,which includes: ``` DELETE FROM carbontable WHERE column1 IN (SELECT column11 FROM sourceTable2 WHERE column1 = 'USA') ``` + +### DELETE STAGE Review comment: Can you please add documentation for flink integration to carbon and can move these new DDL's added for flink and stage to it. ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375713955 ########## File path: docs/dml-of-carbondata.md ########## @@ -446,6 +446,46 @@ CarbonData DML statements are documented here,which includes: ``` DELETE FROM carbontable WHERE column1 IN (SELECT column11 FROM sourceTable2 WHERE column1 = 'USA') ``` + +### DELETE STAGE Review comment: No DDL's added for flink. Both CarbonInsertFromStageCommand and CarbonDeleteStageFilesCommand are DML. ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
Indhumathi27 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375715464 ########## File path: docs/dml-of-carbondata.md ########## @@ -446,6 +446,46 @@ CarbonData DML statements are documented here,which includes: ``` DELETE FROM carbontable WHERE column1 IN (SELECT column11 FROM sourceTable2 WHERE column1 = 'USA') ``` + +### DELETE STAGE Review comment: okay.. Can you please add documentation for flink integration to carbon and stage files ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375730331 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,199 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections +import java.util.concurrent.Executors + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient var LOGGER: Logger = _ + + override def processData(spark: SparkSession): Seq[Row] = { + LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + FileFactory.getConfiguration.addResource(configuration) + setAuditTable(table) + if (!table.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + if (table.isChildTableForMV) { + throw new MalformedCarbonCommandException("Unsupported operation on MV table") + } + val tablePath = table.getTablePath + val startTime = System.currentTimeMillis() + val stageDataFileLocation = options.get("location") + if (stageDataFileLocation.isEmpty) { + throw new MalformedCarbonCommandException("Option [location] is not specified.") + } + val stageDataFileActiveTime = try { + Integer.valueOf(options.getOrElse("retain_hour", "0")) * 3600000 + } catch { + case _: NumberFormatException => + throw new MalformedCarbonCommandException( + "Option [retain_hour] is not a number.") + } + if (stageDataFileActiveTime < 0) { + throw new MalformedCarbonCommandException( + "Option [retain_hour] is negative.") + } + val stageDataFilesReferenced = + listStageDataFilesReferenced(listStageMetadataFiles(tablePath, configuration), configuration) + val stageDataFiles = listStageDataFiles(stageDataFileLocation.get, configuration) + stageDataFiles.map( + stageDataFile => { + // Which file will be deleted: + // 1. Not referenced by any stage file; + // 2. Has passed retain time. + if (stageDataFilesReferenced.contains(stageDataFile.getCanonicalPath)) { + null + } else if ((startTime - stageDataFile.getLastModifiedTime) < stageDataFileActiveTime) { + null + } else if (!stageDataFile.delete()) { + null + } else { + // Stage data file deleted. + stageDataFile.getCanonicalPath + } + } + ).filter( + stageDataFile => stageDataFile != null + ).map( + stageDataFile => Row.fromSeq(Seq(stageDataFile)) 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375730422 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,199 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections +import java.util.concurrent.Executors + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient var LOGGER: Logger = _ 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r375730494 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,199 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections +import java.util.concurrent.Executors + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient var LOGGER: Logger = _ + + override def processData(spark: SparkSession): Seq[Row] = { + LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + FileFactory.getConfiguration.addResource(configuration) Review comment: Removed ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
CarbonDataQA1 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582826229 Build Success with Spark 2.4.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbon_PR_Builder_2.4.4/166/ ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582826633 retest this please ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
CarbonDataQA1 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582836099 Build Success with Spark 2.4.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbon_PR_Builder_2.4.4/169/ ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
CarbonDataQA1 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582850144 Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbonPRBuilder2.3/1869/ ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
CarbonDataQA1 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-582859639 Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbonPRBuilder2.3/1871/ ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
jackylk commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r376186075 ########## File path: integration/flink/src/test/scala/org/apache/carbon/flink/TestDeleteStageFiles.scala ########## @@ -0,0 +1,203 @@ +/* + * 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.carbon.flink + +import java.io.File +import java.util.Properties + +import org.apache.flink.api.common.restartstrategy.RestartStrategies +import org.apache.flink.core.fs.Path +import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment +import org.apache.flink.streaming.api.functions.sink.filesystem.StreamingFileSink +import org.apache.spark.sql.Row +import org.apache.spark.sql.test.util.QueryTest + +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.util.path.CarbonTablePath + +class TestDeleteStageFiles extends QueryTest { + + val tableName = "test_flink_delete_stage_file" + + test("Delete stage file success") { + sql(s"DROP TABLE IF EXISTS $tableName").collect() + sql( + s""" + | CREATE TABLE $tableName (stringField string, intField int, shortField short) Review comment: How about partition table, is there testcase? ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
jackylk commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r376186321 ########## File path: integration/flink/src/main/java/org/apache/carbon/flink/CarbonS3Property.java ########## @@ -27,6 +27,7 @@ static final String DATA_TEMP_PATH = "carbon.writer.s3.data.temp.path"; + @Deprecated Review comment: I think we can delete this constant directly, since this version has not been released ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
jackylk commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r376186895 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,175 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + + override def processData(spark: SparkSession): Seq[Row] = { + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + setAuditTable(table) + if (!table.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + if (table.isChildTableForMV) { + throw new MalformedCarbonCommandException("Unsupported operation on MV table") + } + val tablePath = table.getTablePath + val startTime = System.currentTimeMillis() + val stageDataFileLocation = CarbonTablePath.getStageDataDir(tablePath) + val stageDataFileActiveTime = try { + Integer.valueOf(options.getOrElse("retain_hour", "0")) * 3600000 + } catch { + case _: NumberFormatException => + throw new MalformedCarbonCommandException( + "Option [retain_hour] is not a number.") + } + if (stageDataFileActiveTime < 0) { + throw new MalformedCarbonCommandException( + "Option [retain_hour] is negative.") + } + val stageDataFilesReferenced = + listStageDataFilesReferenced(listStageMetadataFiles(tablePath, configuration), configuration) + val stageDataFiles = listStageDataFiles(stageDataFileLocation, configuration) + stageDataFiles.collect { + case stageDataFile: CarbonFile => + // Which file will be deleted: + // 1. Not referenced by any stage file; + // 2. Has passed retain time. + if (!stageDataFilesReferenced.contains(stageDataFile.getCanonicalPath) && + (startTime - stageDataFile.getLastModifiedTime) >= stageDataFileActiveTime) { + stageDataFile.delete() + } + } + Seq.empty + } + + private def listStageMetadataFiles( + tablePath: String, + configuration: Configuration + ): Seq[CarbonFile] = { + val stagePath = CarbonTablePath.getStageDir(tablePath) + val stageDirectory = FileFactory.getCarbonFile(stagePath, configuration) + if (stageDirectory.exists()) { + stageDirectory.listFiles().filter { file => + !file.getName.endsWith(CarbonTablePath.SUCCESS_FILE_SUBFIX) + } + } else { + Seq.empty + } + } + + private def listStageDataFiles( + location: String, Review comment: can you pass tablePath instead, make it same as listStageMetadataFiles ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
jackylk commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r376186956 ########## File path: integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteStageFilesCommand.scala ########## @@ -0,0 +1,175 @@ +/* + * 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.spark.sql.execution.command.management + +import java.io.InputStreamReader +import java.util +import java.util.Collections + +import scala.collection.JavaConverters._ + +import com.google.gson.Gson +import org.apache.hadoop.conf.Configuration +import org.apache.log4j.Logger +import org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} + +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.filesystem.CarbonFile +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.statusmanager.StageInput +import org.apache.carbondata.core.util.path.CarbonTablePath + +/** + * Delete carbon data files of table stages. + * + * @param databaseNameOp database name + * @param tableName table name + */ +case class CarbonDeleteStageFilesCommand( + databaseNameOp: Option[String], + tableName: String, + options: Map[String, String] +) extends DataCommand { + + @transient val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getCanonicalName) + + override def processData(spark: SparkSession): Seq[Row] = { + Checker.validateTableExists(databaseNameOp, tableName, spark) + val table = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(spark) + val configuration = spark.sessionState.newHadoopConf() + setAuditTable(table) + if (!table.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + if (table.isChildTableForMV) { + throw new MalformedCarbonCommandException("Unsupported operation on MV table") + } + val tablePath = table.getTablePath + val startTime = System.currentTimeMillis() + val stageDataFileLocation = CarbonTablePath.getStageDataDir(tablePath) + val stageDataFileActiveTime = try { + Integer.valueOf(options.getOrElse("retain_hour", "0")) * 3600000 + } catch { + case _: NumberFormatException => + throw new MalformedCarbonCommandException( + "Option [retain_hour] is not a number.") + } + if (stageDataFileActiveTime < 0) { + throw new MalformedCarbonCommandException( + "Option [retain_hour] is negative.") + } + val stageDataFilesReferenced = + listStageDataFilesReferenced(listStageMetadataFiles(tablePath, configuration), configuration) + val stageDataFiles = listStageDataFiles(stageDataFileLocation, configuration) + stageDataFiles.collect { + case stageDataFile: CarbonFile => + // Which file will be deleted: + // 1. Not referenced by any stage file; + // 2. Has passed retain time. + if (!stageDataFilesReferenced.contains(stageDataFile.getCanonicalPath) && + (startTime - stageDataFile.getLastModifiedTime) >= stageDataFileActiveTime) { + stageDataFile.delete() + } + } + Seq.empty + } + + private def listStageMetadataFiles( + tablePath: String, + configuration: Configuration + ): Seq[CarbonFile] = { + val stagePath = CarbonTablePath.getStageDir(tablePath) + val stageDirectory = FileFactory.getCarbonFile(stagePath, configuration) + if (stageDirectory.exists()) { + stageDirectory.listFiles().filter { file => + !file.getName.endsWith(CarbonTablePath.SUCCESS_FILE_SUBFIX) + } + } else { + Seq.empty + } + } + + private def listStageDataFiles( + location: String, + configuration: Configuration + ): Seq[CarbonFile] = { + val stageDataFileLocation = FileFactory.getCarbonFile(location, configuration) + if (!stageDataFileLocation.exists()) { + LOGGER.warn("Stage data file location is not exists. " + location) + Seq.empty + } else { + stageDataFileLocation.listFiles(true).asScala + } + } + + private def listStageDataFilesReferenced( Review comment: can you add comment to describe the functionality of this function ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on issue #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#issuecomment-583218569 retest this please ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
In reply to this post by GitBox
niuge01 commented on a change in pull request #3602: [CARBONDATA-3676] Support clean carbon data files of stages.
URL: https://github.com/apache/carbondata/pull/3602#discussion_r376200115 ########## File path: docs/dml-of-carbondata.md ########## @@ -446,6 +446,46 @@ CarbonData DML statements are documented here,which includes: ``` DELETE FROM carbontable WHERE column1 IN (SELECT column11 FROM sourceTable2 WHERE column1 = 'USA') ``` + +### DELETE STAGE Review comment: OK ---------------------------------------------------------------- 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: [hidden email] With regards, Apache Git Services |
Free forum by Nabble | Edit this page |