You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2016/09/13 01:09:01 UTC
[1/2] incubator-carbondata git commit: Drop table in test case
Repository: incubator-carbondata
Updated Branches:
refs/heads/master f9e557595 -> a5dc4b6c8
Drop table in test case
Rename repeated table name
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a3ce59a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a3ce59a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a3ce59a2
Branch: refs/heads/master
Commit: a3ce59a263014f352a3651217dd291187ad36f2c
Parents: f9e5575
Author: Zhangshunyu <zh...@huawei.com>
Authored: Fri Sep 9 11:32:51 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Tue Sep 13 09:07:34 2016 +0800
----------------------------------------------------------------------
.../dataload/TestLoadDataWithHiveSyntax.scala | 157 ++++++++++++-------
1 file changed, 101 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/a3ce59a2/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
index 0cc2b9f..f58937e 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
@@ -35,6 +35,32 @@ import org.scalatest.BeforeAndAfterAll
class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
+ sql("drop table if exists escapechar1")
+ sql("drop table if exists escapechar2")
+ sql("drop table if exists escapechar3")
+ sql("drop table if exists specialcharacter1")
+ sql("drop table if exists specialcharacter2")
+ sql("drop table if exists collessthanschema")
+ sql("drop table if exists decimalarray")
+ sql("drop table if exists decimalstruct")
+ sql("drop table if exists carbontable")
+ sql("drop table if exists hivetable")
+ sql("drop table if exists testtable")
+ sql("drop table if exists testhivetable")
+ sql("drop table if exists testtable1")
+ sql("drop table if exists testhivetable1")
+ sql("drop table if exists complexcarbontable")
+ sql("drop table if exists complex_t3")
+ sql("drop table if exists complex_hive_t3")
+ sql("drop table if exists header_test")
+ sql("drop table if exists duplicateColTest")
+ sql("drop table if exists mixed_header_test")
+ sql("drop table if exists primitivecarbontable")
+ sql("drop table if exists UPPERCASEcube")
+ sql("drop table if exists lowercaseCUBE")
+ sql("drop table if exists carbontable1")
+ sql("drop table if exists hivetable1")
+ sql("drop table if exists comment_test")
sql(
"CREATE table carbontable (empno int, empname String, designation String, doj String, " +
"workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, " +
@@ -48,8 +74,6 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
"utilization String,salary String)row format delimited fields terminated by ','"
)
- sql("drop table if exists carbontable1")
- sql("drop table if exists hivetable1")
}
test("test data loading and validate query output") {
@@ -85,8 +109,8 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
)
checkAnswer(sql("select * from testtable"), sql("select * from testhivetable"))
//drop test cube and table
- sql("drop table testtable")
- sql("drop table testhivetable")
+ sql("drop table if exists testtable")
+ sql("drop table if exists testhivetable")
}
/**
@@ -122,8 +146,8 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
)
checkAnswer(sql("select * from testtable1"), sql("select * from testhivetable1"))
//drop test cube and table
- sql("drop table testtable1")
- sql("drop table testhivetable1")
+ sql("drop table if exists testtable1")
+ sql("drop table if exists testhivetable1")
}
test("test hive table data loading") {
@@ -203,7 +227,7 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
"'COMPLEX_DELIMITER_LEVEL_1'='$', 'COMPLEX_DELIMITER_LEVEL_2'=':')"
)
sql("select count(*) from complexcarbontable")
- sql("drop table complexcarbontable")
+ sql("drop table if exists complexcarbontable")
}
test("test carbon table data loading with csv file Header in caps") {
@@ -328,7 +352,7 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
"LOAD DATA local inpath './src/test/resources/data.csv' INTO table uppercasecube OPTIONS" +
"('DELIMITER'=',', 'QUOTECHAR'='\"')"
)
- sql("drop table UpperCaseCube")
+ sql("drop table if exists UpperCaseCube")
}
test(
@@ -344,15 +368,15 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
"LOAD DATA local inpath './src/test/resources/data.csv' INTO table LOWERCASECUBE OPTIONS" +
"('DELIMITER'=',', 'QUOTECHAR'='\"')"
)
- sql("drop table LowErcasEcube")
+ sql("drop table if exists LowErcasEcube")
}
test("test carbon table data loading using escape char 1") {
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS escapechar1")
sql(
"""
- CREATE TABLE IF NOT EXISTS t3
+ CREATE TABLE IF NOT EXISTS escapechar1
(ID Int, date Timestamp, country String,
name String, phonetype String, serialname String, salary Int)
STORED BY 'org.apache.carbondata.format'
@@ -362,88 +386,88 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/mm/dd")
sql(
s"""
- LOAD DATA LOCAL INPATH './src/test/resources/datawithbackslash.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/datawithbackslash.csv' into table escapechar1
OPTIONS('ESCAPECHAR'='@')
"""
)
- checkAnswer(sql("select count(*) from t3"), Seq(Row(10)))
+ checkAnswer(sql("select count(*) from escapechar1"), Seq(Row(10)))
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS escapechar1")
}
test("test carbon table data loading using escape char 2") {
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS escapechar2")
sql(
"""
- CREATE TABLE t3(imei string,specialchar string)
+ CREATE TABLE escapechar2(imei string,specialchar string)
STORED BY 'org.apache.carbondata.format'
"""
)
sql(
"""
- LOAD DATA LOCAL INPATH './src/test/resources/datawithescapecharacter.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/datawithescapecharacter.csv' into table escapechar2
options ('DELIMITER'=',', 'QUOTECHAR'='"','ESCAPECHAR'='\')
"""
)
- checkAnswer(sql("select count(*) from t3"), Seq(Row(21)))
- checkAnswer(sql("select specialchar from t3 where imei = '1AA44'"), Seq(Row("escapeesc")))
- sql("DROP TABLE IF EXISTS t3")
+ checkAnswer(sql("select count(*) from escapechar2"), Seq(Row(21)))
+ checkAnswer(sql("select specialchar from escapechar2 where imei = '1AA44'"), Seq(Row("escapeesc")))
+ sql("DROP TABLE IF EXISTS escapechar2")
}
test("test carbon table data loading using escape char 3") {
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS escapechar3")
sql(
"""
- CREATE TABLE t3(imei string,specialchar string)
+ CREATE TABLE escapechar3(imei string,specialchar string)
STORED BY 'org.apache.carbondata.format'
"""
)
sql(
"""
- LOAD DATA LOCAL INPATH './src/test/resources/datawithescapecharacter.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/datawithescapecharacter.csv' into table escapechar3
options ('DELIMITER'=',', 'QUOTECHAR'='"','ESCAPECHAR'='@')
"""
)
- checkAnswer(sql("select count(*) from t3"), Seq(Row(21)))
- checkAnswer(sql("select specialchar from t3 where imei in ('1232','12323')"), Seq(Row
+ checkAnswer(sql("select count(*) from escapechar3"), Seq(Row(21)))
+ checkAnswer(sql("select specialchar from escapechar3 where imei in ('1232','12323')"), Seq(Row
("ayush@b.com"), Row("ayushb.com")
)
)
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS escapechar3")
}
test("test carbon table data loading with special character 1") {
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS specialcharacter1")
sql(
"""
- CREATE TABLE t3(imei string,specialchar string)
+ CREATE TABLE specialcharacter1(imei string,specialchar string)
STORED BY 'org.apache.carbondata.format'
"""
)
sql(
"""
- LOAD DATA LOCAL INPATH './src/test/resources/datawithspecialcharacter.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/datawithspecialcharacter.csv' into table specialcharacter1
options ('DELIMITER'=',', 'QUOTECHAR'='"')
"""
)
- checkAnswer(sql("select count(*) from t3"), Seq(Row(37)))
- checkAnswer(sql("select specialchar from t3 where imei='1AA36'"), Seq(Row("\"i\"")))
- sql("DROP TABLE IF EXISTS t3")
+ checkAnswer(sql("select count(*) from specialcharacter1"), Seq(Row(37)))
+ checkAnswer(sql("select specialchar from specialcharacter1 where imei='1AA36'"), Seq(Row("\"i\"")))
+ sql("DROP TABLE IF EXISTS specialcharacter1")
}
test("test carbon table data loading with special character 2") {
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS specialcharacter2")
sql(
"""
- CREATE table t3(customer_id int, 124_string_level_province String, date_level String,
+ CREATE table specialcharacter2(customer_id int, 124_string_level_province String, date_level String,
Time_level String, lname String, fname String, mi String, address1 String, address2
String, address3 String, address4 String, city String, country String, phone1 String,
phone2 String, marital_status String, yearly_income String, gender String, education
@@ -457,22 +481,22 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
sql(
"""
LOAD DATA LOCAL INPATH './src/test/resources/datawithcomplexspecialchar.csv' into
- table t3 options ('DELIMITER'=',', 'QUOTECHAR'='"','ESCAPECHAR'='"')
+ table specialcharacter2 options ('DELIMITER'=',', 'QUOTECHAR'='"','ESCAPECHAR'='"')
"""
)
- checkAnswer(sql("select count(*) from t3"), Seq(Row(150)))
- checkAnswer(sql("select 124_string_level_province from t3 where customer_id=103"),
+ checkAnswer(sql("select count(*) from specialcharacter2"), Seq(Row(150)))
+ checkAnswer(sql("select 124_string_level_province from specialcharacter2 where customer_id=103"),
Seq(Row("\"state province # 124\""))
)
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS specialcharacter2")
}
test("test data which contain column less than schema"){
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS collessthanschema")
sql(
"""
- CREATE TABLE IF NOT EXISTS t3
+ CREATE TABLE IF NOT EXISTS collessthanschema
(ID Int, date Timestamp, country String,
name String, phonetype String, serialname String, salary Int)
STORED BY 'org.apache.carbondata.format'
@@ -481,17 +505,18 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
sql(s"""
- LOAD DATA LOCAL INPATH './src/test/resources/lessthandatacolumndata.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/lessthandatacolumndata.csv' into table collessthanschema
""")
- checkAnswer(sql("select count(*) from t3"),Seq(Row(10)))
+ checkAnswer(sql("select count(*) from collessthanschema"),Seq(Row(10)))
+ sql("DROP TABLE IF EXISTS collessthanschema")
}
test("test data which contain column with decimal data type in array."){
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS decimalarray")
sql(
"""
- CREATE TABLE IF NOT EXISTS t3
+ CREATE TABLE IF NOT EXISTS decimalarray
(ID decimal(5,5), date Timestamp, country String,
name String, phonetype String, serialname String, salary Int, complex
array<decimal(4,2)>)
@@ -502,18 +527,18 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
sql(s"""
- LOAD DATA LOCAL INPATH './src/test/resources/complexTypeDecimal.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/complexTypeDecimal.csv' into table decimalarray
""")
- checkAnswer(sql("select count(*) from t3"),Seq(Row(8)))
- sql("DROP TABLE IF EXISTS t3")
+ checkAnswer(sql("select count(*) from decimalarray"),Seq(Row(8)))
+ sql("DROP TABLE IF EXISTS decimalarray")
}
test("test data which contain column with decimal data type in struct."){
- sql("DROP TABLE IF EXISTS t3")
+ sql("DROP TABLE IF EXISTS decimalstruct")
sql(
"""
- CREATE TABLE IF NOT EXISTS t3
+ CREATE TABLE IF NOT EXISTS decimalstruct
(ID decimal(5,5), date Timestamp, country String,
name String, phonetype String, serialname String, salary Int, complex
struct<a:decimal(4,2)>)
@@ -524,9 +549,10 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "yyyy/MM/dd")
sql(s"""
- LOAD DATA LOCAL INPATH './src/test/resources/complexTypeDecimal.csv' into table t3
+ LOAD DATA LOCAL INPATH './src/test/resources/complexTypeDecimal.csv' into table decimalstruct
""")
- checkAnswer(sql("select count(*) from t3"),Seq(Row(8)))
+ checkAnswer(sql("select count(*) from decimalstruct"),Seq(Row(8)))
+ sql("DROP TABLE IF EXISTS decimalstruct")
}
test("test data which contain column with decimal data type in array of struct."){
@@ -606,12 +632,31 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
override def afterAll {
- sql("drop table carbontable")
- sql("drop table hivetable")
+ sql("drop table if exists escapechar1")
+ sql("drop table if exists escapechar2")
+ sql("drop table if exists escapechar3")
+ sql("drop table if exists specialcharacter1")
+ sql("drop table if exists specialcharacter2")
+ sql("drop table if exists collessthanschema")
+ sql("drop table if exists decimalarray")
+ sql("drop table if exists decimalstruct")
+ sql("drop table if exists carbontable")
+ sql("drop table if exists hivetable")
+ sql("drop table if exists testtable")
+ sql("drop table if exists testhivetable")
+ sql("drop table if exists testtable1")
+ sql("drop table if exists testhivetable1")
+ sql("drop table if exists complexcarbontable")
+ sql("drop table if exists complex_t3")
+ sql("drop table if exists complex_hive_t3")
sql("drop table if exists header_test")
+ sql("drop table if exists duplicateColTest")
sql("drop table if exists mixed_header_test")
- sql("drop table carbontable1")
- sql("drop table hivetable1")
+ sql("drop table if exists primitivecarbontable")
+ sql("drop table if exists UPPERCASEcube")
+ sql("drop table if exists lowercaseCUBE")
+ sql("drop table if exists carbontable1")
+ sql("drop table if exists hivetable1")
sql("drop table if exists comment_test")
}
-}
\ No newline at end of file
+}
[2/2] incubator-carbondata git commit: [CARBONDATA-231] Rename
repeated table names in same test file and add drop tables This closes #146
Posted by ch...@apache.org.
[CARBONDATA-231] Rename repeated table names in same test file and add drop tables This closes #146
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/a5dc4b6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/a5dc4b6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/a5dc4b6c
Branch: refs/heads/master
Commit: a5dc4b6c8e253cfbaa4c22e66c56d473ad3b6b83
Parents: f9e5575 a3ce59a
Author: chenliang613 <ch...@apache.org>
Authored: Tue Sep 13 09:08:25 2016 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Tue Sep 13 09:08:25 2016 +0800
----------------------------------------------------------------------
.../dataload/TestLoadDataWithHiveSyntax.scala | 157 ++++++++++++-------
1 file changed, 101 insertions(+), 56 deletions(-)
----------------------------------------------------------------------