You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2016/08/26 16:11:44 UTC
[1/2] incubator-carbondata git commit: Fixed special char delimiter
for complex data.
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 4bb004855 -> 518b1325b
Fixed special char delimiter for complex data.
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/cb8abfef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/cb8abfef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/cb8abfef
Branch: refs/heads/master
Commit: cb8abfef529f2ed594f36493fe745f3a763e3847
Parents: 4bb0048
Author: nareshpr <pr...@gmail.com>
Authored: Fri Aug 26 14:40:27 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Aug 26 21:40:00 2016 +0530
----------------------------------------------------------------------
.../apache/carbondata/core/util/CarbonUtil.java | 30 +++++++++---
.../execution/command/carbonTableSchema.scala | 4 +-
.../complextypespecialchardelimiter.csv | 50 ++++++++++++++++++++
.../complexType/TestComplexTypeQuery.scala | 10 +++-
.../processing/csvload/GraphExecutionUtil.java | 33 +------------
5 files changed, 87 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/cb8abfef/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 169eaf8..1c2b676 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -807,14 +807,32 @@ public final class CarbonUtil {
}
}
- public static String escapeComplexDelimiterChar(String parseStr) {
- switch (parseStr) {
- case "$":
- return "\\$";
+ /**
+ * special char delimiter Converter
+ *
+ * @param delimiter
+ * @return delimiter
+ */
+ public static String delimiterConverter(String delimiter) {
+ switch (delimiter) {
+ case "|":
+ case "*":
+ case ".":
case ":":
- return "\\:";
+ case "^":
+ case "\\":
+ case"$":
+ case "+":
+ case "?":
+ case "(":
+ case ")":
+ case "{":
+ case "}":
+ case "[":
+ case "]":
+ return "\\" + delimiter;
default:
- return parseStr;
+ return delimiter;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/cb8abfef/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
index aee56ac..2c76126 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
@@ -1113,9 +1113,9 @@ private[sql] case class LoadTable(
}
else {
carbonLoadModel.setComplexDelimiterLevel1(
- CarbonUtil.escapeComplexDelimiterChar(complex_delimiter_level_1))
+ CarbonUtil.delimiterConverter(complex_delimiter_level_1))
carbonLoadModel.setComplexDelimiterLevel2(
- CarbonUtil.escapeComplexDelimiterChar(complex_delimiter_level_2))
+ CarbonUtil.delimiterConverter(complex_delimiter_level_2))
}
// set local dictionary path, and dictionary file extension
carbonLoadModel.setAllDictPath(allDictionaryPath)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/cb8abfef/integration/spark/src/test/resources/complextypespecialchardelimiter.csv
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/resources/complextypespecialchardelimiter.csv b/integration/spark/src/test/resources/complextypespecialchardelimiter.csv
new file mode 100644
index 0000000..699fa70
--- /dev/null
+++ b/integration/spark/src/test/resources/complextypespecialchardelimiter.csv
@@ -0,0 +1,50 @@
+1,109,4ROM size,Intel,29-11-2015,1AA1^2BB1,MAC1^MAC2^MAC3,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,29-11-2015^29-11-2015*29-11-2015,109,2738.562
+10,93,1ROM size,Intel,29-11-2015,1AA10^2BB10,MAC4^MAC5^MAC6,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,30-11-2015^30-11-2015*30-11-2015,93,1714.635
+100,2591,2ROM size,Intel,29-11-2015,1AA100^2BB100,MAC7^MAC8^MAC9,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,01-12-2015^01-12-2015*01-12-2015,2591,1271
+1000,2531,2ROM size,Intel,29-11-2015,1AA1000^2BB1000,MAC10^^MAC12,6*Chinese*Hubei Province*wuhan*hongshan*hongshan^6*India*New Delhi*wuhan*hongshan*hongshan,02-12-2015^02-12-2015*02-12-2015,2531,692
+10000,2408,0ROM size,Intel,29-11-2015,1AA10000^2BB10000,MAC13^^MAC15,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,03-12-2015^03-12-2015*03-12-2015,2408,2175
+100000,1815,0ROM size,Intel,29-11-2015,1AA100000^2BB100000,MAC16^^MAC18,6*Chinese*Hubei Province*wuhan*hongshan*hongshan^6*India*New Delhi*wuhan*hongshan*hongshan,04-12-2015^04-12-2015*04-12-2015,1815,136
+1000000,2479,4ROM size,Intel,29-11-2015,1AA1000000^2BB1000000,MAC19^^MAC21,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,05-12-2015^05-12-2015*05-12-2015,2479,1600
+100001,1845,7ROM size,Intel,29-11-2015,1AA100001^,MAC22^^MAC24,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,06-12-2015^06-12-2015*06-12-2015,1845,505
+100002,2008,1ROM size,Intel,29-11-2015,1AA100002^,MAC25^^MAC27,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,07-12-2015^07-12-2015*07-12-2015,2008,1341
+100003,1121,5ROM size,Intel,29-11-2015,1AA100003^,MAC28^^MAC30,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,08-12-2015^08-12-2015*08-12-2015,1121,2239
+100004,1511,8ROM size,Intel,29-11-2015,1AA100004^,MAC31^^MAC33,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,09-12-2015^09-12-2015*09-12-2015,1511,2970
+100005,2759,0ROM size,Intel,29-11-2015,1AA100005^,MAC34^^MAC36,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,10-12-2015^10-12-2015*10-12-2015,2759,2593
+100006,2069,7ROM size,Intel,29-11-2015,1AA100006^,MAC37^^MAC39,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,11-12-2015^11-12-2015*11-12-2015,2069,2572
+100007,396,7ROM size,Intel,29-11-2015,1AA100007^,MAC40^^MAC42,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,12-12-2015^12-12-2015*12-12-2015,396,1991
+100008,104,2ROM size,Intel,29-11-2015,1AA100008^,MAC43^^MAC45,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,13-12-2015^13-12-2015*13-12-2015,104,1442
+100009,477,3ROM size,Intel,29-11-2015,1AA100009^,MAC46^^MAC48,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,14-12-2015^14-12-2015*14-12-2015,477,1841
+10001,546,8ROM size,Intel,29-11-2015,1AA10001^2,MAC49^^MAC51,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,15-12-2015^15-12-2015*15-12-2015,546,298
+100010,2696,3ROM size,Intel,29-11-2015,1AA100010^2BB100010,MAC52^^MAC54,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,16-12-2015^16-12-2015*16-12-2015,2696,79
+100011,466,2ROM size,Intel,29-11-2015,1AA100011^2BB100011,MAC55^^MAC57,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,17-12-2015^17-12-2015*17-12-2015,466,202
+100012,2644,2ROM size,Intel,29-11-2015,1AA100012^2BB100012,MAC58^^MAC60,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,18-12-2015^18-12-2015*18-12-2015,2644,568
+100013,2167,3ROM size,Intel,29-11-2015,1AA100013^2BB100013,MAC61^MAC62,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,19-12-2015^19-12-2015*19-12-2015,2167,355
+100014,1069,7ROM size,Intel,29-11-2015,1AA100014^2BB100014,MAC64^MAC65,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,20-12-2015^20-12-2015*20-12-2015,1069,151
+100015,1447,9ROM size,Intel,29-11-2015,1AA100015^2BB100015,MAC67^MAC68,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,21-12-2015^21-12-2015*21-12-2015,1447,2863
+100016,2963,3ROM size,Intel,29-11-2015,1AA100016^2BB100016,MAC70^MAC71,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,22-12-2015^22-12-2015*22-12-2015,2963,1873
+100017,1580,5ROM size,Intel,29-11-2015,1AA100017^2BB100017,MAC73^MAC74,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,23-12-2015^23-12-2015*23-12-2015,1580,2205
+100018,446,2ROM size,AMD,29-11-2015,1AA100018^2BB100018,MAC76^MAC77,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,24-12-2015^24-12-2015*24-12-2015,446,441
+100019,2151,7ROM size,AMD,29-11-2015,1AA100019^2BB100019,MAC79^MAC80,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,25-12-2015^25-12-2015*25-12-2015,2151,2194
+10002,2201,1ROM size,AMD,29-11-2015,2BB10002,MAC82^MAC83,6*Chinese*Hubei Province*wuhan*hongshan*hongshan^6*India*New Delhi*wuhan*hongshan*hongshan,26-12-2015^26-12-2015*26-12-2015,2201,2972
+100020,2574,5ROM size,AMD,29-11-2015,^2BB100020,MAC85^MAC86,1*Chinese*Guangdong Province*shenzhen*longgang*matishan^1*India*Guangdong Province*shenzhen*longgang*matishan,27-12-2015^27-12-2015*27-12-2015,2574,256
+100021,1734,4ROM size,AMD,29-11-2015,^2BB100021,MAC88^MAC89,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,28-12-2015^28-12-2015*28-12-2015,1734,1778
+100022,155,3ROM size,AMD,29-11-2015,^2BB100022,MAC91^MAC92,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,29-12-2015^29-12-2015*29-12-2015,155,1999
+100023,1386,8ROM size,AMD,29-11-2015,^2BB100023,MAC94^MAC95,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,30-12-2015^30-12-2015*30-12-2015,1386,2194
+100030,513,7ROM size,AMD,29-11-2015,^2BB100030,^MAC119^MAC120,5*Chinese*Hunan Province*zhuzhou*tianyuan*tianyua^5*India*Hunan Province*zhuzhou*tianyuan*tianyua,07-01-2016^07-01-2016*,513,1333
+100031,1741,1ROM size,AMD,29-11-2015,^2BB100031,^MAC122^MAC123,7*Chinese*Hubei Province*yichang*yichang*yichang^7*India*New Delhi*delhi*delhi*delhi,08-01-2016^08-01-2016*,1741,1080
+100032,1198,0ROM size,AMD,29-11-2015,^2BB100032,^MAC125^MAC126,1*Chinese*Guangdong Province*shenzhen*longgang*matishan^1*India*Guangdong Province*shenzhen*longgang*matishan,09-01-2016^09-01-2016*,1198,1053
+100033,273,9ROM size,AMD,29-11-2015,^2BB100033,^MAC128^MAC129,6*Chinese*Hubei Province*wuhan*hongshan*hongshan^6*India*New Delhi*wuhan*hongshan*hongshan,10-01-2016^10-01-2016*,273,760
+100034,1234,6ROM size,AMD,29-11-2015,^2BB100034,^MAC131^MAC132,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,11-01-2016^11-01-2016*,1234,2061
+100035,1619,1ROM size,AMD,29-11-2015,^2BB100035,^MAC134^MAC135,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,12-01-2016^12-01-2016*,1619,2142
+100036,2415,2ROM size,AMD,29-11-2015,^2BB100036,^MAC137^MAC138,3*Chinese*Hunan Province*changsha*yuhua*shazitang^3*India*Hunan Province*changsha*yuhua*shazitang,13-01-2016^13-01-2016*,2415,2224
+100037,2381,2ROM size,AMD,29-11-2015,^2BB100037,^MAC140^MAC141,4*Chinese*Hunan Province*xiangtan*xiangtan*jianshelu^4*India*Hunan Province*xiangtan*xiangtan*jianshelu,14-01-2016^14-01-2016*,2381,1015
+100038,872,7ROM size,AMD,29-11-2015,1AA100038^2BB100038,^MAC143^MAC144,1*Chinese*Guangdong Province*shenzhen*longgang*matishan^1*India*Guangdong Province*shenzhen*longgang*matishan,15-01-2016^15-01-2016,872,1229
+100039,1835,9ROM size,AMD,29-11-2015,1AA100039^2BB100039,^^MAC147,1*Chinese*Guangdong Province*shenzhen*longgang*matishan^1*India*Guangdong Province*shenzhen*longgang*matishan,16-01-2016^16-01-2016,1835,1750
+10004,2597,1ROM size,AMD,29-11-2015,1AA10004^2BB10004,^^MAC150,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,17-01-2016^17-01-2016,2597,1717
+100043,187,4ROM size,CELERON,29-11-2015,^,^^MAC162,2*Chinese**guangzhou*longhua*mingzhi^2*India**guangzhou*longhua*mingzhi,21-01-2016^21-01-2016,187,571
+100044,1232,5ROM size,CELERON,29-11-2015,^,^^MAC165,2**Guangdong Province*guangzhou*longhua*mingzhi^2**Guangdong Province*guangzhou*longhua*mingzhi,22-01-2016^22-01-2016,1232,1697
+100045,1602,6ROM size,CELERON,29-11-2015,^,^^MAC168,4*Chinese*Hunan Province**xiangtan*jianshelu^4*India*Hunan Province**xiangtan*jianshelu,23-01-2016^23-01-2016,1602,2553
+100046,2319,9ROM size,CELERON,29-11-2015,^,^^MAC171,2*Chinese*Guangdong Province*guangzhou**mingzhi^2*India*Guangdong Province*guangzhou**mingzhi,24-01-2016^24-01-2016,2319,1077
+100047,839,4ROM size,CELERON,29-11-2015,^,^^MAC174,5*Chinese*Hunan Province*zhuzhou*tianyuan*^5*India*Hunan Province*zhuzhou*tianyuan*,25-01-2016^25-01-2016,839,1823
+100048,1184,2ROM size,CELERON,29-11-2015,^,^^MAC177,2*Chinese*Guangdong Province*guangzhou*longhua*mingzhi^2*India*Guangdong Province*guangzhou*longhua*mingzhi,26-01-2016^*,1184,2399
+100049,2705,2ROM size,CELERON,29-11-2015,^,^^MAC180,2*Chinese*Guangdong Province^2*India*Guangdong Province,27-01-2016^*,2705,2890
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/cb8abfef/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala b/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala
index 12b3869..3630b61 100644
--- a/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala
+++ b/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala
@@ -61,7 +61,15 @@ class TestComplexTypeQuery extends QueryTest with BeforeAndAfterAll {
}
-
+ test("Test ^ * special character data loading for complex types") {
+ sql("create table complexcarbonwithspecialchardelimeter(deviceInformationId int, channelsId string, ROMSize string, ROMName String, purchasedate string, mobile struct<imei:string, imsi:string>, MAC array<string>, locationinfo array<struct<ActiveAreaId:int, ActiveCountry:string, ActiveProvince:string, Activecity:string, ActiveDistrict:string, ActiveStreet:string>>, proddate struct<productionDate:string,activeDeactivedate:array<string>>, gamePointId double,contractNumber double) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES ('DICTIONARY_INCLUDE'='deviceInformationId', 'DICTIONARY_EXCLUDE'='channelsId','COLUMN_GROUP'='(ROMSize,ROMName)')");
+ sql("LOAD DATA local inpath './src/test/resources/complextypespecialchardelimiter.csv' INTO table complexcarbonwithspecialchardelimeter OPTIONS('DELIMITER'=',', 'QUOTECHAR'='\"', 'FILEHEADER'='deviceInformationId,channelsId,ROMSize,ROMName,purchasedate,mobile,MAC,locationinfo,proddate,gamePointId,contractNumber', 'COMPLEX_DELIMITER_LEVEL_1'='^', 'COMPLEX_DELIMITER_LEVEL_2'='*')");
+ sql("create table complexhivewithspecialchardelimeter(deviceInformationId int, channelsId string, ROMSize string, ROMName String, purchasedate string, mobile struct<imei:string, imsi:string>, MAC array<string>, locationinfo array<struct<ActiveAreaId:int, ActiveCountry:string, ActiveProvince:string, Activecity:string, ActiveDistrict:string, ActiveStreet:string>>, proddate struct<productionDate:string,activeDeactivedate:array<string>>, gamePointId double,contractNumber double)row format delimited fields terminated by ',' collection items terminated by '^' map keys terminated by '*'")
+ sql("LOAD DATA local inpath './src/test/resources/complextypespecialchardelimiter.csv' INTO table complexhivewithspecialchardelimeter");
+ checkAnswer(sql("select * from complexcarbonwithspecialchardelimeter"), sql("select * from complexhivewithspecialchardelimeter"))
+ sql("drop table if exists complexcarbonwithspecialchardelimeter")
+ sql("drop table if exists complexhivewithspecialchardelimeter")
+ }
test("complex filter set1") {
checkAnswer(
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/cb8abfef/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java b/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java
index 01b6e26..2a35002 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/csvload/GraphExecutionUtil.java
@@ -126,7 +126,7 @@ public final class GraphExecutionUtil {
}
if (null != readLine) {
- delimiter = delimiterConverter(delimiter);
+ delimiter = CarbonUtil.delimiterConverter(delimiter);
String[] columnNames = readLine.split(delimiter);
TextFileInputField[] textFileInputFields = new TextFileInputField[columnNames.length];
@@ -290,7 +290,7 @@ public final class GraphExecutionUtil {
String readLine = readCSVFile(csvFilePath);
if (null != readLine) {
- delimiter = delimiterConverter(delimiter);
+ delimiter = CarbonUtil.delimiterConverter(delimiter);
String[] columnFromCSV = readLine.toLowerCase().split(delimiter);
List<String> csvColumnsList = new ArrayList<String>(CarbonCommonConstants.CONSTANT_SIZE_TEN);
@@ -330,33 +330,4 @@ public final class GraphExecutionUtil {
}
return columnNames;
}
-
- /**
- * special char delimiter Converter
- *
- * @param delimiter
- * @return delimiter
- */
- public static String delimiterConverter(String delimiter) {
- switch (delimiter) {
- case "|":
- case "*":
- case ".":
- case ":":
- case "^":
- case "\\":
- case"$":
- case "+":
- case "?":
- case "(":
- case ")":
- case "{":
- case "}":
- case "[":
- case "]":
- return "\\" + delimiter;
- default:
- return delimiter;
- }
- }
}
[2/2] incubator-carbondata git commit: [CARBONDATA-184] Fixed special
char delimiter for complex data. This closes #99
Posted by ra...@apache.org.
[CARBONDATA-184] Fixed special char delimiter for complex data. This closes #99
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/518b1325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/518b1325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/518b1325
Branch: refs/heads/master
Commit: 518b1325b4479f2fc21a54426a31366232abedb8
Parents: 4bb0048 cb8abfe
Author: ravipesala <ra...@gmail.com>
Authored: Fri Aug 26 21:41:14 2016 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Fri Aug 26 21:41:14 2016 +0530
----------------------------------------------------------------------
.../apache/carbondata/core/util/CarbonUtil.java | 30 +++++++++---
.../execution/command/carbonTableSchema.scala | 4 +-
.../complextypespecialchardelimiter.csv | 50 ++++++++++++++++++++
.../complexType/TestComplexTypeQuery.scala | 10 +++-
.../processing/csvload/GraphExecutionUtil.java | 33 +------------
5 files changed, 87 insertions(+), 40 deletions(-)
----------------------------------------------------------------------