MarvinLitt commented on a change in pull request #4203: URL: https://github.com/apache/carbondata/pull/4203#discussion_r689193622
########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/deletesegment/DeleteSegmentByRemainNumberTestCase.scala ########## @@ -0,0 +1,102 @@ +/* + * 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.deletesegment + +import org.apache.spark.sql.test.util.QueryTest +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} + +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.util.CarbonProperties + +/** + * test class for testing the delete segment expect remaining number. + */ +class DeleteSegmentByRemainNumberTestCase extends QueryTest with BeforeAndAfterAll with BeforeAndAfterEach { + val DELETED_STATUS = "Marked for Delete" + + val SUCCESSFUL_STATUS = "Success" + + override def beforeAll { + CarbonProperties.getInstance() + .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy") + .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy") + } + + override def beforeEach(): Unit = { + initTestTable + } + + test("delete segment, remain_number = 1") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("show segments on deleteSegmentTable").collect() + assertResult(SUCCESSFUL_STATUS)(rows(0).get(1)) + assertResult(DELETED_STATUS)(rows(1).get(1)) + assertResult(DELETED_STATUS)(rows(2).get(1)) + } + + test("delete segment, remain nothing") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 0") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(DELETED_STATUS)(row.get(1))) + } + + test("delete segment, remain all") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 3") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(SUCCESSFUL_STATUS)(row.get(1))) + } + + test("delete segment, remain_number = -1") { + val ex = intercept[Exception] { + sql("delete from table deleteSegmentTable expect segment.remain_number = -1") + } + assert(ex.getMessage.contains("not found in database")) Review comment: "not found in database" has nothing to do with -1, why choose this msg. ########## File path: integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteLoadByRemainNumberCommand.scala ########## @@ -0,0 +1,79 @@ +/* + * 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 org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} +import org.apache.carbondata.api.CarbonStore +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.core.exception.ConcurrentOperationException +import org.apache.carbondata.core.statusmanager.{SegmentStatus, SegmentStatusManager} +import org.apache.carbondata.events.{DeleteSegmentByIdPostEvent, DeleteSegmentByIdPreEvent, withEvents} + +/** + * A command for delete by remaining number. + * In general, keep the latest segment. + * + * @param remaining expected remaining quantity after deletion + */ +case class CarbonDeleteLoadByRemainNumberCommand( + remaining: String, + databaseNameOp: Option[String], + tableName: String) + extends DataCommand { + + override def processData(sparkSession: SparkSession): Seq[Row] = { + Checker.validateTableExists(databaseNameOp, tableName, sparkSession) + val carbonTable = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(sparkSession) + setAuditTable(carbonTable) + setAuditInfo(Map("remaining number" -> remaining)) + if (!carbonTable.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + + // if insert overwrite in progress, do not allow delete segment + if (SegmentStatusManager.isOverwriteInProgressInTable(carbonTable)) { + throw new ConcurrentOperationException(carbonTable, "insert overwrite", "delete segment") + } + + val segments = CarbonStore.readSegments(carbonTable.getTablePath, showHistory = false, None) + if (segments.length == remaining.toInt) { Review comment: if there has some segment with status SegmentStatus.MARKED_FOR_DELETE, does this condition is right or not? ########## File path: integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteLoadByRemainNumberCommand.scala ########## @@ -0,0 +1,79 @@ +/* + * 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 org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} +import org.apache.carbondata.api.CarbonStore +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.core.exception.ConcurrentOperationException +import org.apache.carbondata.core.statusmanager.{SegmentStatus, SegmentStatusManager} +import org.apache.carbondata.events.{DeleteSegmentByIdPostEvent, DeleteSegmentByIdPreEvent, withEvents} + +/** + * A command for delete by remaining number. + * In general, keep the latest segment. + * + * @param remaining expected remaining quantity after deletion + */ +case class CarbonDeleteLoadByRemainNumberCommand( + remaining: String, + databaseNameOp: Option[String], + tableName: String) + extends DataCommand { + + override def processData(sparkSession: SparkSession): Seq[Row] = { + Checker.validateTableExists(databaseNameOp, tableName, sparkSession) + val carbonTable = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(sparkSession) + setAuditTable(carbonTable) + setAuditInfo(Map("remaining number" -> remaining)) + if (!carbonTable.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + + // if insert overwrite in progress, do not allow delete segment + if (SegmentStatusManager.isOverwriteInProgressInTable(carbonTable)) { + throw new ConcurrentOperationException(carbonTable, "insert overwrite", "delete segment") + } Review comment: why this pr do not support insert overwrite ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/deletesegment/DeleteSegmentByRemainNumberTestCase.scala ########## @@ -0,0 +1,102 @@ +/* + * 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.deletesegment + +import org.apache.spark.sql.test.util.QueryTest +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} + +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.util.CarbonProperties + +/** + * test class for testing the delete segment expect remaining number. + */ +class DeleteSegmentByRemainNumberTestCase extends QueryTest with BeforeAndAfterAll with BeforeAndAfterEach { + val DELETED_STATUS = "Marked for Delete" + + val SUCCESSFUL_STATUS = "Success" + + override def beforeAll { + CarbonProperties.getInstance() + .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy") + .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy") + } + + override def beforeEach(): Unit = { + initTestTable + } + + test("delete segment, remain_number = 1") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("show segments on deleteSegmentTable").collect() + assertResult(SUCCESSFUL_STATUS)(rows(0).get(1)) + assertResult(DELETED_STATUS)(rows(1).get(1)) + assertResult(DELETED_STATUS)(rows(2).get(1)) + } + + test("delete segment, remain nothing") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 0") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(DELETED_STATUS)(row.get(1))) + } + + test("delete segment, remain all") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 3") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(SUCCESSFUL_STATUS)(row.get(1))) + } + + test("delete segment, remain_number = -1") { + val ex = intercept[Exception] { + sql("delete from table deleteSegmentTable expect segment.remain_number = -1") + } + assert(ex.getMessage.contains("not found in database")) + } + + test("delete segment after update") { + sql("update deleteSegmentTable d set (d.country) = ('fr') where d.country = 'aus'") + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("select * from deleteSegmentTable").collect() + rows.foreach(row => assertResult("fr")(row(2))) + } + + test("delete segment after delete newest segment by segmentId") { + sql("delete from table deleteSegmentTable where segment.id in (2)") + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("show segments on deleteSegmentTable").collect() + assertResult(DELETED_STATUS)(rows(0).get(1)) + assertResult(SUCCESSFUL_STATUS)(rows(1).get(1)) + assertResult(DELETED_STATUS)(rows(2).get(1)) + } + + private def initTestTable = { + sql("drop table if exists deleteSegmentTable") + sql( + "CREATE table deleteSegmentTable (ID int, date String, country String, name " + + "String, phonetype String, serialname String, salary String) STORED AS carbondata" + ) + sql( + s"""LOAD DATA local inpath '$resourcesPath/dataretention1.csv' + | INTO TABLE deleteSegmentTable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '"')""".stripMargin) + sql( + s"""LOAD DATA local inpath '$resourcesPath/dataretention2.csv' + | INTO TABLE deleteSegmentTable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '"')""".stripMargin) + sql( + s"""LOAD DATA local inpath '$resourcesPath/dataretention3.csv' + | INTO TABLE deleteSegmentTable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '"')""".stripMargin) + } Review comment: need some after all function to make sure the table has been removed. ########## File path: integration/spark/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala ########## @@ -511,6 +511,14 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser { CarbonDeleteLoadByIdCommand(loadIds, dbName, tableName.toLowerCase()) } + protected lazy val deleteSegmentByRemainNumber: Parser[LogicalPlan] = + DELETE ~> FROM ~ TABLE ~> (ident <~ ".").? ~ ident ~ + (EXPECT ~> (SEGMENT ~ "." ~ REMAIN_NUMBER) ~> "=" ~> segmentId) <~ Review comment: Remain_number do not need segmentid, just a number. ########## File path: integration/spark/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala ########## @@ -81,8 +81,8 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser { cacheManagement | insertStageData | indexCommands | mvCommands | describeCommands protected lazy val segmentManagement: Parser[LogicalPlan] = - deleteSegmentByID | deleteSegmentByLoadDate | deleteStage | cleanFiles | addSegment | - showSegments + deleteSegmentByID | deleteSegmentByLoadDate | deleteSegmentByRemainNumber | Review comment: please add deleteSegmentByRemainNumber to the tail of the expressions. ########## File path: integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonDeleteLoadByRemainNumberCommand.scala ########## @@ -0,0 +1,79 @@ +/* + * 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 org.apache.spark.sql.{CarbonEnv, Row, SparkSession} +import org.apache.spark.sql.execution.command.{Checker, DataCommand} +import org.apache.carbondata.api.CarbonStore +import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException +import org.apache.carbondata.core.exception.ConcurrentOperationException +import org.apache.carbondata.core.statusmanager.{SegmentStatus, SegmentStatusManager} +import org.apache.carbondata.events.{DeleteSegmentByIdPostEvent, DeleteSegmentByIdPreEvent, withEvents} + +/** + * A command for delete by remaining number. + * In general, keep the latest segment. + * + * @param remaining expected remaining quantity after deletion + */ +case class CarbonDeleteLoadByRemainNumberCommand( + remaining: String, + databaseNameOp: Option[String], + tableName: String) + extends DataCommand { + + override def processData(sparkSession: SparkSession): Seq[Row] = { + Checker.validateTableExists(databaseNameOp, tableName, sparkSession) + val carbonTable = CarbonEnv.getCarbonTable(databaseNameOp, tableName)(sparkSession) + setAuditTable(carbonTable) + setAuditInfo(Map("remaining number" -> remaining)) + if (!carbonTable.getTableInfo.isTransactionalTable) { + throw new MalformedCarbonCommandException("Unsupported operation on non transactional table") + } + + // if insert overwrite in progress, do not allow delete segment + if (SegmentStatusManager.isOverwriteInProgressInTable(carbonTable)) { + throw new ConcurrentOperationException(carbonTable, "insert overwrite", "delete segment") + } + + val segments = CarbonStore.readSegments(carbonTable.getTablePath, showHistory = false, None) + if (segments.length == remaining.toInt) { Review comment: remaining.toInt means the segment count shoule be int range, does this restriction necessary ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/deletesegment/DeleteSegmentByRemainNumberTestCase.scala ########## @@ -0,0 +1,102 @@ +/* + * 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.deletesegment + +import org.apache.spark.sql.test.util.QueryTest +import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} + +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.util.CarbonProperties + +/** + * test class for testing the delete segment expect remaining number. + */ +class DeleteSegmentByRemainNumberTestCase extends QueryTest with BeforeAndAfterAll with BeforeAndAfterEach { + val DELETED_STATUS = "Marked for Delete" + + val SUCCESSFUL_STATUS = "Success" + + override def beforeAll { + CarbonProperties.getInstance() + .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy") + .addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "dd-MM-yyyy") + } + + override def beforeEach(): Unit = { + initTestTable + } + + test("delete segment, remain_number = 1") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("show segments on deleteSegmentTable").collect() + assertResult(SUCCESSFUL_STATUS)(rows(0).get(1)) + assertResult(DELETED_STATUS)(rows(1).get(1)) + assertResult(DELETED_STATUS)(rows(2).get(1)) + } + + test("delete segment, remain nothing") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 0") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(DELETED_STATUS)(row.get(1))) + } + + test("delete segment, remain all") { + sql("delete from table deleteSegmentTable expect segment.remain_number = 3") + val rows = sql("show segments on deleteSegmentTable").collect() + rows.foreach(row => assertResult(SUCCESSFUL_STATUS)(row.get(1))) + } + + test("delete segment, remain_number = -1") { + val ex = intercept[Exception] { + sql("delete from table deleteSegmentTable expect segment.remain_number = -1") + } + assert(ex.getMessage.contains("not found in database")) + } + + test("delete segment after update") { + sql("update deleteSegmentTable d set (d.country) = ('fr') where d.country = 'aus'") + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("select * from deleteSegmentTable").collect() + rows.foreach(row => assertResult("fr")(row(2))) + } + + test("delete segment after delete newest segment by segmentId") { + sql("delete from table deleteSegmentTable where segment.id in (2)") + sql("delete from table deleteSegmentTable expect segment.remain_number = 1") + val rows = sql("show segments on deleteSegmentTable").collect() + assertResult(DELETED_STATUS)(rows(0).get(1)) + assertResult(SUCCESSFUL_STATUS)(rows(1).get(1)) + assertResult(DELETED_STATUS)(rows(2).get(1)) + } + Review comment: add some partition table test case, to make sure the partition table works well -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
