nihal0107 commented on a change in pull request #4071:
URL: https://github.com/apache/carbondata/pull/4071#discussion_r563482082
##########
File path:
index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/mergedata/CarbonDataFileMergeTestCaseOnSI.scala
##########
@@ -288,9 +268,7 @@ class CarbonDataFileMergeTestCaseOnSI
CarbonCommonConstants.CARBON_SI_SEGMENT_MERGE_DEFAULT)
}
- test("test verify data file merge when exception occurred in rebuild
segment") {
- CarbonProperties.getInstance()
- .addProperty(CarbonCommonConstants.CARBON_SI_SEGMENT_MERGE, "false")
+ def createTableAndLoadData(): Unit = {
Review comment:
done
##########
File path:
index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/DropTableTest.scala
##########
@@ -88,4 +90,17 @@ class DropTableTest extends QueryTest with BeforeAndAfterAll
{
assert(sql("show indexes on testDrop").collect().isEmpty)
sql("drop table if exists testDrop")
}
+
+ test("test index drop when SI table is not deleted while main table is
deleted") {
+ sql("drop table if exists testDrop")
+ sql("create table testDrop (a string, b string, c string) STORED AS
carbondata")
+ sql("create index index11 on table testDrop (c) AS 'carbondata'")
+ sql("insert into testDrop values('ab', 'cd', 'ef')")
+ val mock = TestSecondaryIndexUtils.mockSIDrop()
+ sql("drop table if exists testDrop")
+ mock.tearDown()
+ assert(Files.exists(Paths.get(warehouse + "/" + "index11")))
+ sql("drop table if exists testDrop")
+ sql("drop database if exists test cascade")
Review comment:
removed
##########
File path:
index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonInternalMetastore.scala
##########
@@ -0,0 +1,137 @@
+/*
+ * 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.secondaryindex
+
+import org.apache.spark.sql.CarbonEnv
+import org.apache.spark.sql.catalyst.TableIdentifier
+import org.apache.spark.sql.index.CarbonIndexUtil
+import org.apache.spark.sql.secondaryindex.hive.CarbonInternalMetastore
+import org.apache.spark.sql.test.util.QueryTest
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+
+import org.apache.carbondata.core.metadata.schema.table.CarbonTable
+
+class TestCarbonInternalMetastore extends QueryTest with BeforeAndAfterAll
with BeforeAndAfterEach {
+
+ val dbName: String = "test"
+ val tableName: String = "table1"
+ val indexName: String = "index1"
+ var tableIdentifier: TableIdentifier = _
+ var parentCarbonTable: CarbonTable = _
+ var indexTable: CarbonTable = _
+
+ override def beforeAll(): Unit = {
+ sql("drop database if exists test cascade");
+ }
+
+ override def beforeEach(): Unit = {
+ sql("drop database if exists test cascade");
+ sql("create database test")
+ sql("use test")
+ sql("drop table if exists table1")
+ sql("create table table1(a string, b string, c string) stored as
carbondata")
+ sql("create index index1 on table1(b) as 'carbondata'")
+ sql("insert into table1 values('ab','bc','cd')")
+ }
+
+ def setVariables(indexName: String): Unit = {
+ tableIdentifier = new TableIdentifier(indexName, Some("test"))
+ parentCarbonTable = CarbonEnv.getCarbonTable(Some("test"),
"table1")(sqlContext.sparkSession)
+ indexTable = CarbonEnv.getCarbonTable(Some("test"),
"index1")(sqlContext.sparkSession)
+ }
+
+ test("test delete index silent") {
+ setVariables("index1")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ parentCarbonTable)(sqlContext.sparkSession)
+ checkExistence(sql("show indexes on table1"), false, "index1")
+ }
+
+ test("test delete index table silently when exception occur") {
+ setVariables("unknown")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ parentCarbonTable)(sqlContext.sparkSession)
+ checkExistence(sql("show indexes on table1"), true, "index1")
+ setVariables("index1")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ indexTable)(sqlContext.sparkSession)
Review comment:
this is just to check when we are passing index table as parent table
then delete will fail. I have added comments and also included true condition.
##########
File path:
index/secondary-index/src/test/scala/org/apache/carbondata/spark/testsuite/secondaryindex/TestCarbonInternalMetastore.scala
##########
@@ -0,0 +1,137 @@
+/*
+ * 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.secondaryindex
+
+import org.apache.spark.sql.CarbonEnv
+import org.apache.spark.sql.catalyst.TableIdentifier
+import org.apache.spark.sql.index.CarbonIndexUtil
+import org.apache.spark.sql.secondaryindex.hive.CarbonInternalMetastore
+import org.apache.spark.sql.test.util.QueryTest
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
+
+import org.apache.carbondata.core.metadata.schema.table.CarbonTable
+
+class TestCarbonInternalMetastore extends QueryTest with BeforeAndAfterAll
with BeforeAndAfterEach {
+
+ val dbName: String = "test"
+ val tableName: String = "table1"
+ val indexName: String = "index1"
+ var tableIdentifier: TableIdentifier = _
+ var parentCarbonTable: CarbonTable = _
+ var indexTable: CarbonTable = _
+
+ override def beforeAll(): Unit = {
+ sql("drop database if exists test cascade");
+ }
+
+ override def beforeEach(): Unit = {
+ sql("drop database if exists test cascade");
+ sql("create database test")
+ sql("use test")
+ sql("drop table if exists table1")
+ sql("create table table1(a string, b string, c string) stored as
carbondata")
+ sql("create index index1 on table1(b) as 'carbondata'")
+ sql("insert into table1 values('ab','bc','cd')")
+ }
+
+ def setVariables(indexName: String): Unit = {
+ tableIdentifier = new TableIdentifier(indexName, Some("test"))
+ parentCarbonTable = CarbonEnv.getCarbonTable(Some("test"),
"table1")(sqlContext.sparkSession)
+ indexTable = CarbonEnv.getCarbonTable(Some("test"),
"index1")(sqlContext.sparkSession)
+ }
+
+ test("test delete index silent") {
+ setVariables("index1")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ parentCarbonTable)(sqlContext.sparkSession)
+ checkExistence(sql("show indexes on table1"), false, "index1")
+ }
+
+ test("test delete index table silently when exception occur") {
+ setVariables("unknown")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ parentCarbonTable)(sqlContext.sparkSession)
+ checkExistence(sql("show indexes on table1"), true, "index1")
+ setVariables("index1")
+ CarbonInternalMetastore.deleteIndexSilent(tableIdentifier, "",
+ indexTable)(sqlContext.sparkSession)
+ checkExistence(sql("show indexes on table1"), true, "index1")
+ }
+
+ test("test show index when SI were created before the change
CARBONDATA-3765") {
+ val mock = TestSecondaryIndexUtils.mockIndexInfo()
+ checkExistence(sql("show indexes on table1"), true, "index1")
+ mock.tearDown()
+ }
+
+ test("test refresh index with different value of isIndexTableExists") {
+ setVariables("index1")
+ sql("create index index2 on table1(b) as 'bloomfilter'")
+ parentCarbonTable = CarbonEnv.getCarbonTable(Some("test"),
"table1")(sqlContext.sparkSession)
+
assert(CarbonIndexUtil.isIndexExists(parentCarbonTable).equalsIgnoreCase("true"))
+ CarbonIndexUtil.addOrModifyTableProperty(parentCarbonTable,
Map("indexExists" -> "false"))(
Review comment:
yeah, made the changes.
----------------------------------------------------------------
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
