carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [04/17] carbondata git commit: [CARBONDATA-1453]Optimize test case IDs
Date Wed, 06 Sep 2017 12:39:39 GMT
http://git-wip-us.apache.org/repos/asf/carbondata/blob/588f009e/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesNormalTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesNormalTestCase.scala b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesNormalTestCase.scala
index 4ce4012..afd0b9b 100644
--- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesNormalTestCase.scala
+++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesNormalTestCase.scala
@@ -269,8 +269,8 @@ class QueriesNormalTestCase extends QueryTest with BeforeAndAfterAll {
   }
 
 
-  //SmartPCC_CreateCube_TC_001
-  test("SmartPCC_CreateCube_TC_001", Include) {
+  //Sample_CreateCube_TC_001
+  test("Sample_CreateCube_TC_001", Include) {
     sql(s"""drop table if exists traffic_2g_3g_4g""").collect
 
     sql(s"""create table IF NOT EXISTS traffic_2g_3g_4g (SOURCE_INFO String ,APP_CATEGORY_ID String ,APP_CATEGORY_NAME String ,APP_SUB_CATEGORY_ID String ,APP_SUB_CATEGORY_NAME String ,RAT_NAME String ,IMSI String ,OFFER_MSISDN String ,OFFER_ID String ,OFFER_OPTION_1 String ,OFFER_OPTION_2 String ,OFFER_OPTION_3 String ,MSISDN String ,PACKAGE_TYPE String ,PACKAGE_PRICE String ,TAG_IMSI String ,TAG_MSISDN String ,PROVINCE String ,CITY String ,AREA_CODE String ,TAC String ,IMEI String ,TERMINAL_TYPE String ,TERMINAL_BRAND String ,TERMINAL_MODEL String ,PRICE_LEVEL String ,NETWORK String ,SHIPPED_OS String ,WIFI String ,WIFI_HOTSPOT String ,GSM String ,WCDMA String ,TD_SCDMA String ,LTE_FDD String ,LTE_TDD String ,CDMA String ,SCREEN_SIZE String ,SCREEN_RESOLUTION String ,HOST_NAME String ,WEBSITE_NAME String ,OPERATOR String ,SRV_TYPE_NAME String ,TAG_HOST String ,CGI String ,CELL_NAME String ,COVERITY_TYPE1 String ,COVERITY_TYPE2 String ,COVERITY_TYPE3 String ,COVERITY_TYPE4 String ,
 COVERITY_TYPE5 String ,LATITUDE String ,LONGITUDE String ,AZIMUTH String ,TAG_CGI String ,APN String ,USER_AGENT String ,DAY String ,HOUR String ,MIN String ,IS_DEFAULT_BEAR int ,EPS_BEARER_ID String ,QCI int ,USER_FILTER String ,ANALYSIS_PERIOD String, UP_THROUGHPUT double,DOWN_THROUGHPUT double,UP_PKT_NUM double,DOWN_PKT_NUM double,APP_REQUEST_NUM double,PKT_NUM_LEN_1_64 double,PKT_NUM_LEN_64_128 double,PKT_NUM_LEN_128_256 double,PKT_NUM_LEN_256_512 double,PKT_NUM_LEN_512_768 double,PKT_NUM_LEN_768_1024 double,PKT_NUM_LEN_1024_ALL double,IP_FLOW_MARK double) STORED BY 'org.apache.carbondata.format'""").collect
@@ -280,8 +280,8 @@ class QueriesNormalTestCase extends QueryTest with BeforeAndAfterAll {
   }
 
 
-  //CMBC_CreateCube_1
-  test("CMBC_CreateCube_1", Include) {
+  //Sample1_CreateCube_1
+  test("Sample1_CreateCube_1", Include) {
     sql(s"""drop table if exists cmb""").collect
     sql(s"""drop table if exists cmb_hive""").collect
 
@@ -292,8 +292,8 @@ class QueriesNormalTestCase extends QueryTest with BeforeAndAfterAll {
   }
 
 
-  //CMBC_Query_1
-  test("CMBC_Query_1", Include) {
+  //Sample1_Query_1
+  test("Sample1_Query_1", Include) {
 
     sql(s"""LOAD DATA INPATH '$resourcesPath/Data/cmb/data.csv'  INTO table cmb OPTIONS ('DELIMITER'=',' , 'QUOTECHAR'='"','BAD_RECORDS_ACTION'='FORCE','FILEHEADER'='Cust_UID,year,month,companyAddress,companyNumber,company,occupation,certicardValidTime,race,CerticardCity,birthday,VIPLevel,ageRange,familyaddress,familyadNumber,dimension16,SubsidaryBank,AccountCreationTime,dimension19,dimension20,DemandDeposits,TimeDeposits,financial,TreasuryBonds,fund,incomeOneyear,outcomeOneyear,insurance,Goldaccount,dollarDeposits,euroDeposits,euroDeposits1,euroDeposits2,yenDeposits,wonDeposits,rupeeDeposits,HongKongDeposits,numberoftransactions,measure19,measure20,measure21,measure22,measure23,measure24,measure25,measure26,measure27,measure28,measure29,measure30,measure31,measure32,measure33,measure34,measure35,measure36,measure37,measure38,measure39,measure40,measure41,measure42,measure43,measure44,measure45,measure46,measure47,measure48,measure49,measure50,measure51,measure52,measure53')""").col
 lect
 
@@ -303,191 +303,191 @@ class QueriesNormalTestCase extends QueryTest with BeforeAndAfterAll {
   }
 
 
-  //CMBC_Query_2
-  test("CMBC_Query_2", Include) {
+  //Sample1_Query_2
+  test("Sample1_Query_2", Include) {
 
     checkAnswer(s"""select count(*) from cmb""",
-      s"""select count(*) from cmb_hive""", "QueriesNormalTestCase_CMBC_Query_2")
+      s"""select count(*) from cmb_hive""", "QueriesNormalTestCase_Sample1_Query_2")
 
   }
 
 
-  //CMBC_Query_3
-  test("CMBC_Query_3", Include) {
+  //Sample1_Query_3
+  test("Sample1_Query_3", Include) {
 
     checkAnswer(s"""select COUNT(DISTINCT Cust_UID) from cmb""",
-      s"""select COUNT(DISTINCT Cust_UID) from cmb_hive""", "QueriesNormalTestCase_CMBC_Query_3")
+      s"""select COUNT(DISTINCT Cust_UID) from cmb_hive""", "QueriesNormalTestCase_Sample1_Query_3")
 
   }
 
 
-  //CMBC_Query_4
-  test("CMBC_Query_4", Include) {
+  //Sample1_Query_4
+  test("Sample1_Query_4", Include) {
 
     checkAnswer(s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE `year` = "2015" GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""",
-      s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE `year` = "2015" GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_CMBC_Query_4")
+      s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE `year` = "2015" GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_Sample1_Query_4")
 
   }
 
 
-  //CMBC_Query_5
-  test("CMBC_Query_5", Include) {
+  //Sample1_Query_5
+  test("Sample1_Query_5", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, occupation, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE ( ( occupation = "Administrative Support") AND ( SubsidaryBank = "ABN AMRO")) AND ( SubsidaryBank = "ABN AMRO") GROUP BY SubsidaryBank, occupation, VIPLevel ORDER BY SubsidaryBank ASC, occupation ASC, VIPLevel ASC""",
-      s"""SELECT SubsidaryBank, occupation, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( ( occupation = "Administrative Support") AND ( SubsidaryBank = "ABN AMRO")) AND ( SubsidaryBank = "ABN AMRO") GROUP BY SubsidaryBank, occupation, VIPLevel ORDER BY SubsidaryBank ASC, occupation ASC, VIPLevel ASC""", "QueriesNormalTestCase_CMBC_Query_5")
+      s"""SELECT SubsidaryBank, occupation, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( ( occupation = "Administrative Support") AND ( SubsidaryBank = "ABN AMRO")) AND ( SubsidaryBank = "ABN AMRO") GROUP BY SubsidaryBank, occupation, VIPLevel ORDER BY SubsidaryBank ASC, occupation ASC, VIPLevel ASC""", "QueriesNormalTestCase_Sample1_Query_5")
 
   }
 
 
-  //CMBC_Query_6
-  test("CMBC_Query_6", Include) {
+  //Sample1_Query_6
+  test("Sample1_Query_6", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""",
-      s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_CMBC_Query_6")
+      s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_Sample1_Query_6")
 
   }
 
 
-  //CMBC_Query_7
-  test("CMBC_Query_7", Include) {
+  //Sample1_Query_7
+  test("Sample1_Query_7", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE SubsidaryBank IN ("ABN AMRO","Bank Sepah") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""",
-      s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("ABN AMRO","Bank Sepah") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_CMBC_Query_7")
+      s"""SELECT SubsidaryBank, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("ABN AMRO","Bank Sepah") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_Sample1_Query_7")
 
   }
 
 
-  //CMBC_Query_8
-  test("CMBC_Query_8", Include) {
+  //Sample1_Query_8
+  test("Sample1_Query_8", Include) {
 
     checkAnswer(s"""SELECT company, CerticardCity, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE ( company IN ("Agricultural Bank of China","COSCO1")) AND ( CerticardCity IN ("Beijing1","Huangyan1","Yakeshi1","Korla1")) GROUP BY company, CerticardCity, VIPLevel ORDER BY company ASC, CerticardCity ASC, VIPLevel ASC""",
-      s"""SELECT company, CerticardCity, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( company IN ("Agricultural Bank of China","COSCO1")) AND ( CerticardCity IN ("Beijing1","Huangyan1","Yakeshi1","Korla1")) GROUP BY company, CerticardCity, VIPLevel ORDER BY company ASC, CerticardCity ASC, VIPLevel ASC""", "QueriesNormalTestCase_CMBC_Query_8")
+      s"""SELECT company, CerticardCity, VIPLevel, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( company IN ("Agricultural Bank of China","COSCO1")) AND ( CerticardCity IN ("Beijing1","Huangyan1","Yakeshi1","Korla1")) GROUP BY company, CerticardCity, VIPLevel ORDER BY company ASC, CerticardCity ASC, VIPLevel ASC""", "QueriesNormalTestCase_Sample1_Query_8")
 
   }
 
 
-  //CMBC_Query_9
-  test("CMBC_Query_9", Include) {
+  //Sample1_Query_9
+  test("Sample1_Query_9", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, ageRange, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE ( ageRange IN ("(1-3)","(100-105)")) AND ( SubsidaryBank IN ("ABN AMRO","Busan Bank","Huaxia Bank")) GROUP BY SubsidaryBank, ageRange ORDER BY SubsidaryBank ASC, ageRange ASC""",
-      s"""SELECT SubsidaryBank, ageRange, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( ageRange IN ("(1-3)","(100-105)")) AND ( SubsidaryBank IN ("ABN AMRO","Busan Bank","Huaxia Bank")) GROUP BY SubsidaryBank, ageRange ORDER BY SubsidaryBank ASC, ageRange ASC""", "QueriesNormalTestCase_CMBC_Query_9")
+      s"""SELECT SubsidaryBank, ageRange, COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( ageRange IN ("(1-3)","(100-105)")) AND ( SubsidaryBank IN ("ABN AMRO","Busan Bank","Huaxia Bank")) GROUP BY SubsidaryBank, ageRange ORDER BY SubsidaryBank ASC, ageRange ASC""", "QueriesNormalTestCase_Sample1_Query_9")
 
   }
 
 
-  //CMBC_Query_10
-  test("CMBC_Query_10", Include) {
+  //Sample1_Query_10
+  test("Sample1_Query_10", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, SUM(incomeOneyear) AS Sum_incomeOneyear, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Real-Estate Bank") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""",
-      s"""SELECT SubsidaryBank, SUM(incomeOneyear) AS Sum_incomeOneyear, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Real-Estate Bank") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_CMBC_Query_10")
+      s"""SELECT SubsidaryBank, SUM(incomeOneyear) AS Sum_incomeOneyear, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Real-Estate Bank") GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_Sample1_Query_10")
 
   }
 
 
-  //CMBC_Query_11
-  test("CMBC_Query_11", Include) {
+  //Sample1_Query_11
+  test("Sample1_Query_11", Include) {
 
     checkAnswer(s"""SELECT `year`, `month`, SUM(DemandDeposits) AS Sum_DemandDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb) SUB_QRY WHERE ( SubsidaryBank = "CMB Financial Leasing Ltd") AND ( Cust_UID = "CMB0000000000000000000000") GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""",
-      s"""SELECT `year`, `month`, SUM(DemandDeposits) AS Sum_DemandDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "CMB Financial Leasing Ltd") AND ( Cust_UID = "CMB0000000000000000000000") GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_CMBC_Query_11")
+      s"""SELECT `year`, `month`, SUM(DemandDeposits) AS Sum_DemandDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "CMB Financial Leasing Ltd") AND ( Cust_UID = "CMB0000000000000000000000") GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_Sample1_Query_11")
 
   }
 
 
-  //CMBC_Query_12
-  test("CMBC_Query_12", Include) {
+  //Sample1_Query_12
+  test("Sample1_Query_12", Include) {
 
     checkAnswer(s"""SELECT `year`, `month`, SUM(yenDeposits) AS Sum_yenDeposits, SUM(HongKongDeposits) AS Sum_HongKongDeposits, SUM(dollarDeposits) AS Sum_dollarDeposits, SUM(euroDeposits) AS Sum_euroDeposits FROM (select * from cmb) SUB_QRY WHERE ( SubsidaryBank = "Credit Suisse") AND ( `month` IN ("1","2","3")) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""",
-      s"""SELECT `year`, `month`, SUM(yenDeposits) AS Sum_yenDeposits, SUM(HongKongDeposits) AS Sum_HongKongDeposits, SUM(dollarDeposits) AS Sum_dollarDeposits, SUM(euroDeposits) AS Sum_euroDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "Credit Suisse") AND ( `month` IN ("1","2","3")) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_CMBC_Query_12")
+      s"""SELECT `year`, `month`, SUM(yenDeposits) AS Sum_yenDeposits, SUM(HongKongDeposits) AS Sum_HongKongDeposits, SUM(dollarDeposits) AS Sum_dollarDeposits, SUM(euroDeposits) AS Sum_euroDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "Credit Suisse") AND ( `month` IN ("1","2","3")) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_Sample1_Query_12")
 
   }
 
 
-  //CMBC_Query_13
-  test("CMBC_Query_13", Include) {
+  //Sample1_Query_13
+  test("Sample1_Query_13", Include) {
 
     checkAnswer(s"""SELECT Cust_UID, `month`, `year`, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb) SUB_QRY WHERE Cust_UID IN ("CMB0000000000000000000119","CMB0000000000000000000308") and month="1" GROUP BY Cust_UID, `month`, `year` ORDER BY Cust_UID ASC, `month` ASC, `year` ASC""",
-      s"""SELECT Cust_UID, `month`, `year`, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE Cust_UID IN ("CMB0000000000000000000119","CMB0000000000000000000308") and month="1" GROUP BY Cust_UID, `month`, `year` ORDER BY Cust_UID ASC, `month` ASC, `year` ASC""", "QueriesNormalTestCase_CMBC_Query_13")
+      s"""SELECT Cust_UID, `month`, `year`, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE Cust_UID IN ("CMB0000000000000000000119","CMB0000000000000000000308") and month="1" GROUP BY Cust_UID, `month`, `year` ORDER BY Cust_UID ASC, `month` ASC, `year` ASC""", "QueriesNormalTestCase_Sample1_Query_13")
 
   }
 
 
-  //CMBC_Query_14
-  test("CMBC_Query_14", Include) {
+  //Sample1_Query_14
+  test("Sample1_Query_14", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb) SUB_QRY WHERE SubsidaryBank = "Daegu Bank" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""",
-      s"""SELECT SubsidaryBank, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank = "Daegu Bank" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_CMBC_Query_14")
+      s"""SELECT SubsidaryBank, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank = "Daegu Bank" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_Sample1_Query_14")
 
   }
 
 
-  //CMBC_Query_15
-  test("CMBC_Query_15", Include) {
+  //Sample1_Query_15
+  test("Sample1_Query_15", Include) {
 
     checkAnswer(s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb) SUB_QRY WHERE ( SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Minsheng Bank - First private bank in China")) AND ( dollarDeposits > 0)""",
-      s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Minsheng Bank - First private bank in China")) AND ( dollarDeposits > 0)""", "QueriesNormalTestCase_CMBC_Query_15")
+      s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank","Minsheng Bank - First private bank in China")) AND ( dollarDeposits > 0)""", "QueriesNormalTestCase_Sample1_Query_15")
 
   }
 
 
-  //CMBC_Query_16
-  test("CMBC_Query_16", Include) {
+  //Sample1_Query_16
+  test("Sample1_Query_16", Include) {
 
     checkAnswer(s"""SELECT SubsidaryBank, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank") and month="1" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""",
-      s"""SELECT SubsidaryBank, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank") and month="1" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_CMBC_Query_16")
+      s"""SELECT SubsidaryBank, SUM(numberoftransactions) AS Sum_numberoftransactions FROM (select * from cmb_hive) SUB_QRY WHERE SubsidaryBank IN ("Bank Bumiputera Indonesia","Daegu Bank") and month="1" GROUP BY SubsidaryBank ORDER BY SubsidaryBank ASC""", "QueriesNormalTestCase_Sample1_Query_16")
 
   }
 
 
-  //CMBC_Query_17
-  test("CMBC_Query_17", Include) {
+  //Sample1_Query_17
+  test("Sample1_Query_17", Include) {
 
     checkAnswer(s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb) SUB_QRY WHERE ( SubsidaryBank = "ABC") AND ( numberoftransactions > 90.0)""",
-      s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "ABC") AND ( numberoftransactions > 90.0)""", "QueriesNormalTestCase_CMBC_Query_17")
+      s"""SELECT COUNT(Cust_UID) AS Count_Cust_UID FROM (select * from cmb_hive) SUB_QRY WHERE ( SubsidaryBank = "ABC") AND ( numberoftransactions > 90.0)""", "QueriesNormalTestCase_Sample1_Query_17")
 
   }
 
 
-  //CMBC_Query_18
-  test("CMBC_Query_18", Include) {
+  //Sample1_Query_18
+  test("Sample1_Query_18", Include) {
 
     checkAnswer(s"""SELECT VIPLevel, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""",
-      s"""SELECT VIPLevel, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""", "QueriesNormalTestCase_CMBC_Query_18")
+      s"""SELECT VIPLevel, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""", "QueriesNormalTestCase_Sample1_Query_18")
 
   }
 
 
-  //CMBC_Query_19
-  test("CMBC_Query_19", Include) {
+  //Sample1_Query_19
+  test("Sample1_Query_19", Include) {
 
     checkAnswer(s"""SELECT CerticardCity, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""",
-      s"""SELECT CerticardCity, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""", "QueriesNormalTestCase_CMBC_Query_19")
+      s"""SELECT CerticardCity, COUNT(DISTINCT Cust_UID) AS DistinctCount_Cust_UID FROM (select * from cmb_hive) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""", "QueriesNormalTestCase_Sample1_Query_19")
 
   }
 
 
-  //CMBC_Query_20
-  test("CMBC_Query_20", Include) {
+  //Sample1_Query_20
+  test("Sample1_Query_20", Include) {
 
     checkAnswer(s"""SELECT VIPLevel, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""",
-      s"""SELECT VIPLevel, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""", "QueriesNormalTestCase_CMBC_Query_20")
+      s"""SELECT VIPLevel, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY GROUP BY VIPLevel ORDER BY VIPLevel ASC""", "QueriesNormalTestCase_Sample1_Query_20")
 
   }
 
 
-  //CMBC_Query_21
-  test("CMBC_Query_21", Include) {
+  //Sample1_Query_21
+  test("Sample1_Query_21", Include) {
 
     checkAnswer(s"""SELECT CerticardCity, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""",
-      s"""SELECT CerticardCity, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""", "QueriesNormalTestCase_CMBC_Query_21")
+      s"""SELECT CerticardCity, SUM(yenDeposits) AS Sum_yenDeposits, SUM(numberoftransactions) AS Sum_numberoftransactions, SUM(dollarDeposits) AS Sum_dollarDeposits FROM (select * from cmb_hive) SUB_QRY GROUP BY CerticardCity ORDER BY CerticardCity ASC""", "QueriesNormalTestCase_Sample1_Query_21")
 
   }
 
 
-  //CMBC_Query_22
-  test("CMBC_Query_22", Include) {
+  //Sample1_Query_22
+  test("Sample1_Query_22", Include) {
 
     checkAnswer(s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb) SUB_QRY WHERE ( `month` = "1") AND ( numberoftransactions > 90.0) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""",
-      s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( `month` = "1") AND ( numberoftransactions > 90.0) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_CMBC_Query_22")
+      s"""SELECT `year`, `month`, COUNT(Cust_UID) AS Count_Cust_UID, SUM(yenDeposits) AS Sum_yenDeposits FROM (select * from cmb_hive) SUB_QRY WHERE ( `month` = "1") AND ( numberoftransactions > 90.0) GROUP BY `year`, `month` ORDER BY `year` ASC, `month` ASC""", "QueriesNormalTestCase_Sample1_Query_22")
 
   }
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/588f009e/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesSparkBlockDistTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesSparkBlockDistTestCase.scala b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesSparkBlockDistTestCase.scala
index 6270ee5..13c4918 100644
--- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesSparkBlockDistTestCase.scala
+++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/QueriesSparkBlockDistTestCase.scala
@@ -28,8 +28,8 @@ import org.scalatest.BeforeAndAfterAll
 class QueriesSparkBlockDistTestCase extends QueryTest with BeforeAndAfterAll {
          
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC002123
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC002123", Include) {
+  //BlockDist_PTS001_TC002123
+  test("BlockDist_PTS001_TC002123", Include) {
     sql("drop table if exists flow_carbon_256b")
     sql("drop table if exists flow_carbon_256b_hive")
     sql(s"""CREATE TABLE IF NOT EXISTS  flow_carbon_256b ( txn_dte     String, dt  String, txn_bk      String, txn_br      String, own_bk      String, own_br      String, opp_bk      String, bus_opr_cde String, opt_prd_cde String, cus_no      String, cus_ac      String, opp_ac_nme  String, opp_ac      String, bv_no       String, aco_ac      String, ac_dte      String, txn_cnt     int,     jrn_par     int,     mfm_jrn_no  String,     cbn_jrn_no  String,     ibs_jrn_no  String,     vch_no      String, vch_seq     String,     srv_cde     String, bus_cd_no   String, id_flg      String, bv_cde      String, txn_time    String, txn_tlr     String, ety_tlr     String, ety_bk      String, ety_br      String, bus_pss_no  String, chk_flg     String, chk_tlr     String, chk_jrn_no  String,     bus_sys_no  String, txn_sub_cde String, fin_bus_cde String, fin_bus_sub_cde     String, chl         String, tml_id      String, sus_no      String, sus_seq     String,     cho_seq     String,     itm_itm 
     String, itm_sub     String, itm_sss     String, dc_flg      String, amt         decimal(15,2), bal         decimal(15,2), ccy         String, spv_flg     String, vch_vld_dte String, pst_bk      String, pst_br      String, ec_flg      String, aco_tlr     String, gen_flg     String, his_rec_sum_flg     String, his_flg     String, vch_typ     String, val_dte     String, opp_ac_flg  String, cmb_flg     String, ass_vch_flg String, cus_pps_flg String, bus_rmk_cde String, vch_bus_rmk String, tec_rmk_cde String, vch_tec_rmk String, rsv_ara     String, gems_last_upd_d     String, gems_last_upd_d_bat String, maps_date   String, maps_job    String ) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('DICTIONARY_INCLUDE'='dt,jrn_par,txn_bk,txn_br,ety_bk,ety_br,chk_flg,bus_sys_no,bus_opr_cde,chl,sus_no,itm_itm,itm_sub,itm_sss,dc_flg,ccy,spv_flg,pst_bk,pst_br,ec_flg,gen_flg,his_rec_sum_flg,his_flg,vch_typ,opp_ac_flg,cmb_flg,ass_vch_flg,cus_pps_flg,bus_rmk_cde,vch_bus_rmk,tec_rmk_cde,vch_t
 ec_rmk,rsv_ara,own_br,own_bk','DICTIONARY_EXCLUDE'='aco_ac,ac_dte,mfm_jrn_no,cbn_jrn_no,ibs_jrn_no,vch_no,vch_seq,srv_cde,cus_no,bus_cd_no,id_flg,cus_ac,bv_cde,bv_no,txn_dte,txn_time,txn_tlr,ety_tlr,bus_pss_no,chk_tlr,chk_jrn_no,txn_sub_cde,fin_bus_cde,fin_bus_sub_cde,opt_prd_cde,tml_id,sus_seq,cho_seq,vch_vld_dte,aco_tlr,opp_ac,opp_ac_nme,opp_bk,val_dte,gems_last_upd_d,gems_last_upd_d_bat,maps_date,maps_job')""").collect
@@ -42,236 +42,236 @@ class QueriesSparkBlockDistTestCase extends QueryTest with BeforeAndAfterAll {
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC001", Include) {
+  //BlockDist_PTS001_TC001
+  test("BlockDist_PTS001_TC001", Include) {
 
     checkAnswer(s"""select * from flow_carbon_256b where txn_dte>='20140101' and txn_dte <= '20140601' and txn_bk ='00000000121' order by  txn_dte limit 1000""",
-      s"""select * from flow_carbon_256b_hive where txn_dte>='20140101' and txn_dte <= '20140601' and txn_bk ='00000000121' order by  txn_dte limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC001")
+      s"""select * from flow_carbon_256b_hive where txn_dte>='20140101' and txn_dte <= '20140601' and txn_bk ='00000000121' order by  txn_dte limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS001_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC002", Include) {
+  //BlockDist_PTS001_TC002
+  test("BlockDist_PTS001_TC002", Include) {
 
     checkAnswer(s"""select * from flow_carbon_256b where own_br ='00000000515' and txn_dte>='20140101' and txn_dte <= '20150101' order by own_br limit 1000""",
-      s"""select * from flow_carbon_256b_hive where own_br ='00000000515' and txn_dte>='20140101' and txn_dte <= '20150101' order by own_br limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC002")
+      s"""select * from flow_carbon_256b_hive where own_br ='00000000515' and txn_dte>='20140101' and txn_dte <= '20150101' order by own_br limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS001_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC003", Include) {
+  //BlockDist_PTS001_TC003
+  test("BlockDist_PTS001_TC003", Include) {
 
     checkAnswer(s"""select * from flow_carbon_256b where opt_prd_cde ='2889' and txn_dte>='20140101' and txn_dte <= '20160101' order by opt_prd_cde limit 1000""",
-      s"""select * from flow_carbon_256b_hive where opt_prd_cde ='2889' and txn_dte>='20140101' and txn_dte <= '20160101' order by opt_prd_cde limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS001_TC003")
+      s"""select * from flow_carbon_256b_hive where opt_prd_cde ='2889' and txn_dte>='20140101' and txn_dte <= '20160101' order by opt_prd_cde limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS001_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS002_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS002_TC001", Include) {
+  //BlockDist_PTS002_TC001
+  test("BlockDist_PTS002_TC001", Include) {
 
     checkAnswer(s"""select  *  from flow_carbon_256b where  cus_ac like '%22262135060488208%' and (txn_dte>='20150101' and txn_dte<='20160101') and  txn_bk IN ('00000000215', '00000000025','00000000086') OR own_bk IN ('00000000001','01511999999','00000000180') order by cus_ac  limit 1000""",
-      s"""select  *  from flow_carbon_256b_hive where  cus_ac like '%22262135060488208%' and (txn_dte>='20150101' and txn_dte<='20160101') and  txn_bk IN ('00000000215', '00000000025','00000000086') OR own_bk IN ('00000000001','01511999999','00000000180') order by cus_ac  limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS002_TC001")
+      s"""select  *  from flow_carbon_256b_hive where  cus_ac like '%22262135060488208%' and (txn_dte>='20150101' and txn_dte<='20160101') and  txn_bk IN ('00000000215', '00000000025','00000000086') OR own_bk IN ('00000000001','01511999999','00000000180') order by cus_ac  limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS002_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC001", Include) {
+  //BlockDist_PTS003_TC001
+  test("BlockDist_PTS003_TC001", Include) {
 
     checkAnswer(s"""select own_br, count(opt_prd_cde)  from flow_carbon_256b group by own_br limit 1000""",
-      s"""select own_br, count(opt_prd_cde)  from flow_carbon_256b_hive group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC001")
+      s"""select own_br, count(opt_prd_cde)  from flow_carbon_256b_hive group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS003_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC002", Include) {
+  //BlockDist_PTS003_TC002
+  test("BlockDist_PTS003_TC002", Include) {
 
     checkAnswer(s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b where own_br like '6%' group by own_br limit 1000""",
-      s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b_hive where own_br like '6%' group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC002")
+      s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b_hive where own_br like '6%' group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS003_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC003", Include) {
+  //BlockDist_PTS003_TC003
+  test("BlockDist_PTS003_TC003", Include) {
 
     checkAnswer(s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b group by own_br limit 1000""",
-      s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b_hive group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC003")
+      s"""select  own_br, count(distinct opt_prd_cde)  from flow_carbon_256b_hive group by own_br limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS003_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC004
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC004", Include) {
+  //BlockDist_PTS003_TC004
+  test("BlockDist_PTS003_TC004", Include) {
 
     checkAnswer(s"""select own_br, count(1) as cn from flow_carbon_256b group by own_br having cn>1""",
-      s"""select own_br, count(1) as cn from flow_carbon_256b_hive group by own_br having cn>1""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS003_TC004")
+      s"""select own_br, count(1) as cn from flow_carbon_256b_hive group by own_br having cn>1""", "QueriesSparkBlockDistTestCase_BlockDist_PTS003_TC004")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC001", Include) {
+  //BlockDist_PTS004_TC001
+  test("BlockDist_PTS004_TC001", Include) {
 
     checkAnswer(s"""select  *  from flow_carbon_256b where  cus_ac  like '622262135067246539%'  and (txn_dte>='20150101' and txn_dte<='20160101') and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000424','00000001383','00000001942','00000001262') limit 1000""",
-      s"""select  *  from flow_carbon_256b_hive where  cus_ac  like '622262135067246539%'  and (txn_dte>='20150101' and txn_dte<='20160101') and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000424','00000001383','00000001942','00000001262') limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC001")
+      s"""select  *  from flow_carbon_256b_hive where  cus_ac  like '622262135067246539%'  and (txn_dte>='20150101' and txn_dte<='20160101') and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000424','00000001383','00000001942','00000001262') limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS004_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC002", Include) {
+  //BlockDist_PTS004_TC002
+  test("BlockDist_PTS004_TC002", Include) {
 
     checkAnswer(s"""select own_br, sum(txn_cnt) as cn from flow_carbon_256b group by own_br having cn>1 limit 1000""",
-      s"""select own_br, sum(txn_cnt) as cn from flow_carbon_256b_hive group by own_br having cn>1 limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC002")
+      s"""select own_br, sum(txn_cnt) as cn from flow_carbon_256b_hive group by own_br having cn>1 limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS004_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC003", Include) {
+  //BlockDist_PTS004_TC003
+  test("BlockDist_PTS004_TC003", Include) {
 
     checkAnswer(s"""select  * from flow_carbon_256b where cus_ac = '6222621350672465397' and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000124','00000000175','00000000034','00000000231','00000000167','00000000182','00000000206') or opp_bk='1491999999107' and  (txn_dte>='20140101' and txn_dte<='20140630')  limit 1000""",
-      s"""select  * from flow_carbon_256b_hive where cus_ac = '6222621350672465397' and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000124','00000000175','00000000034','00000000231','00000000167','00000000182','00000000206') or opp_bk='1491999999107' and  (txn_dte>='20140101' and txn_dte<='20140630')  limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS004_TC003")
+      s"""select  * from flow_carbon_256b_hive where cus_ac = '6222621350672465397' and txn_bk IN ('00000000000', '00000000001','00000000002') OR own_bk IN ('00000000124','00000000175','00000000034','00000000231','00000000167','00000000182','00000000206') or opp_bk='1491999999107' and  (txn_dte>='20140101' and txn_dte<='20140630')  limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS004_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC001", Include) {
+  //BlockDist_PTS005_TC001
+  test("BlockDist_PTS005_TC001", Include) {
 
     checkAnswer(s"""select  vch_seq, sum(amt)  from flow_carbon_256b group by vch_seq limit 1000""",
-      s"""select  vch_seq, sum(amt)  from flow_carbon_256b_hive group by vch_seq limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC001")
+      s"""select  vch_seq, sum(amt)  from flow_carbon_256b_hive group by vch_seq limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS005_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC003", Include) {
+  //BlockDist_PTS005_TC003
+  test("BlockDist_PTS005_TC003", Include) {
 
     checkAnswer(s"""select  vch_seq, count(distinct cus_ac) * sum(amt) AS Total from flow_carbon_256b group by vch_seq limit 1000""",
-      s"""select  vch_seq, count(distinct cus_ac) * sum(amt) AS Total from flow_carbon_256b_hive group by vch_seq limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS005_TC003")
+      s"""select  vch_seq, count(distinct cus_ac) * sum(amt) AS Total from flow_carbon_256b_hive group by vch_seq limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS005_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS006_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS006_TC001", Include) {
+  //BlockDist_PTS006_TC001
+  test("BlockDist_PTS006_TC001", Include) {
 
     checkAnswer(s"""select  vch_seq, COALESCE(txn_cnt, jrn_par) Value from flow_carbon_256b group by vch_seq,txn_cnt,jrn_par limit 1000""",
-      s"""select  vch_seq, COALESCE(txn_cnt, jrn_par) Value from flow_carbon_256b_hive group by vch_seq,txn_cnt,jrn_par limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS006_TC001")
+      s"""select  vch_seq, COALESCE(txn_cnt, jrn_par) Value from flow_carbon_256b_hive group by vch_seq,txn_cnt,jrn_par limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS006_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC001", Include) {
+  //BlockDist_PTS007_TC001
+  test("BlockDist_PTS007_TC001", Include) {
 
     checkAnswer(s"""select * from flow_carbon_256b  where cus_no = '62226009239386397' and dt>='20140301' and dt<='20140330' order by amt desc limit 1000""",
-      s"""select * from flow_carbon_256b_hive  where cus_no = '62226009239386397' and dt>='20140301' and dt<='20140330' order by amt desc limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC001")
+      s"""select * from flow_carbon_256b_hive  where cus_no = '62226009239386397' and dt>='20140301' and dt<='20140330' order by amt desc limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS007_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC002", Include) {
+  //BlockDist_PTS007_TC002
+  test("BlockDist_PTS007_TC002", Include) {
 
     checkAnswer(s"""select cus_ac from flow_carbon_256b where jrn_par is not null order by cus_ac limit 1000""",
-      s"""select cus_ac from flow_carbon_256b_hive where jrn_par is not null order by cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC002")
+      s"""select cus_ac from flow_carbon_256b_hive where jrn_par is not null order by cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS007_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC003", Include) {
+  //BlockDist_PTS007_TC003
+  test("BlockDist_PTS007_TC003", Include) {
 
     checkAnswer(s"""select cus_ac from flow_carbon_256b where jrn_par is  null order by cus_ac limit 1000""",
-      s"""select cus_ac from flow_carbon_256b_hive where jrn_par is  null order by cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS007_TC003")
+      s"""select cus_ac from flow_carbon_256b_hive where jrn_par is  null order by cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS007_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC001", Include) {
+  //BlockDist_PTS008_TC001
+  test("BlockDist_PTS008_TC001", Include) {
 
     checkAnswer(s"""select txn_bk, MAX(distinct cus_ac) from flow_carbon_256b group by txn_bk, cus_ac""",
-      s"""select txn_bk, MAX(distinct cus_ac) from flow_carbon_256b_hive group by txn_bk, cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC001")
+      s"""select txn_bk, MAX(distinct cus_ac) from flow_carbon_256b_hive group by txn_bk, cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS008_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC002", Include) {
+  //BlockDist_PTS008_TC002
+  test("BlockDist_PTS008_TC002", Include) {
 
     checkAnswer(s"""select txn_bk, count(distinct cus_ac) from flow_carbon_256b group by txn_bk, cus_ac""",
-      s"""select txn_bk, count(distinct cus_ac) from flow_carbon_256b_hive group by txn_bk, cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC002")
+      s"""select txn_bk, count(distinct cus_ac) from flow_carbon_256b_hive group by txn_bk, cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS008_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC003", Include) {
+  //BlockDist_PTS008_TC003
+  test("BlockDist_PTS008_TC003", Include) {
 
     checkAnswer(s"""select distinct(txn_bk) AS TXN_BK, avg(cus_ac) from flow_carbon_256b group by txn_bk,cus_ac""",
-      s"""select distinct(txn_bk) AS TXN_BK, avg(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC003")
+      s"""select distinct(txn_bk) AS TXN_BK, avg(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS008_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC004
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC004", Include) {
+  //BlockDist_PTS008_TC004
+  test("BlockDist_PTS008_TC004", Include) {
 
     checkAnswer(s"""select txn_bk, LAST(cus_ac) from flow_carbon_256b group by txn_bk,cus_ac""",
-      s"""select txn_bk, LAST(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC004")
+      s"""select txn_bk, LAST(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS008_TC004")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC005
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC005", Include) {
+  //BlockDist_PTS008_TC005
+  test("BlockDist_PTS008_TC005", Include) {
 
     checkAnswer(s"""select txn_bk, FIRST(cus_ac) from flow_carbon_256b group by txn_bk,cus_ac""",
-      s"""select txn_bk, FIRST(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS008_TC005")
+      s"""select txn_bk, FIRST(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS008_TC005")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC001", Include) {
+  //BlockDist_PTS009_TC001
+  test("BlockDist_PTS009_TC001", Include) {
 
     checkAnswer(s"""select txn_bk, percentile_approx(cast(txn_cnt as double) ,0.2) from flow_carbon_256b group by txn_bk,cus_ac""",
-      s"""select txn_bk, percentile_approx(cast(txn_cnt as double) ,0.2) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC001")
+      s"""select txn_bk, percentile_approx(cast(txn_cnt as double) ,0.2) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS009_TC001")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC002
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC002", Include) {
+  //BlockDist_PTS009_TC002
+  test("BlockDist_PTS009_TC002", Include) {
 
     checkAnswer(s"""select txn_bk, collect_set(cus_ac) from flow_carbon_256b group by txn_bk,cus_ac""",
-      s"""select txn_bk, collect_set(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC002")
+      s"""select txn_bk, collect_set(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac""", "QueriesSparkBlockDistTestCase_BlockDist_PTS009_TC002")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC003
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC003", Include) {
+  //BlockDist_PTS009_TC003
+  test("BlockDist_PTS009_TC003", Include) {
 
     checkAnswer(s"""select txn_bk, variance(cus_ac) from flow_carbon_256b group by txn_bk,cus_ac limit 1000""",
-      s"""select txn_bk, variance(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS009_TC003")
+      s"""select txn_bk, variance(cus_ac) from flow_carbon_256b_hive group by txn_bk,cus_ac limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS009_TC003")
 
   }
 
 
-  //AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS010_TC001
-  test("AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS010_TC001", Include) {
+  //BlockDist_PTS010_TC001
+  test("BlockDist_PTS010_TC001", Include) {
 
     checkAnswer(s"""select txn_bk, (txn_cnt + jrn_par) AS Result from flow_carbon_256b group by txn_bk,txn_cnt,jrn_par limit 1000""",
-      s"""select txn_bk, (txn_cnt + jrn_par) AS Result from flow_carbon_256b_hive group by txn_bk,txn_cnt,jrn_par limit 1000""", "QueriesSparkBlockDistTestCase_AR-Productize-New-Features-Huawei-Spark2.1-014_001_PTS010_TC001")
+      s"""select txn_bk, (txn_cnt + jrn_par) AS Result from flow_carbon_256b_hive group by txn_bk,txn_cnt,jrn_par limit 1000""", "QueriesSparkBlockDistTestCase_BlockDist_PTS010_TC001")
   }
 
   override def afterAll {

http://git-wip-us.apache.org/repos/asf/carbondata/blob/588f009e/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/ShowLoadsTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/ShowLoadsTestCase.scala b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/ShowLoadsTestCase.scala
index 4a4db89..08be0b5 100644
--- a/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/ShowLoadsTestCase.scala
+++ b/integration/spark-common-cluster-test/src/test/scala/org/apache/carbondata/cluster/sdv/generated/ShowLoadsTestCase.scala
@@ -30,7 +30,7 @@ class ShowLoadsTestCase extends QueryTest with BeforeAndAfterAll {
          
 
  //Verify failure/success/Partial status in show segments.
- test("AR-DataSightCarbon-Maintenance-DataLoadManagement001_TOR_001-PTS-005-TC-01_196", Include) {
+ test("DataLoadManagement001_197", Include) {
     sql(
       s"""drop TABLE if exists ShowSegment_196""".stripMargin).collect
   sql(s"""CREATE TABLE ShowSegment_196 (CUST_ID int,CUST_NAME String,ACTIVE_EMUI_VERSION string,DOB timestamp, DOJ timestamp, BIGINT_COLUMN1 bigint,BIGINT_COLUMN2 bigint,DECIMAL_COLUMN1 decimal(30,10),Double_COLUMN1 double,DECIMAL_COLUMN2 decimal(36,10), Double_COLUMN2 double,INTEGER_COLUMN1 int) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('table_blocksize'='1')""").collect
@@ -42,7 +42,7 @@ class ShowLoadsTestCase extends QueryTest with BeforeAndAfterAll {
 
 
  //Verify show segment commands with database name.
- test("AR-DataSightCarbon-Maintenance-DataLoadManagement001_TOR_001-PTS-002-TC-01_196", Include) {
+ test("DataLoadManagement001_196", Include) {
     sql(s"""drop TABLE if exists Database_ShowSegment_196""").collect
   sql(s"""CREATE TABLE Database_ShowSegment_196 (CUST_ID int,CUST_NAME String,ACTIVE_EMUI_VERSION string,DOB timestamp, DOJ timestamp, BIGINT_COLUMN1 bigint,BIGINT_COLUMN2 bigint,DECIMAL_COLUMN1 decimal(30,10),Double_COLUMN1 double,DECIMAL_COLUMN2 decimal(36,10), Double_COLUMN2 double,INTEGER_COLUMN1 int) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('table_blocksize'='1')""").collect
   sql(s"""LOAD DATA INPATH '$resourcesPath/Data/InsertData/join1.csv' into table Database_ShowSegment_196 OPTIONS('DELIMITER'=',' , 'QUOTECHAR'='"','BAD_RECORDS_ACTION'='FORCE','FILEHEADER'='CUST_ID,CUST_NAME,ACTIVE_EMUI_VERSION,DOB,DOJ,BIGINT_COLUMN1,BIGINT_COLUMN2,DECIMAL_COLUMN1,Double_COLUMN1,DECIMAL_COLUMN2,Double_COLUMN2,INTEGER_COLUMN1')""").collect
@@ -52,7 +52,7 @@ class ShowLoadsTestCase extends QueryTest with BeforeAndAfterAll {
 
 
  //Show Segments failing if table name not in same case
- test("PTS-TOR_AR-DataSight_Carbon-LCM_002_001-001-TC-008_830", Include) {
+ test("DataLoadManagement001_830", Include) {
     sql(s"""drop TABLE if exists Case_ShowSegment_196""").collect
   sql(s"""CREATE TABLE Case_ShowSegment_196 (CUST_ID int,CUST_NAME String,ACTIVE_EMUI_VERSION string,DOB timestamp, DOJ timestamp, BIGINT_COLUMN1 bigint,BIGINT_COLUMN2 bigint,DECIMAL_COLUMN1 decimal(30,10),Double_COLUMN1 double,DECIMAL_COLUMN2 decimal(36,10), Double_COLUMN2 double,INTEGER_COLUMN1 int) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('table_blocksize'='1')""").collect
    sql(s"""show segments for table CASE_ShowSegment_196""").collect


Mime
View raw message