akkio-97 commented on a change in pull request #4129:
URL:
https://github.com/apache/carbondata/pull/4129#discussion_r647111781##########
File path: integration/spark/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AlterTableColumnRenameTestCase.scala
##########
@@ -48,6 +52,298 @@ class AlterTableColumnRenameTestCase extends QueryTest with BeforeAndAfterAll {
sql("drop table simple_table")
}
+ test("Rename more than one column at a time in one operation") {
+ sql("drop table if exists test_rename")
+ sql("CREATE TABLE test_rename (str struct<a:struct<b:int, d:int>, c:int>) STORED AS carbondata")
+ sql("insert into test_rename values(named_struct('a',named_struct('b',12,'d',12), 'c', 12))")
+ sql("alter table test_rename change str str22 struct<a11:struct<b2:int, d:int>, c:int>")
+ sql("insert into test_rename values(named_struct('a11',named_struct('b2',24,'d',24), 'c', 24))")
+
+ val rows = sql("select str22.a11.b2 from test_rename").collect()
+ assert(rows(0).equals(Row(12)) && rows(1).equals(Row(24)))
+ // check if old column names are still present
+ val ex1 = intercept[AnalysisException] {
+ sql("select str from test_rename").show(false)
+ }
+ assert(ex1.getMessage.contains("cannot resolve '`str`'"))
+
+ val ex2 = intercept[AnalysisException] {
+ sql("select str.a from test_rename").show(false)
+ }
+ assert(ex2.getMessage.contains("cannot resolve '`str.a`'"))
+
+ // check un-altered columns
+ val rows1 = sql("select str22.c from test_rename").collect()
+ val rows2 = sql("select str22.a11.d from test_rename").collect()
+ assert(rows1.sameElements(Array(Row(12), Row(24))))
+ assert(rows2.sameElements(Array(Row(12), Row(24))))
+ }
+
+ test("rename complex columns with invalid structure/duplicate-names/Map-type") {
+ sql("drop table if exists test_rename")
+ sql(
+ "CREATE TABLE test_rename (str struct<a:int,b:long>, str2 struct<a:int,b:long>, map1 " +
+ "map<string, string>, str3 struct<a:int, b:map<string, string>>) STORED AS carbondata")
+
+ val ex1 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str struct<a:array<int>,b:long>")
+ }
+ assert(ex1.getMessage
+ .contains(
+ "column rename operation failed: Altering datatypes of any child column is not supported"))
+
+ val ex2 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str struct<a:int,b:long,c:int>")
+ }
+ assert(ex2.getMessage
+ .contains(
+ "column rename operation failed: Number of children of old and new complex columns are " +
+ "not the same"))
+
+ val ex3 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str int")
+ }
+ assert(ex3.getMessage
+ .contains(
+ "column rename operation failed: Old and new complex columns are not compatible " +
+ "in structure"))
+
+ val ex4 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str struct<a:int,a:long>")
+ }
+ assert(ex4.getMessage
+ .contains(
+ "column rename operation failed: Duplicate columns are present"))
+
+ val ex5 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str2 struct<a:int,b:long>")
+ }
+ assert(ex5.getMessage
+ .contains(
+ "Column Rename Operation failed. New column name str2 already exists in table test_rename"))
+
+ val ex6 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change map1 map2 map<string, struct<a:int>>")
+ }
+ assert(ex6.getMessage
+ .contains("rename operation failed: Alter rename is unsupported for Map datatype column"))
+
+ val ex7 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str3 str33 struct<a:int, bc:map<string, string>>")
+ }
+ assert(ex7.getMessage
+ .contains(
+ "rename operation failed: Cannot alter complex structure that includes map type column"))
+
+ val ex8 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str2 str22 struct<>")
+ }
+ assert(ex8.getMessage
+ .contains(
+ "rename operation failed: Either the old or the new dimension is null"))
+
+ // ensure all failed rename operations have been reverted to original state
+ val describe = sql("desc table test_rename")
+ assert(describe.collect().size == 4)
+ assertResult(1)(describe.filter(
+ "col_name='str' and data_type = 'struct<a:int,b:bigint>'").count())
+ assertResult(1)(describe.filter(
+ "col_name='str2' and data_type = 'struct<a:int,b:bigint>'").count())
+ assertResult(1)(describe.filter(
+ "col_name='map1' and data_type = 'map<string,string>'").count())
+ assertResult(1)(describe.filter(
+ "col_name='str3' and data_type = 'struct<a:int,b:map<string,string>>'").count())
+ }
+
+ def checkAnswerUtil1(df1: DataFrame, df2: DataFrame, df3: DataFrame) {
+ checkAnswer(df1, Seq(Row(Row(Row(2)))))
+ checkAnswer(df2, Seq(Row(Row(2))))
+ checkAnswer(df3, Seq(Row(2)))
+ }
+
+ def checkAnswerUtil2(df1: DataFrame, df2: DataFrame, df3: DataFrame) {
+ checkAnswer(df1, Seq(Row(Row(Row(2))), Row(Row(Row(3)))))
+ checkAnswer(df2, Seq(Row(Row(2)), Row(Row(3))))
+ checkAnswer(df3, Seq(Row(2), Row(3)))
+ }
+
+ test("test alter rename struct of (primitive/struct/array)") {
+ sql("drop table if exists test_rename")
+ sql("CREATE TABLE test_rename (str1 struct<a:int>, str2 struct<a:struct<b:int>>, str3 " +
+ "struct<a:struct<b:struct<c:int>>>, intfield int) STORED AS carbondata")
+ sql("insert into test_rename values(named_struct('a', 2), " +
+ "named_struct('a', named_struct('b', 2)), named_struct('a', named_struct('b', " +
+ "named_struct('c', 2))), 1)")
+
+ // Operation 1: rename parent column from str2 to str22 and read old rows
+ sql("alter table test_rename change str2 str22 struct<a:struct<b:int>>")
+ var df1 = sql("select str22 from test_rename")
+ var df2 = sql("select str22.a from test_rename")
+ var df3 = sql("select str22.a.b from test_rename")
+ assert(df1.collect().size == 1 && df2.collect().size == 1 && df3.collect().size == 1)
+ checkAnswerUtil1(df1, df2, df3)
+
+ // Operation 2: rename child column from a to a11
+ sql("alter table test_rename change str22 str22 struct<a11:struct<b:int>>")
+ df1 = sql("select str22 from test_rename")
+ df2 = sql("select str22.a11 from test_rename")
+ df3 = sql("select str22.a11.b from test_rename")
+ assert(df1.collect().size == 1 && df2.collect().size == 1 && df3.collect().size == 1)
+ checkAnswerUtil1(df1, df2, df3)
+
+ // Operation 3: rename parent column from str22 to str33
+ sql("alter table test_rename change str22 str33 struct<a11:struct<b:int>>")
+ df1 = sql("select str33 from test_rename")
+ df2 = sql("select str33.a11 from test_rename")
+ df3 = sql("select str33.a11.b from test_rename")
+ assert(df1.collect().size == 1 && df2.collect().size == 1 && df3.collect().size == 1)
+ checkAnswerUtil1(df1, df2, df3)
+
+ // insert new rows
+ sql("insert into test_rename values(named_struct('a', 3), " +
+ "named_struct('a', named_struct('b', 3)), named_struct('a', named_struct('b', " +
+ "named_struct('c', 3))), 2)")
+ df1 = sql("select str33 from test_rename")
+ df2 = sql("select str33.a11 from test_rename")
+ df3 = sql("select str33.a11.b from test_rename")
+ assert(df1.collect().size == 2 && df2.collect().size == 2 && df3.collect().size == 2)
+ checkAnswerUtil2(df1, df2, df3)
+
+ // Operation 4: rename child column from a11 to a22 & b to b11
+ sql("alter table test_rename change str33 str33 struct<a22:struct<b11:int>>")
+ df1 = sql("select str33 from test_rename")
+ df2 = sql("select str33.a22 from test_rename")
+ df3 = sql("select str33.a22.b11 from test_rename")
+ assert(df1.collect().size == 2 && df2.collect().size == 2 && df3.collect().size == 2)
+ checkAnswerUtil2(df1, df2, df3)
+
+ // Operation 5: rename primitive column from intField to intField2
+ sql("alter table test_rename change intField intField2 int")
+
+ val describe = sql("desc table test_rename")
+ assert(describe.collect().size == 4)
+ assertResult(1)(describe.filter(
+ "col_name='str1' and data_type = 'struct<a:int>'").count())
+ assertResult(1)(describe.filter(
+ "col_name='str33' and data_type = 'struct<a22:struct<b11:int>>'").count())
+ assertResult(1)(describe.filter(
+ "col_name='str3' and data_type = 'struct<a:struct<b:struct<c:int>>>'").count())
+
+ // validate schema evolution entries for 4 above alter operations
+ val (addedColumns, removedColumns, noOfEvolutions) = returnValuesAfterSchemaEvolution(
+ "test_rename")
+ validateSchemaEvolution(addedColumns, removedColumns, noOfEvolutions)
+ }
+
+ def returnValuesAfterSchemaEvolution(tableName: String): (Seq[ColumnSchema], Seq[ColumnSchema],
+ Int) = {
+ val carbonTable = CarbonEnv.getCarbonTable(None, tableName)(sqlContext.sparkSession)
+ val schemaEvolutionList = carbonTable.getTableInfo
+ .getFactTable
+ .getSchemaEvolution()
+ .getSchemaEvolutionEntryList()
+ var addedColumns = Seq[ColumnSchema]()
+ var removedColumns = Seq[ColumnSchema]()
+ for (i <- 0 until schemaEvolutionList.size()) {
+ addedColumns ++=
+ JavaConverters
+ .asScalaIteratorConverter(schemaEvolutionList.get(i).getAdded.iterator())
+ .asScala
+ .toSeq
+
+ removedColumns ++=
+ JavaConverters
+ .asScalaIteratorConverter(schemaEvolutionList.get(i).getRemoved.iterator())
+ .asScala
+ .toSeq
+ }
+ (addedColumns, removedColumns, schemaEvolutionList.size() - 1)
+ }
+
+ def validateSchemaEvolution(added: Seq[ColumnSchema], removed: Seq[ColumnSchema],
+ noOfEvolutions: Int): Unit = {
+ assert(noOfEvolutions == 5 && added.size == 11 && removed.size == 11)
+ // asserting only first 6 entries of added and removed columns
+ assert(
+ added(0).getColumnName.equals("str22") && removed(0).getColumnName.equals("str2") &&
+ added(1).getColumnName.equals("str22.a") && removed(1).getColumnName.equals("str2.a") &&
+ added(2).getColumnName.equals("str22.a.b") && removed(2).getColumnName.equals("str2.a.b") &&
+ added(3).getColumnName.equals("str22.a11") && removed(3).getColumnName.equals("str22.a") &&
+ added(4).getColumnName.equals("str22.a11.b") && removed(4).getColumnName.equals("str22.a.b")&&
+ added(5).getColumnName.equals("str33") && removed(5).getColumnName.equals("str22"))
+ }
+
+ test("test alter rename array of (primitive/array/struct)") {
+ sql("drop table if exists test_rename")
+ sql(
+ "CREATE TABLE test_rename (arr1 array<int>, arr2 array<array<int>>, arr3 array<string>, " +
+ "arr4 array<struct<a:int>>) STORED AS carbondata")
+ sql(
+ "insert into test_rename values (array(1,2,3), array(array(1,2),array(3,4)), array('hello'," +
+ "'world'), array(named_struct('a',45)))")
+
+ sql("alter table test_rename change arr1 arr11 array<int>")
+ val df1 = sql("select arr11 from test_rename")
+ assert(df1.collect.size == 1)
+ checkAnswer(df1, Seq(Row(make(Array(1, 2, 3)))))
+
+ sql("alter table test_rename change arr2 arr22 array<array<int>>")
+ val df2 = sql("select arr22 from test_rename")
+ assert(df2.collect.size == 1)
+ checkAnswer(df2, Seq(Row(make(Array(make(Array(1, 2)), make(Array(3, 4)))))))
+
+ sql("alter table test_rename change arr3 arr33 array<string>")
+ val df3 = sql("select arr33 from test_rename")
+ assert(df3.collect.size == 1)
+ checkAnswer(sql("select arr33 from test_rename"), Seq(Row(make(Array("hello", "world")))))
+
+ sql("alter table test_rename change arr4 arr44 array<struct<a:int>>")
+ sql("alter table test_rename change arr44 arr44 array<struct<a11:int>>")
+
+ val df4 = sql("select arr44.a11 from test_rename")
+ assert(df4.collect.size == 1)
+ checkAnswer(df4, Seq(Row(make(Array(45)))))
+
+ // test for new inserted row
+ sql(
+ "insert into test_rename values (array(11,22,33), array(array(11,22),array(33,44)), array" +
+ "('hello11', 'world11'), array(named_struct('a',4555)))")
+ val rows = sql("select arr11, arr22, arr33, arr44.a11 from test_rename").collect
+ assert(rows.size == 2)
+ val secondRow = rows(1)
+ assert(secondRow(0).equals(make(Array(11, 22, 33))) &&
+ secondRow(1).equals(make(Array(make(Array(11, 22)), make(Array(33, 44))))) &&
+ secondRow(2).equals(make(Array("hello11", "world11"))))
+ }
+
+ test("validate alter change datatype for complex children columns") {
+ sql("drop table if exists test_rename")
+ sql(
+ "CREATE TABLE test_rename (str struct<a:int,b:long>) STORED AS carbondata")
+
+ val ex1 = intercept[ProcessMetaDataException] {
+ sql("alter table test_rename change str str struct<a:long,b:long>")
+ }
+ assert(ex1.getMessage
+ .contains(
+ "column rename operation failed: Altering datatypes of any child column is not supported"))
+ }
+
+ test("test change comment in case of complex types") {
+ sql("drop table if exists test_rename")
+ sql(
+ "CREATE TABLE test_rename (str struct<a:int> comment 'comment') STORED AS carbondata")
+ sql("alter table test_rename change str str struct<a:int> comment 'new comment'")
+ var describe = sql("desc table test_rename")
+ var count = describe.filter("col_name='str' and comment = 'new comment'").count()
+ assertResult(1)(count)
+
+ sql("alter table test_rename change str str struct<a1:int> comment 'new comment 2'")
+ describe = sql("desc table test_rename")
+ count = describe.filter("col_name='str' and comment = 'new comment 2'").count()
+ assertResult(1)(count)
+ }
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]
Locked
