You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/09/12 17:17:32 UTC
[23/37] DRILL-1402: Add check-style rules for trailing space,
TABs and blocks without braces
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testLtrim.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testLtrim.json b/exec/java-exec/src/test/resources/functions/string/testLtrim.json
index f801236..7b3e038 100644
--- a/exec/java-exec/src/test/resources/functions/string/testLtrim.json
+++ b/exec/java-exec/src/test/resources/functions/string/testLtrim.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,13 +23,13 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "ltrim('abcdef', 'abc')"},
- { ref: "col2", expr: "ltrim('abcdef', '')"},
- { ref: "col3", expr: "ltrim('abcdabc', 'abc')"},
- { ref: "col4", expr: "ltrim('abc', 'abc')"},
- { ref: "col5", expr: "ltrim('', 'abc')"},
- { ref: "col6", expr: "ltrim('', '')"}
- ]
+ { ref: "col1", expr: "ltrim('abcdef', 'abc')"},
+ { ref: "col2", expr: "ltrim('abcdef', '')"},
+ { ref: "col3", expr: "ltrim('abcdabc', 'abc')"},
+ { ref: "col4", expr: "ltrim('abc', 'abc')"},
+ { ref: "col5", expr: "ltrim('', 'abc')"},
+ { ref: "col6", expr: "ltrim('', '')"}
+ ]
},
{
@id: 3,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testPosition.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testPosition.json b/exec/java-exec/src/test/resources/functions/string/testPosition.json
index d9cccf9..73dda81 100644
--- a/exec/java-exec/src/test/resources/functions/string/testPosition.json
+++ b/exec/java-exec/src/test/resources/functions/string/testPosition.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testRegexpReplace.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testRegexpReplace.json b/exec/java-exec/src/test/resources/functions/string/testRegexpReplace.json
index 268ec00..014c09b 100644
--- a/exec/java-exec/src/test/resources/functions/string/testRegexpReplace.json
+++ b/exec/java-exec/src/test/resources/functions/string/testRegexpReplace.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,11 +23,10 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "regexp_replace('Thomas', '.[mN]a.', 'M')" },
- { ref: "col1", expr: "regexp_replace('Thomas', '.[mN]a.', '')" },
- { ref: "col1", expr: "regexp_replace('Thomas', 'ef', 'AB')" }
-
- ]
+ { ref: "col1", expr: "regexp_replace('Thomas', '.[mN]a.', 'M')" },
+ { ref: "col1", expr: "regexp_replace('Thomas', '.[mN]a.', '')" },
+ { ref: "col1", expr: "regexp_replace('Thomas', 'ef', 'AB')" }
+ ]
},
{
@id: 3,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testReplace.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testReplace.json b/exec/java-exec/src/test/resources/functions/string/testReplace.json
index 8cf8c64..fa1e8d8 100644
--- a/exec/java-exec/src/test/resources/functions/string/testReplace.json
+++ b/exec/java-exec/src/test/resources/functions/string/testReplace.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,13 +23,13 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "replace('aababcdf', 'ab', 'AB')"},
- { ref: "col2", expr: "replace('aababcdf', 'a', 'AB')"},
- { ref: "col3", expr: "replace('aababcdf', '', 'AB')"},
- { ref: "col4", expr: "replace('aababcdf', 'ab', '')"},
- { ref: "col5", expr: "replace('abc', 'abc', 'ABCD')"},
- { ref: "col6", expr: "replace('abc', 'abcdefg', 'ABCD')"}
- ]
+ { ref: "col1", expr: "replace('aababcdf', 'ab', 'AB')"},
+ { ref: "col2", expr: "replace('aababcdf', 'a', 'AB')"},
+ { ref: "col3", expr: "replace('aababcdf', '', 'AB')"},
+ { ref: "col4", expr: "replace('aababcdf', 'ab', '')"},
+ { ref: "col5", expr: "replace('abc', 'abc', 'ABCD')"},
+ { ref: "col6", expr: "replace('abc', 'abcdefg', 'ABCD')"}
+ ]
},
{
@id: 3,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testRight.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testRight.json b/exec/java-exec/src/test/resources/functions/string/testRight.json
index 74abcd4..e9d88b0 100644
--- a/exec/java-exec/src/test/resources/functions/string/testRight.json
+++ b/exec/java-exec/src/test/resources/functions/string/testRight.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,14 +23,14 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "right('abcdef', 2)"},
- { ref: "col2", expr: "right('abcdef', 6)"},
+ { ref: "col1", expr: "right('abcdef', 2)"},
+ { ref: "col2", expr: "right('abcdef', 6)"},
{ ref: "col3", expr: "right('abcdef', 7)"},
{ ref: "col4", expr: "right('abcdef', -2)"},
{ ref: "col5", expr: "right('abcdef', -5)"},
{ ref: "col6", expr: "right('abcdef', -6)"},
{ ref: "col7", expr: "right('abcdef', -7)"}
- ]
+ ]
},
{
@id: 3,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testRpad.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testRpad.json b/exec/java-exec/src/test/resources/functions/string/testRpad.json
index e41da4b..389ea15 100644
--- a/exec/java-exec/src/test/resources/functions/string/testRpad.json
+++ b/exec/java-exec/src/test/resources/functions/string/testRpad.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,17 +23,16 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "rpad('abcdef', 0, 'abc')"},
- { ref: "col2", expr: "rpad('abcdef', -3, 'abc')"},
- { ref: "col3", expr: "rpad('abcdef', 6, 'abc')"},
- { ref: "col4", expr: "rpad('abcdef', 2, 'abc')"},
- { ref: "col5", expr: "rpad('abcdef', 2, '')"},
- { ref: "col7", expr: "rpad('abcdef', 10, '')"},
- { ref: "col8", expr: "rpad('abcdef', 10, 'A')"},
- { ref: "col9", expr: "rpad('abcdef', 10, 'AB')"},
- { ref: "col10", expr: "rpad('abcdef', 10, 'ABC')"},
- { ref: "col11", expr: "rpad('abcdef', 10, 'ABCDEFGHIJKLMN')"}
-
+ { ref: "col1", expr: "rpad('abcdef', 0, 'abc')"},
+ { ref: "col2", expr: "rpad('abcdef', -3, 'abc')"},
+ { ref: "col3", expr: "rpad('abcdef', 6, 'abc')"},
+ { ref: "col4", expr: "rpad('abcdef', 2, 'abc')"},
+ { ref: "col5", expr: "rpad('abcdef', 2, '')"},
+ { ref: "col7", expr: "rpad('abcdef', 10, '')"},
+ { ref: "col8", expr: "rpad('abcdef', 10, 'A')"},
+ { ref: "col9", expr: "rpad('abcdef', 10, 'AB')"},
+ { ref: "col10", expr: "rpad('abcdef', 10, 'ABC')"},
+ { ref: "col11", expr: "rpad('abcdef', 10, 'ABCDEFGHIJKLMN')"}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testRtrim.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testRtrim.json b/exec/java-exec/src/test/resources/functions/string/testRtrim.json
index d3608d2..6d77cc9 100644
--- a/exec/java-exec/src/test/resources/functions/string/testRtrim.json
+++ b/exec/java-exec/src/test/resources/functions/string/testRtrim.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,13 +23,13 @@
child: 1,
pop:"project",
exprs: [
- { ref: "col1", expr: "rtrim('abcdef', 'def')"},
- { ref: "col2", expr: "rtrim('abcdef', '')"},
- { ref: "col3", expr: "rtrim('ABdabc', 'abc')"},
- { ref: "col4", expr: "rtrim('abc', 'abc')"},
- { ref: "col5", expr: "rtrim('', 'abc')"},
- { ref: "col6", expr: "rtrim('', '')"}
- ]
+ { ref: "col1", expr: "rtrim('abcdef', 'def')"},
+ { ref: "col2", expr: "rtrim('abcdef', '')"},
+ { ref: "col3", expr: "rtrim('ABdabc', 'abc')"},
+ { ref: "col4", expr: "rtrim('abc', 'abc')"},
+ { ref: "col5", expr: "rtrim('', 'abc')"},
+ { ref: "col6", expr: "rtrim('', '')"}
+ ]
},
{
@id: 3,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testSimilar.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testSimilar.json b/exec/java-exec/src/test/resources/functions/string/testSimilar.json
index c0972ae..dceb457 100644
--- a/exec/java-exec/src/test/resources/functions/string/testSimilar.json
+++ b/exec/java-exec/src/test/resources/functions/string/testSimilar.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testStringFuncs.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testStringFuncs.json b/exec/java-exec/src/test/resources/functions/string/testStringFuncs.json
index 4beea3d..9fd0110 100644
--- a/exec/java-exec/src/test/resources/functions/string/testStringFuncs.json
+++ b/exec/java-exec/src/test/resources/functions/string/testStringFuncs.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testSubstr.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testSubstr.json b/exec/java-exec/src/test/resources/functions/string/testSubstr.json
index 02c7a2d..0f889c5 100644
--- a/exec/java-exec/src/test/resources/functions/string/testSubstr.json
+++ b/exec/java-exec/src/test/resources/functions/string/testSubstr.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testTrim.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testTrim.json b/exec/java-exec/src/test/resources/functions/string/testTrim.json
index 6c81f78..4b71ea6 100644
--- a/exec/java-exec/src/test/resources/functions/string/testTrim.json
+++ b/exec/java-exec/src/test/resources/functions/string/testTrim.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testUpper.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/string/testUpper.json b/exec/java-exec/src/test/resources/functions/string/testUpper.json
index c155e14..841a8f6 100644
--- a/exec/java-exec/src/test/resources/functions/string/testUpper.json
+++ b/exec/java-exec/src/test/resources/functions/string/testUpper.json
@@ -12,10 +12,10 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 1, types: [
- {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
- {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 1, types: [
+ {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"},
+ {name: "nullvarcharcol", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -23,8 +23,8 @@
child: 1,
pop:"project",
exprs: [
- { ref: "lower", expr: "upper('ABcEFgh')"},
- { ref: "lower", expr: "upper('aBc')"},
+ { ref: "lower", expr: "upper('ABcEFgh')"},
+ { ref: "lower", expr: "upper('aBc')"},
{ ref: "lower", expr: "upper('')"}
]
},
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/testByteSubstring.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/testByteSubstring.json b/exec/java-exec/src/test/resources/functions/testByteSubstring.json
index 299bb51..ff4e967 100644
--- a/exec/java-exec/src/test/resources/functions/testByteSubstring.json
+++ b/exec/java-exec/src/test/resources/functions/testByteSubstring.json
@@ -12,12 +12,12 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "yellow", type: "VARBINARY", mode: "OPTIONAL"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "yellow", type: "VARBINARY", mode: "OPTIONAL"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -34,4 +34,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/testSubstring.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/testSubstring.json b/exec/java-exec/src/test/resources/functions/testSubstring.json
index d0fe2b9..536fda1 100644
--- a/exec/java-exec/src/test/resources/functions/testSubstring.json
+++ b/exec/java-exec/src/test/resources/functions/testSubstring.json
@@ -12,12 +12,12 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "yellow", type: "VARCHAR", mode: "OPTIONAL"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "yellow", type: "VARCHAR", mode: "OPTIONAL"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -34,4 +34,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/testSubstringNegative.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/functions/testSubstringNegative.json b/exec/java-exec/src/test/resources/functions/testSubstringNegative.json
index 12ff0f2..6d4659d 100644
--- a/exec/java-exec/src/test/resources/functions/testSubstringNegative.json
+++ b/exec/java-exec/src/test/resources/functions/testSubstringNegative.json
@@ -12,12 +12,12 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "yellow", type: "VARCHAR", mode: "OPTIONAL"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "yellow", type: "VARCHAR", mode: "OPTIONAL"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -34,4 +34,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/hash_join.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/hash_join.json b/exec/java-exec/src/test/resources/join/hash_join.json
index 41a983b..dbeb4ef 100644
--- a/exec/java-exec/src/test/resources/join/hash_join.json
+++ b/exec/java-exec/src/test/resources/join/hash_join.json
@@ -9,56 +9,56 @@
"resultMode" : "EXEC"
},
graph:[
- {
- @id:1,
- pop:"fs-scan",
- format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
- files:["#{TEST_FILE_1}"]
- },
- {
- @id:2,
- pop:"fs-scan",
- format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
- files:["#{TEST_FILE_2}"]
- },
- {
- "pop" : "project",
- "@id" : 3,
- "exprs" : [ {
- "ref" : "A",
- "expr" : "A"
- },
- { "ref" : "CCOL", "expr" : "C" }
- ],
+ {
+ @id:1,
+ pop:"fs-scan",
+ format: {type: "json"},
+ storage:{type: "file", connection: "file:///"},
+ files:["#{TEST_FILE_1}"]
+ },
+ {
+ @id:2,
+ pop:"fs-scan",
+ format: {type: "json"},
+ storage:{type: "file", connection: "file:///"},
+ files:["#{TEST_FILE_2}"]
+ },
+ {
+ "pop" : "project",
+ "@id" : 3,
+ "exprs" : [ {
+ "ref" : "A",
+ "expr" : "A"
+ },
+ { "ref" : "CCOL", "expr" : "C" }
+ ],
- "child" : 1
- },
- {
- "pop" : "project",
- "@id" : 4,
- "exprs" : [ {
- "ref" : "B",
- "expr" : "B"
- },
- { "ref" : "DCOL", "expr" : "D" }
- ],
+ "child" : 1
+ },
+ {
+ "pop" : "project",
+ "@id" : 4,
+ "exprs" : [ {
+ "ref" : "B",
+ "expr" : "B"
+ },
+ { "ref" : "DCOL", "expr" : "D" }
+ ],
- "child" : 2
- },
- {
+ "child" : 2
+ },
+ {
@id: 5,
right: 3,
left: 4,
pop: "hash-join",
conditions: [ {relationship: "==", left: "B", right: "A"} ],
- joinType : "INNER"
- },
- {
+ joinType : "INNER"
+ },
+ {
@id: 6,
child: 5,
pop: "screen"
- }
- ]
- }
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json b/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json
index 0f1c32b..4033ca9 100644
--- a/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json
+++ b/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json
@@ -56,7 +56,7 @@
{relationship: "==", left: "B", right: "A"},
{relationship: "==", left: "DCOL", right: "CCOL"}
],
- joinType : "INNER"
+ joinType : "INNER"
},
{
@id: 6,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/join_batchsize.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/join_batchsize.json b/exec/java-exec/src/test/resources/join/join_batchsize.json
index 969ff0d..4817e7c 100644
--- a/exec/java-exec/src/test/resources/join/join_batchsize.json
+++ b/exec/java-exec/src/test/resources/join/join_batchsize.json
@@ -18,7 +18,7 @@
{name: "green", type: "INT", mode: "REQUIRED"}
]}
]
- },
+ },
{
pop : "sort",
@id : 2,
@@ -28,12 +28,12 @@
expr : "blue"
} ],
reverse : false
- },
+ },
{
pop : "selection-vector-remover",
@id : 3,
child : 2
- },
+ },
{
@id:4,
pop:"mock-sub-scan",
@@ -43,7 +43,7 @@
{name: "blue1", type: "INT", mode: "REQUIRED"},
{name: "red1", type: "INT", mode: "REQUIRED"},
{name: "green1", type: "INT", mode: "REQUIRED"}
- ]}
+ ]}
]
},
{
@@ -55,12 +55,12 @@
expr : "blue1"
} ],
reverse : false
- },
+ },
{
pop : "selection-vector-remover",
@id : 6,
child : 5
- },
+ },
{
@id: 7,
right: 6,
@@ -79,7 +79,7 @@
pop : "selection-vector-remover",
@id : 9,
child : 8
- },
+ },
{
@id: 10,
child: 9,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json b/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
index 52b4141..37ba9a4 100644
--- a/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
@@ -11,7 +11,7 @@
@id:1,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{LEFT_FILE}" }
]
@@ -20,7 +20,7 @@
@id:2,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{RIGHT_FILE}" }
]
@@ -39,4 +39,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/merge_multi_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_multi_batch.json b/exec/java-exec/src/test/resources/join/merge_multi_batch.json
index ef3ef41..f209a98 100644
--- a/exec/java-exec/src/test/resources/join/merge_multi_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_multi_batch.json
@@ -11,7 +11,7 @@
@id:1,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{LEFT_FILE}" }
]
@@ -20,7 +20,7 @@
@id:2,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{RIGHT_FILE}" }
]
@@ -39,4 +39,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/join/merge_single_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_single_batch.json b/exec/java-exec/src/test/resources/join/merge_single_batch.json
index ef3ef41..f209a98 100644
--- a/exec/java-exec/src/test/resources/join/merge_single_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_single_batch.json
@@ -11,7 +11,7 @@
@id:1,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{LEFT_FILE}" }
]
@@ -20,7 +20,7 @@
@id:2,
pop:"fs-sub-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:[
{ path: "#{RIGHT_FILE}" }
]
@@ -39,4 +39,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/jsoninput/input1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/jsoninput/input1.json b/exec/java-exec/src/test/resources/jsoninput/input1.json
index e9bde7e..9f4cdb5 100644
--- a/exec/java-exec/src/test/resources/jsoninput/input1.json
+++ b/exec/java-exec/src/test/resources/jsoninput/input1.json
@@ -1,6 +1,6 @@
-{ "integer" : 2001,
+{ "integer" : 2001,
"float" : 1.2
}
{ "integer" : -2002,
- "float" : -1.2
+ "float" : -1.2
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/jsoninput/input2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/jsoninput/input2.json b/exec/java-exec/src/test/resources/jsoninput/input2.json
index 4e044c2..d37f686 100644
--- a/exec/java-exec/src/test/resources/jsoninput/input2.json
+++ b/exec/java-exec/src/test/resources/jsoninput/input2.json
@@ -1,4 +1,4 @@
-{ "integer" : 2010,
+{ "integer" : 2010,
"float" : 17.4,
"x": {
"y": "kevin",
@@ -12,9 +12,9 @@
"rl": [ [2,1], [4,6] ]
}
{ "integer" : -2002,
- "float" : -1.2
+ "float" : -1.2
}
-{ "integer" : 2001,
+{ "integer" : 2001,
"float" : 1.2,
"x": {
"y": "bill",
@@ -26,7 +26,7 @@
"l": [4,2],
"rl": [ [2,1], [4,6] ]
}
-{ "integer" : 6005,
+{ "integer" : 6005,
"float" : 1.2,
"x": {
"y": "mike",
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/jsoninput/vvtypes.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/jsoninput/vvtypes.json b/exec/java-exec/src/test/resources/jsoninput/vvtypes.json
index 60cd1ea..6335b4e 100644
--- a/exec/java-exec/src/test/resources/jsoninput/vvtypes.json
+++ b/exec/java-exec/src/test/resources/jsoninput/vvtypes.json
@@ -74,7 +74,7 @@
major: "Fixed",
width: 16,
javaType: "ByteBuf",
- boxedType: "ByteBuf",
+ boxedType: "ByteBuf",
minor: [
{ class: "Interval", daysOffset: 4, milliSecondsOffset: 8, friendlyType: "Period" }
]
@@ -93,7 +93,7 @@
width: 16,
javaType: "ByteBuf",
boxedType: "ByteBuf",
-
+
minor: [
{ class: "Decimal38Dense", maxPrecisionDigits: 38, nDecimalDigits: 4, friendlyType: "BigDecimal" }
]
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/limit/limit_exchanges.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/limit/limit_exchanges.json b/exec/java-exec/src/test/resources/limit/limit_exchanges.json
index 5ad56be..c2303c8 100644
--- a/exec/java-exec/src/test/resources/limit/limit_exchanges.json
+++ b/exec/java-exec/src/test/resources/limit/limit_exchanges.json
@@ -63,11 +63,11 @@
"pop" : "union-exchange",
"@id" : 4,
"child" : 3
- },
+ },
{
"pop" : "project",
"@id" : 5,
- "exprs" : [ {
+ "exprs" : [ {
"ref" : "`N_NATIONKEY`",
"expr" : "`N_NATIONKEY`"
} ],
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/limit/test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/limit/test1.json b/exec/java-exec/src/test/resources/limit/test1.json
index 79d6748..feca794 100644
--- a/exec/java-exec/src/test/resources/limit/test1.json
+++ b/exec/java-exec/src/test/resources/limit/test1.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -38,4 +38,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/limit/test2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/limit/test2.json b/exec/java-exec/src/test/resources/limit/test2.json
index 5ab1ab5..1278559 100644
--- a/exec/java-exec/src/test/resources/limit/test2.json
+++ b/exec/java-exec/src/test/resources/limit/test2.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100000000, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100000000, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -38,4 +38,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/limit/test3.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/limit/test3.json b/exec/java-exec/src/test/resources/limit/test3.json
index 26b78bb..26f0e7b 100644
--- a/exec/java-exec/src/test/resources/limit/test3.json
+++ b/exec/java-exec/src/test/resources/limit/test3.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -37,4 +37,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/limit/test4.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/limit/test4.json b/exec/java-exec/src/test/resources/limit/test4.json
index b7793b1..03427f1 100644
--- a/exec/java-exec/src/test/resources/limit/test4.json
+++ b/exec/java-exec/src/test/resources/limit/test4.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100000000, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100000000, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -46,4 +46,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/mock-scan.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/mock-scan.json b/exec/java-exec/src/test/resources/mock-scan.json
index 3660480..494a319 100644
--- a/exec/java-exec/src/test/resources/mock-scan.json
+++ b/exec/java-exec/src/test/resources/mock-scan.json
@@ -6,16 +6,16 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
url: "http://apache.org",
entries:[
- {records: 100000000, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
+ {records: 100000000, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
{records: 100000000, types: [
{name: "blue", type: "INT", mode: "REQUIRED"},
{name: "green", type: "INT", mode: "REQUIRED"}
@@ -28,4 +28,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_double_exchange.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_double_exchange.json b/exec/java-exec/src/test/resources/physical_double_exchange.json
index 85823cf..d2d9586 100644
--- a/exec/java-exec/src/test/resources/physical_double_exchange.json
+++ b/exec/java-exec/src/test/resources/physical_double_exchange.json
@@ -12,16 +12,16 @@
pop:"mock-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -52,4 +52,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_join.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_join.json b/exec/java-exec/src/test/resources/physical_join.json
index 7914ac3..0ad268b 100644
--- a/exec/java-exec/src/test/resources/physical_join.json
+++ b/exec/java-exec/src/test/resources/physical_join.json
@@ -57,7 +57,7 @@
entries : [ {
path : "/tmp/nation.parquet"
} ],
- storageengine: {type: "parquet", dfsName: "file:///" },
+ storageengine: {type: "parquet", dfsName: "file:///" },
ref : "_MAP",
fragmentPointer : 0
}, {
@@ -114,4 +114,4 @@
@id : 13,
child : 12
} ]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_json_scan_test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_json_scan_test1.json b/exec/java-exec/src/test/resources/physical_json_scan_test1.json
index 5293d3b..5013d6d 100644
--- a/exec/java-exec/src/test/resources/physical_json_scan_test1.json
+++ b/exec/java-exec/src/test/resources/physical_json_scan_test1.json
@@ -6,12 +6,12 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"fs-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files: [ "#{TEST_FILE}" ]
},
{
@@ -25,4 +25,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_repeated_1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_repeated_1.json b/exec/java-exec/src/test/resources/physical_repeated_1.json
index 71eff1d..e518cd7 100644
--- a/exec/java-exec/src/test/resources/physical_repeated_1.json
+++ b/exec/java-exec/src/test/resources/physical_repeated_1.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
@@ -26,7 +26,7 @@
exprs: [
{ ref: "cnt", expr:"repeated_count(blue)" },
{ ref: "has_min", expr:"repeated_contains(red, 9223372036854775807)" }
- ]
+ ]
},
{
@id: 3,
@@ -34,4 +34,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_test1.json b/exec/java-exec/src/test/resources/physical_test1.json
index 0ddd48f..b46f9c4 100644
--- a/exec/java-exec/src/test/resources/physical_test1.json
+++ b/exec/java-exec/src/test/resources/physical_test1.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -37,4 +37,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/physical_test2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/physical_test2.json b/exec/java-exec/src/test/resources/physical_test2.json
index b001921..d98aa2f 100644
--- a/exec/java-exec/src/test/resources/physical_test2.json
+++ b/exec/java-exec/src/test/resources/physical_test2.json
@@ -12,16 +12,16 @@
pop:"mock-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -29,6 +29,5 @@
child: 1,
pop: "screen"
}
- ]
-
-}
\ No newline at end of file
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/project/test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/project/test1.json b/exec/java-exec/src/test/resources/project/test1.json
index 3a84fd0..39d8c18 100644
--- a/exec/java-exec/src/test/resources/project/test1.json
+++ b/exec/java-exec/src/test/resources/project/test1.json
@@ -6,18 +6,18 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "OPTIONAL"},
- {name: "green", type: "INT", mode: "REQUIRED"},
- {name: "orange", type: "VARCHAR", mode: "OPTIONAL"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "OPTIONAL"},
+ {name: "green", type: "INT", mode: "REQUIRED"},
+ {name: "orange", type: "VARCHAR", mode: "OPTIONAL"}
+ ]}
]
},
{
@@ -37,4 +37,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/queries/tpch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/queries/tpch.json b/exec/java-exec/src/test/resources/queries/tpch.json
index 5989439..589ecb6 100644
--- a/exec/java-exec/src/test/resources/queries/tpch.json
+++ b/exec/java-exec/src/test/resources/queries/tpch.json
@@ -1,7 +1,7 @@
[
tpch1: "
-
+
select
l_returnflag,
l_linestatus,
@@ -27,7 +27,7 @@ LIMIT 1;
",
tpch1a: "
-
+
select
l_returnflag,
l_linestatus,
@@ -50,5 +50,4 @@ order by
LIMIT 1;
"
-
-]
\ No newline at end of file
+]
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/queries/tpch/04.sql
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/queries/tpch/04.sql b/exec/java-exec/src/test/resources/queries/tpch/04.sql
index feeb2e0..7592690 100644
--- a/exec/java-exec/src/test/resources/queries/tpch/04.sql
+++ b/exec/java-exec/src/test/resources/queries/tpch/04.sql
@@ -8,7 +8,7 @@ from
where
o.o_orderdate >= date '1996-10-01'
and o.o_orderdate < date '1996-10-01' + interval '3' month
- and
+ and
exists (
select
*
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/queries/tpch/13.sql
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/queries/tpch/13.sql b/exec/java-exec/src/test/resources/queries/tpch/13.sql
index ae3f691..7677922 100644
--- a/exec/java-exec/src/test/resources/queries/tpch/13.sql
+++ b/exec/java-exec/src/test/resources/queries/tpch/13.sql
@@ -8,8 +8,8 @@ from
c.c_custkey,
count(o.o_orderkey)
from
- cp.`tpch/customer.parquet` c
- left outer join cp.`tpch/orders.parquet` o
+ cp.`tpch/customer.parquet` c
+ left outer join cp.`tpch/orders.parquet` o
on c.c_custkey = o.o_custkey
and o.o_comment not like '%special%requests%'
group by
@@ -19,4 +19,4 @@ group by
c_count
order by
custdist desc,
- c_count desc;
\ No newline at end of file
+ c_count desc;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/queries/tpch/15.sql
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/queries/tpch/15.sql b/exec/java-exec/src/test/resources/queries/tpch/15.sql
index 2f0aa8e..49927a4 100644
--- a/exec/java-exec/src/test/resources/queries/tpch/15.sql
+++ b/exec/java-exec/src/test/resources/queries/tpch/15.sql
@@ -12,7 +12,7 @@ create view revenue0 (supplier_no, total_revenue) as
and l_shipdate < date '1993-05-01' + interval '3' month
group by
l_suppkey;
-
+
select
s.s_suppkey,
s.s_name,
@@ -32,5 +32,5 @@ where
)
order by
s.s_suppkey;
-
-drop view revenue0;
\ No newline at end of file
+
+drop view revenue0;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/queries/tpch/19_1.sql
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/queries/tpch/19_1.sql b/exec/java-exec/src/test/resources/queries/tpch/19_1.sql
index 6d7f9c0..bc5a0d2 100644
--- a/exec/java-exec/src/test/resources/queries/tpch/19_1.sql
+++ b/exec/java-exec/src/test/resources/queries/tpch/19_1.sql
@@ -5,7 +5,7 @@ from
cp.`tpch/lineitem.parquet` l,
cp.`tpch/part.parquet` p
where
- p.p_partkey = l.l_partkey
+ p.p_partkey = l.l_partkey
and (
(
p.p_brand = 'Brand#41'
@@ -32,4 +32,4 @@ where
and p.p_size between 1 and 15
and l.l_shipmode in ('AIR', 'AIR REG')
and l.l_shipinstruct = 'DELIVER IN PERSON'
- ) );
\ No newline at end of file
+ ) );
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/remover/test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/remover/test1.json b/exec/java-exec/src/test/resources/remover/test1.json
index 3abe476..838bf16 100644
--- a/exec/java-exec/src/test/resources/remover/test1.json
+++ b/exec/java-exec/src/test/resources/remover/test1.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -36,4 +36,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/scan_json_test_3.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/scan_json_test_3.json b/exec/java-exec/src/test/resources/scan_json_test_3.json
index cb7897e..d8755f2 100644
--- a/exec/java-exec/src/test/resources/scan_json_test_3.json
+++ b/exec/java-exec/src/test/resources/scan_json_test_3.json
@@ -1,18 +1,18 @@
{
"test": 123,
"a": {
- "b": "test",
- "a": {
- "d": true
- }
+ "b": "test",
+ "a": {
+ "d": true
+ }
}
}
{
"test": 1234,
"a": {
- "b": "test2",
- "a": {
- "d": false
- }
+ "b": "test2",
+ "a": {
+ "d": false
+ }
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/scan_json_test_6.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/scan_json_test_6.json b/exec/java-exec/src/test/resources/scan_json_test_6.json
index 68b53d4..52eb0b5 100644
--- a/exec/java-exec/src/test/resources/scan_json_test_6.json
+++ b/exec/java-exec/src/test/resources/scan_json_test_6.json
@@ -2,13 +2,13 @@
"test": 123,
"test2": [1,2,3],
"a": {
- "b": 1
+ "b": 1
}
}
{
"test": "abc",
"test2": false,
"a": {
- "b": [1,2,3,4]
+ "b": [1,2,3,4]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/scan_screen_logical.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/scan_screen_logical.json b/exec/java-exec/src/test/resources/scan_screen_logical.json
index 4f44f9e..005251b 100644
--- a/exec/java-exec/src/test/resources/scan_screen_logical.json
+++ b/exec/java-exec/src/test/resources/scan_screen_logical.json
@@ -12,7 +12,7 @@
"type" : "mock"
}
},
-
+
query:[
{
@id:"1",
@@ -42,8 +42,6 @@
target: {
file: "console:///stdout"
}
-
}
-
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/sender/broadcast_exchange.json b/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
index 950c318..1288736 100644
--- a/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
+++ b/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
@@ -11,14 +11,14 @@
@id:1,
pop:"fs-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:["#{LEFT_FILE}"]
},
{
@id:2,
pop:"fs-scan",
format: {type: "json"},
- storage:{type: "file", connection: "file:///"},
+ storage:{type: "file", connection: "file:///"},
files:["#{RIGHT_FILE}"]
},
{
@@ -40,4 +40,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/server/options_session_check.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/server/options_session_check.json b/exec/java-exec/src/test/resources/server/options_session_check.json
index 6cb80fd..ab5dd8a 100644
--- a/exec/java-exec/src/test/resources/server/options_session_check.json
+++ b/exec/java-exec/src/test/resources/server/options_session_check.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"options-reader-group-scan"
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/server/options_set.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/server/options_set.json b/exec/java-exec/src/test/resources/server/options_set.json
index dda35fc..ac625e0 100644
--- a/exec/java-exec/src/test/resources/server/options_set.json
+++ b/exec/java-exec/src/test/resources/server/options_set.json
@@ -9,7 +9,7 @@
&REPLACED_IN_TEST&
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"options-reader-group-scan"
@@ -21,4 +21,3 @@
}
]
}
-
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/simple_plan.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/simple_plan.json b/exec/java-exec/src/test/resources/simple_plan.json
index 7ffb504..85b3bfa 100644
--- a/exec/java-exec/src/test/resources/simple_plan.json
+++ b/exec/java-exec/src/test/resources/simple_plan.json
@@ -10,13 +10,13 @@
storage:{
logs: {
type:"text",
- file: "local://logs/*.log",
- compress:"gzip",
- line-delimiter:"\n",
- record-maker:{
- type:"first-row",
- delimiter:","
- }
+ file: "local://logs/*.log",
+ compress:"gzip",
+ line-delimiter:"\n",
+ record-maker:{
+ type:"first-row",
+ delimiter:","
+ }
},
{
type:"mongo",
@@ -125,9 +125,8 @@
target: {
file: "console:///stdout"
}
-
+
}
-
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/sort/one_key_sort.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/sort/one_key_sort.json b/exec/java-exec/src/test/resources/sort/one_key_sort.json
index 6e5d617..3a3d072 100644
--- a/exec/java-exec/src/test/resources/sort/one_key_sort.json
+++ b/exec/java-exec/src/test/resources/sort/one_key_sort.json
@@ -6,16 +6,16 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 10000000, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
+ {records: 10000000, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
{records: 10000000, types: [
{name: "blue", type: "INT", mode: "REQUIRED"},
{name: "green", type: "INT", mode: "REQUIRED"}
@@ -41,4 +41,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/sort/two_key_sort.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/sort/two_key_sort.json b/exec/java-exec/src/test/resources/sort/two_key_sort.json
index ab14002..7d6a1a8 100644
--- a/exec/java-exec/src/test/resources/sort/two_key_sort.json
+++ b/exec/java-exec/src/test/resources/sort/two_key_sort.json
@@ -6,16 +6,16 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
{records: 100, types: [
{name: "blue", type: "INT", mode: "REQUIRED"},
{name: "green", type: "INT", mode: "REQUIRED"}
@@ -51,4 +51,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/store/text/test.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/store/text/test.json b/exec/java-exec/src/test/resources/store/text/test.json
index fbf19a4..4a312d6 100644
--- a/exec/java-exec/src/test/resources/store/text/test.json
+++ b/exec/java-exec/src/test/resources/store/text/test.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"fs-scan",
@@ -37,4 +37,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/testRepeatedWrite.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/testRepeatedWrite.json b/exec/java-exec/src/test/resources/testRepeatedWrite.json
index fa5da83..8a3111d 100644
--- a/exec/java-exec/src/test/resources/testRepeatedWrite.json
+++ b/exec/java-exec/src/test/resources/testRepeatedWrite.json
@@ -1,74 +1,74 @@
{
- "id": "0001",
- "type": "donut",
- "name": "Cake",
- "ppu": 0.55,
- "sales": 35,
- "topping":
- [
- "None",
- "Glazed",
- "Sugar",
- "Powdered Sugar",
- "Chocolate with Sprinkles",
- "Chocolate",
- "Maple"
- ]
- }
- {
- "id": "0002",
- "type": "donut",
- "name": "Raised",
- "ppu": 0.69,
- "sales": 145,
- "topping":
- [
- "None",
- "Glazed",
- "Sugar",
- "Chocolate",
- "Maple"
- ]
- }
- {
- "id": "0003",
- "type": "donut",
- "name": "Old Fashioned",
- "ppu": 0.55,
- "sales": 300,
- "topping":
- [
- "None",
- "Glazed",
- "Chocolate",
- "Maple"
- ]
- }
- {
- "id": "0004",
- "type": "donut",
- "name": "Filled",
- "ppu": 0.69,
- "sales": 14,
- "topping":
- [
- "None",
- "Glazed",
- "Sugar",
- "Powdered Sugar",
- "Chocolate with Sprinkles",
- "Chocolate",
- "Maple"
- ]
- }
- {
- "id": "0005",
- "type": "donut",
- "name": "Apple Fritter",
- "ppu": 1.00,
- "sales": 700,
- "topping":
- [
- "Glazed"
- ]
- }
+ "id": "0001",
+ "type": "donut",
+ "name": "Cake",
+ "ppu": 0.55,
+ "sales": 35,
+ "topping":
+ [
+ "None",
+ "Glazed",
+ "Sugar",
+ "Powdered Sugar",
+ "Chocolate with Sprinkles",
+ "Chocolate",
+ "Maple"
+ ]
+}
+{
+ "id": "0002",
+ "type": "donut",
+ "name": "Raised",
+ "ppu": 0.69,
+ "sales": 145,
+ "topping":
+ [
+ "None",
+ "Glazed",
+ "Sugar",
+ "Chocolate",
+ "Maple"
+ ]
+}
+{
+ "id": "0003",
+ "type": "donut",
+ "name": "Old Fashioned",
+ "ppu": 0.55,
+ "sales": 300,
+ "topping":
+ [
+ "None",
+ "Glazed",
+ "Chocolate",
+ "Maple"
+ ]
+}
+{
+ "id": "0004",
+ "type": "donut",
+ "name": "Filled",
+ "ppu": 0.69,
+ "sales": 14,
+ "topping":
+ [
+ "None",
+ "Glazed",
+ "Sugar",
+ "Powdered Sugar",
+ "Chocolate with Sprinkles",
+ "Chocolate",
+ "Maple"
+ ]
+}
+{
+ "id": "0005",
+ "type": "donut",
+ "name": "Apple Fritter",
+ "ppu": 1.00,
+ "sales": 700,
+ "topping":
+ [
+ "Glazed"
+ ]
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/topN/one_key_sort.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/topN/one_key_sort.json b/exec/java-exec/src/test/resources/topN/one_key_sort.json
index 3c919b2..45b3fc3 100644
--- a/exec/java-exec/src/test/resources/topN/one_key_sort.json
+++ b/exec/java-exec/src/test/resources/topN/one_key_sort.json
@@ -6,16 +6,16 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
url: "http://apache.org",
entries:[
- {records: 10000000, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
+ {records: 10000000, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
{records: 10000000, types: [
{name: "blue", type: "INT", mode: "REQUIRED"},
{name: "green", type: "INT", mode: "REQUIRED"}
@@ -50,4 +50,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/topN/two_key_sort.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/topN/two_key_sort.json b/exec/java-exec/src/test/resources/topN/two_key_sort.json
index 3a05cf6..500f740 100644
--- a/exec/java-exec/src/test/resources/topN/two_key_sort.json
+++ b/exec/java-exec/src/test/resources/topN/two_key_sort.json
@@ -6,16 +6,16 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]},
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]},
{records: 100, types: [
{name: "blue", type: "INT", mode: "REQUIRED"},
{name: "green", type: "INT", mode: "REQUIRED"}
@@ -52,4 +52,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/union/test1.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/union/test1.json b/exec/java-exec/src/test/resources/union/test1.json
index a4dcc08..900ac24 100644
--- a/exec/java-exec/src/test/resources/union/test1.json
+++ b/exec/java-exec/src/test/resources/union/test1.json
@@ -6,17 +6,17 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
},
{
@@ -24,13 +24,13 @@
pop:"mock-sub-scan",
url: "http://apache.org",
entries:[
- {records: 100, types: [
- {name: "blue", type: "INT", mode: "REQUIRED"},
- {name: "red", type: "BIGINT", mode: "REQUIRED"},
- {name: "green", type: "INT", mode: "REQUIRED"}
- ]}
+ {records: 100, types: [
+ {name: "blue", type: "INT", mode: "REQUIRED"},
+ {name: "red", type: "BIGINT", mode: "REQUIRED"},
+ {name: "green", type: "INT", mode: "REQUIRED"}
+ ]}
]
- },
+ },
{
@id:3,
child: 2,
@@ -46,7 +46,7 @@
@id:5,
child:4,
pop: "selection-vector-remover"
-
+
},
{
@id: 6,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/xsort/one_key_sort_descending.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/xsort/one_key_sort_descending.json b/exec/java-exec/src/test/resources/xsort/one_key_sort_descending.json
index efb887b..f4eab5d 100644
--- a/exec/java-exec/src/test/resources/xsort/one_key_sort_descending.json
+++ b/exec/java-exec/src/test/resources/xsort/one_key_sort_descending.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
@@ -45,4 +45,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/xsort/one_key_sort_descending_sv2.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/xsort/one_key_sort_descending_sv2.json b/exec/java-exec/src/test/resources/xsort/one_key_sort_descending_sv2.json
index d10aa96..96d7f1d 100644
--- a/exec/java-exec/src/test/resources/xsort/one_key_sort_descending_sv2.json
+++ b/exec/java-exec/src/test/resources/xsort/one_key_sort_descending_sv2.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
@@ -51,4 +51,4 @@
pop: "screen"
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/xsort/oom_sort_test.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/xsort/oom_sort_test.json b/exec/java-exec/src/test/resources/xsort/oom_sort_test.json
index af5bc43..22c3a5c 100644
--- a/exec/java-exec/src/test/resources/xsort/oom_sort_test.json
+++ b/exec/java-exec/src/test/resources/xsort/oom_sort_test.json
@@ -6,7 +6,7 @@
type:"manual"
}
},
- graph:[
+ graph:[
{
@id:1,
pop:"mock-scan",
@@ -54,4 +54,4 @@
maxAllocation: 1000000
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
index f4ca79b..f318227 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
@@ -63,40 +63,40 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
try{
- if(config.isLocal()){
+ if (config.isLocal()) {
DrillConfig dConfig = DrillConfig.create();
this.allocator = new TopLevelAllocator(dConfig);
RemoteServiceSet set = GlobalServiceSetReference.SETS.get();
- if(set == null){
+ if (set == null) {
// we're embedded, start a local drill bit.
serviceSet = RemoteServiceSet.getLocalServiceSet();
set = serviceSet;
- try{
+ try {
bit = new Drillbit(dConfig, serviceSet);
bit.run();
- }catch(Exception e){
+ } catch (Exception e) {
throw new SQLException("Failure while attempting to start Drillbit in embedded mode.", e);
}
- }else{
+ } else {
serviceSet = null;
bit = null;
}
this.client = new DrillClient(dConfig, set.getCoordinator());
this.client.connect(null, info);
- }else{
+ } else {
DrillConfig dConfig = DrillConfig.createClient();
this.allocator = new TopLevelAllocator(dConfig);
this.client = new DrillClient();
this.client.connect(config.getZookeeperConnectionString(), info);
}
- }catch(RpcException e){
+ } catch (RpcException e) {
throw new SQLException("Failure while attempting to connect to Drill.", e);
}
}
@Override
- public DrillConnectionConfig config(){
+ public DrillConnectionConfig config() {
return config;
}
@@ -109,11 +109,11 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
return (MetaImpl) meta;
}
- BufferAllocator getAllocator(){
+ BufferAllocator getAllocator() {
return allocator;
}
- public DrillClient getClient(){
+ public DrillClient getClient() {
return client;
}
@@ -156,15 +156,17 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
return factory;
}
- void cleanup(){
+ void cleanup() {
client.close();
allocator.close();
- if(bit != null) bit.close();
+ if (bit != null) {
+ bit.close();
+ }
- if(serviceSet != null){
- try{
+ if (serviceSet != null) {
+ try {
serviceSet.close();
- }catch(IOException e){
+ } catch (IOException e) {
logger.warn("Exception while closing service set.", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java
index 9d4630f..bfc1b8a 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java
@@ -67,24 +67,26 @@ public class DrillCursor implements Cursor{
@Override
public boolean next() throws SQLException {
- if(!started){
+ if (!started) {
started = true;
redoFirstNext = true;
- }else if(redoFirstNext && !finished){
+ } else if(redoFirstNext && !finished) {
redoFirstNext = false;
return true;
}
- if(finished) return false;
+ if (finished) {
+ return false;
+ }
- if(currentRecord+1 < currentBatch.getRecordCount()){
+ if (currentRecord+1 < currentBatch.getRecordCount()) {
currentRecord++;
return true;
- }else{
+ } else {
try {
QueryResultBatch qrb = listener.getNext();
recordBatchCount++;
- while(qrb != null && qrb.getHeader().getRowCount() == 0 && !first){
+ while (qrb != null && qrb.getHeader().getRowCount() == 0 && !first) {
qrb.release();
qrb = listener.getNext();
recordBatchCount++;
@@ -92,14 +94,16 @@ public class DrillCursor implements Cursor{
first = false;
- if(qrb == null){
+ if (qrb == null) {
finished = true;
return false;
- }else{
+ } else {
currentRecord = 0;
boolean changed = currentBatch.load(qrb.getHeader().getDef(), qrb.getData());
schema = currentBatch.getSchema();
- if(changed) updateColumns();
+ if (changed) {
+ updateColumns();
+ }
if (redoFirstNext && currentBatch.getRecordCount() == 0) {
redoFirstNext = false;
}
@@ -112,13 +116,15 @@ public class DrillCursor implements Cursor{
}
}
- void updateColumns(){
+ void updateColumns() {
accessors.generateAccessors(this, currentBatch);
columnMetaDataList.updateColumnMetaData(UNKNOWN, UNKNOWN, UNKNOWN, schema);
- if(results.changeListener != null) results.changeListener.schemaChanged(schema);
+ if (results.changeListener != null) {
+ results.changeListener.schemaChanged(schema);
+ }
}
- public long getRecordBatchCount(){
+ public long getRecordBatchCount() {
return recordBatchCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java
index bde0d3f..90d183f 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java
@@ -68,8 +68,8 @@ public class DrillResultSet extends AvaticaResultSet {
close();
}
- synchronized void cleanup(){
- if (queryId != null && !listener.completed){
+ synchronized void cleanup() {
+ if (queryId != null && !listener.completed) {
client.cancelQuery(queryId);
}
listener.close();
@@ -108,8 +108,8 @@ public class DrillResultSet extends AvaticaResultSet {
final LinkedBlockingDeque<QueryResultBatch> queue = Queues.newLinkedBlockingDeque();
- private boolean releaseIfFirst(){
- if(receivedMessage.compareAndSet(false, true)){
+ private boolean releaseIfFirst() {
+ if (receivedMessage.compareAndSet(false, true)) {
latch.countDown();
return true;
}
@@ -164,8 +164,9 @@ public class DrillResultSet extends AvaticaResultSet {
public QueryResultBatch getNext() throws RpcException, InterruptedException {
while (true) {
- if (ex != null)
+ if (ex != null) {
throw ex;
+ }
if (completed && queue.isEmpty()) {
return null;
} else {
@@ -178,9 +179,7 @@ public class DrillResultSet extends AvaticaResultSet {
}
return q;
}
-
}
-
}
}
@@ -188,7 +187,9 @@ public class DrillResultSet extends AvaticaResultSet {
closed = true;
while (!queue.isEmpty()) {
QueryResultBatch qrb = queue.poll();
- if(qrb != null && qrb.getData() != null) qrb.getData().release();
+ if (qrb != null && qrb.getData() != null) {
+ qrb.getData().release();
+ }
}
completed = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/main/java/org/apache/drill/jdbc/MetaImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/MetaImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/MetaImpl.java
index 86cdefe..904c078 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/MetaImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/MetaImpl.java
@@ -67,14 +67,14 @@ public class MetaImpl implements Meta {
return null;
}
- private ResultSet s(String s){
- try{
+ private ResultSet s(String s) {
+ try {
logger.debug("Running {}", s);
AvaticaStatement statement = connection.createStatement();
statement.execute(s);
return statement.getResultSet();
- }catch(Exception e){
+ } catch (Exception e) {
throw new DrillRuntimeException("Failure while attempting to get DatabaseMetadata.", e);
}
@@ -96,22 +96,24 @@ public class MetaImpl implements Meta {
+ "'' as REF_GENERATION "
+ "FROM INFORMATION_SCHEMA.`TABLES` WHERE 1=1 ");
- if(catalog != null){
+ if (catalog != null) {
sb.append(" AND TABLE_CATALOG = '" + StringEscapeUtils.escapeSql(catalog) + "' ");
}
- if(schemaPattern.s != null){
+ if (schemaPattern.s != null) {
sb.append(" AND TABLE_SCHEMA like '" + StringEscapeUtils.escapeSql(schemaPattern.s) + "'");
}
- if(tableNamePattern.s != null){
+ if (tableNamePattern.s != null) {
sb.append(" AND TABLE_NAME like '" + StringEscapeUtils.escapeSql(tableNamePattern.s) + "'");
}
- if(typeList != null && typeList.size() > 0){
+ if (typeList != null && typeList.size() > 0) {
sb.append("AND (");
- for(int t = 0; t < typeList.size(); t++){
- if(t != 0) sb.append(" OR ");
+ for (int t = 0; t < typeList.size(); t++) {
+ if (t != 0) {
+ sb.append(" OR ");
+ }
sb.append(" TABLE_TYPE LIKE '" + StringEscapeUtils.escapeSql(typeList.get(t)) + "' ");
}
sb.append(")");
@@ -152,18 +154,18 @@ public class MetaImpl implements Meta {
+ "FROM INFORMATION_SCHEMA.COLUMNS "
+ "WHERE 1=1 ");
- if(catalog != null){
+ if (catalog != null) {
sb.append(" AND TABLE_CATALOG = '" + StringEscapeUtils.escapeSql(catalog) + "' ");
}
- if(schemaPattern.s != null){
+ if (schemaPattern.s != null) {
sb.append(" AND TABLE_SCHEMA like '" + StringEscapeUtils.escapeSql(schemaPattern.s) + "'");
}
- if(tableNamePattern.s != null){
+ if (tableNamePattern.s != null) {
sb.append(" AND TABLE_NAME like '" + StringEscapeUtils.escapeSql(tableNamePattern.s) + "'");
}
- if(columnNamePattern.s != null){
+ if (columnNamePattern.s != null) {
sb.append(" AND COLUMN_NAME like '" + StringEscapeUtils.escapeSql(columnNamePattern.s) + "'");
}
@@ -179,10 +181,10 @@ public class MetaImpl implements Meta {
+ "CATALOG_NAME as TABLE_CAT "
+ " FROM INFORMATION_SCHEMA.SCHEMATA WHERE 1=1 ");
- if(catalog != null){
+ if (catalog != null) {
sb.append(" AND CATALOG_NAME = '" + StringEscapeUtils.escapeSql(catalog) + "' ");
}
- if(schemaPattern.s != null){
+ if (schemaPattern.s != null) {
sb.append(" AND SCHEMA_NAME like '" + StringEscapeUtils.escapeSql(schemaPattern.s) + "'");
}
sb.append(" ORDER BY CATALOG_NAME, SCHEMA_NAME");
@@ -300,4 +302,4 @@ public class MetaImpl implements Meta {
String getName();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java
index 5c0a2e3..15fe219 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java
@@ -95,8 +95,9 @@ public class JdbcTestActionBase extends JdbcTest {
System.out.println(String.format("Query completed in %d millis.", watch.elapsed(TimeUnit.MILLISECONDS)));
- if (rowcount != -1)
+ if (rowcount != -1) {
Assert.assertEquals((long) rowcount, (long) rows);
+ }
System.out.println("\n\n\n");
@@ -133,4 +134,5 @@ public class JdbcTestActionBase extends JdbcTest {
}
}
};
+
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java
index 2dba402..4528cee 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java
@@ -76,8 +76,10 @@ public class JdbcTestQueryBase extends JdbcTest {
System.out.println("\n\n\n");
success = true;
- }finally{
- if(!success) Thread.sleep(2000);
+ } finally {
+ if (!success) {
+ Thread.sleep(2000);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java
index 58b3615..0b5e6fc 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java
@@ -197,7 +197,7 @@ public class TestJdbcDistQuery extends JdbcTest{
System.out.println();
first = false;
}
- while(r.next()){
+ while (r.next()) {
md = r.getMetaData();
for (int i = 1; i <= md.getColumnCount(); i++) {
@@ -212,11 +212,11 @@ public class TestJdbcDistQuery extends JdbcTest{
System.out.println("\n\n\n");
success = true;
- }finally{
- if(!success) Thread.sleep(2000);
+ } finally {
+ if (!success) {
+ Thread.sleep(2000);
+ }
}
-
-
}
@Test