http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java index 6d6baf4..01f244a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java @@ -38,22 +38,24 @@ import org.apache.hadoop.fs.Seekable; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.util.Progressable; -public class CachedSingleFileSystem extends FileSystem{ +public class CachedSingleFileSystem extends FileSystem { private ByteBuf file; private String path; - public CachedSingleFileSystem(String path) throws IOException{ + public CachedSingleFileSystem(String path) throws IOException { this.path = path; File f = new File(path); long length = f.length(); - if(length > Integer.MAX_VALUE) throw new UnsupportedOperationException("Cached file system only supports files of less than 2GB."); + if (length > Integer.MAX_VALUE) { + throw new UnsupportedOperationException("Cached file system only supports files of less than 2GB."); + } System.out.println(length); - try(InputStream is = new BufferedInputStream(new FileInputStream(path))){ + try (InputStream is = new BufferedInputStream(new FileInputStream(path))) { byte[] buffer = new byte[64*1024]; this.file = UnpooledByteBufAllocator.DEFAULT.directBuffer((int) length); int read; - while( (read = is.read(buffer)) > 0){ + while ( (read = is.read(buffer)) > 0) { file.writeBytes(buffer, 0, read); } } @@ -113,7 +115,9 @@ public class CachedSingleFileSystem extends FileSystem{ @Override public FSDataInputStream open(Path path, int arg1) throws IOException { - if(!path.toString().equals(this.path)) throw new IOException(String.format("You requested file %s but this cached single file system only has the file %s.", path.toString(), this.path)); + if (!path.toString().equals(this.path)) { + throw new IOException(String.format("You requested file %s but this cached single file system only has the file %s.", path.toString(), this.path)); + } return new FSDataInputStream(new CachedFSDataInputStream(file.slice())); } @@ -165,8 +169,11 @@ public class CachedSingleFileSystem extends FileSystem{ @Override public void readFully(long pos, byte[] buffer, int offset, int length) throws IOException { - if(length + pos > buf.capacity()) throw new IOException("Read was too big."); + if (length + pos > buf.capacity()) { + throw new IOException("Read was too big."); + } read(pos, buffer, offset, length); } } -} \ No newline at end of file + +}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java index b40edd1..15bae6e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java @@ -41,14 +41,15 @@ public class TestOutputMutator implements OutputMutator, Iterable<VectorWrapper< private final Map<MaterializedField, ValueVector> fieldVectorMap = Maps.newHashMap(); private final BufferAllocator allocator; - public TestOutputMutator(BufferAllocator allocator){ + public TestOutputMutator(BufferAllocator allocator) { this.allocator = allocator; } public void removeField(MaterializedField field) throws SchemaChangeException { ValueVector vector = fieldVectorMap.remove(field); - if (vector == null) + if (vector == null) { throw new SchemaChangeException("Failure attempting to remove an unknown field."); + } container.remove(vector); vector.close(); } @@ -66,7 +67,7 @@ public class TestOutputMutator implements OutputMutator, Iterable<VectorWrapper< return container.iterator(); } - public void clear(){ + public void clear() { } @@ -83,7 +84,9 @@ public class TestOutputMutator implements OutputMutator, Iterable<VectorWrapper< @Override public <T extends ValueVector> T addField(MaterializedField field, Class<T> clazz) throws SchemaChangeException { ValueVector v = TypeHelper.getNewVector(field, allocator); - if(!clazz.isAssignableFrom(v.getClass())) throw new SchemaChangeException(String.format("The class that was provided %s does not correspond to the expected vector type of %s.", clazz.getSimpleName(), v.getClass().getSimpleName())); + if (!clazz.isAssignableFrom(v.getClass())) { + throw new SchemaChangeException(String.format("The class that was provided %s does not correspond to the expected vector type of %s.", clazz.getSimpleName(), v.getClass().getSimpleName())); + } addField(v); return (T) v; } @@ -92,4 +95,5 @@ public class TestOutputMutator implements OutputMutator, Iterable<VectorWrapper< public DrillBuf getManagedBuffer() { return allocator.buffer(255); } + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java index b2c8596..da8abdd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java @@ -97,7 +97,9 @@ public class ParquetRecordReaderTest extends BaseTestQuery{ File f = new File(fileName); ParquetTestProperties props = new ParquetTestProperties(numberRowGroups, recordsPerRowGroup, DEFAULT_BYTES_PER_PAGE, new HashMap<String, FieldInfo>()); populateFieldInfoMap(props); - if(!f.exists()) TestFileGenerator.generateParquetFile(fileName, props); + if (!f.exists()) { + TestFileGenerator.generateParquetFile(fileName, props); + } } @@ -118,10 +120,11 @@ public class ParquetRecordReaderTest extends BaseTestQuery{ readEntries = ""; // number of times to read the file int i = 3; - for (int j = 0; j < i; j++){ + for (int j = 0; j < i; j++) { readEntries += "\""+fileName+"\""; - if (j < i - 1) + if (j < i - 1) { readEntries += ","; + } } String planText = Files.toString(FileUtils.getResourceAsFile("/parquet/parquet_scan_screen_read_entry_replace.json"), Charsets.UTF_8).replaceFirst( "&REPLACED_IN_PARQUET_TEST&", readEntries); testParquetFullEngineLocalText(planText, fileName, i, numberRowGroups, recordsPerRowGroup, true); @@ -475,10 +478,11 @@ public class ParquetRecordReaderTest extends BaseTestQuery{ String readEntries = ""; // number of times to read the file int i = 3; - for (int j = 0; j < i; j++){ + for (int j = 0; j < i; j++) { readEntries += "\"/tmp/test.parquet\""; - if (j < i - 1) + if (j < i - 1) { readEntries += ","; + } } testParquetFullEngineEventBased(true, "/parquet/parquet_scan_screen_read_entry_replace.json", readEntries, "/tmp/test.parquet", i, props); @@ -626,7 +630,7 @@ public class ParquetRecordReaderTest extends BaseTestQuery{ FileSystem fs = new CachedSingleFileSystem(fileName); BufferAllocator allocator = new TopLevelAllocator(); - for(int i = 0; i < 25; i++){ + for(int i = 0; i < 25; i++) { ParquetRecordReader rr = new ParquetRecordReader(context, 256000, fileName, 0, fs, new CodecFactoryExposer(dfsConfig), f.getParquetMetadata(), columns); TestOutputMutator mutator = new TestOutputMutator(allocator); @@ -663,7 +667,9 @@ public class ParquetRecordReaderTest extends BaseTestQuery{ public void testParquetFullEngineEventBased(boolean testValues, boolean generateNew, String plan, String readEntries, String filename, int numberOfTimesRead /* specified in json plan */, ParquetTestProperties props, QueryType queryType) throws Exception{ - if (generateNew) TestFileGenerator.generateParquetFile(filename, props); + if (generateNew) { + TestFileGenerator.generateParquetFile(filename, props); + } ParquetResultListener resultListener = new ParquetResultListener(getAllocator(), props, numberOfTimesRead, testValues); long C = System.nanoTime(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java index 0dfb1d8..013ea95 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java @@ -61,7 +61,7 @@ public class TestFileGenerator { // TODO - figure out what this should be set at, it should be based on the max nesting level public static final int MAX_EXPECTED_BIT_WIDTH_FOR_DEFINITION_LEVELS = 16; - static void populateDrill_418_fields(ParquetTestProperties props){ + static void populateDrill_418_fields(ParquetTestProperties props) { props.fields.put("cust_key", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); props.fields.put("nation_key", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); @@ -73,7 +73,7 @@ public class TestFileGenerator { props.fields.put("comment_col", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); } - static void populateFieldInfoMap(ParquetTestProperties props){ + static void populateFieldInfoMap(ParquetTestProperties props) { props.fields.put("integer", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); props.fields.put("bigInt", new FieldInfo("int64", "bigInt", 64, longVals, TypeProtos.MinorType.BIGINT, props)); props.fields.put("f", new FieldInfo("float", "f", 32, floatVals, TypeProtos.MinorType.FLOAT4, props)); @@ -83,7 +83,7 @@ public class TestFileGenerator { props.fields.put("bin2", new FieldInfo("binary", "bin2", -1, bin2Vals, TypeProtos.MinorType.VARBINARY, props)); } - static void populatePigTPCHCustomerFields(ParquetTestProperties props){ + static void populatePigTPCHCustomerFields(ParquetTestProperties props) { // all of the data in the fieldInfo constructors doesn't matter because the file is generated outside the test props.fields.put("C_CUSTKEY", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); props.fields.put("C_NATIONKEY", new FieldInfo("int64", "bigInt", 64, longVals, TypeProtos.MinorType.BIGINT, props)); @@ -95,7 +95,7 @@ public class TestFileGenerator { props.fields.put("C_COMMENT", new FieldInfo("binary", "bin2", -1, bin2Vals, TypeProtos.MinorType.VARBINARY, props)); } - static void populatePigTPCHSupplierFields(ParquetTestProperties props){ + static void populatePigTPCHSupplierFields(ParquetTestProperties props) { // all of the data in the fieldInfo constructors doesn't matter because the file is generated outside the test props.fields.put("S_SUPPKEY", new FieldInfo("int32", "integer", 32, intVals, TypeProtos.MinorType.INT, props)); props.fields.put("S_NATIONKEY", new FieldInfo("int64", "bigInt", 64, longVals, TypeProtos.MinorType.BIGINT, props)); @@ -146,7 +146,9 @@ public class TestFileGenerator { FileSystem fs = FileSystem.get(configuration); Path path = new Path(filename); - if (fs.exists(path)) fs.delete(path, false); + if (fs.exists(path)) { + fs.delete(path, false); + } String messageSchema = "message m {"; @@ -165,14 +167,14 @@ public class TestFileGenerator { w.start(); HashMap<String, Integer> columnValuesWritten = new HashMap(); int valsWritten; - for (int k = 0; k < props.numberRowGroups; k++){ + for (int k = 0; k < props.numberRowGroups; k++) { w.startBlock(props.recordsPerRowGroup); currentBooleanByte = 0; booleanBitCounter.reset(); for (FieldInfo fieldInfo : props.fields.values()) { - if ( ! columnValuesWritten.containsKey(fieldInfo.name)){ + if ( ! columnValuesWritten.containsKey(fieldInfo.name)) { columnValuesWritten.put((String) fieldInfo.name, 0); valsWritten = 0; } else { @@ -202,8 +204,12 @@ public class TestFileGenerator { int totalValLength = ((byte[]) fieldInfo.values[0]).length + ((byte[]) fieldInfo.values[1]).length + ((byte[]) fieldInfo.values[2]).length + 3 * bytesNeededToEncodeLength; // used for the case where there is a number of values in this row group that is not divisible by 3 int leftOverBytes = 0; - if ( valsPerPage % 3 > 0 ) leftOverBytes += ((byte[])fieldInfo.values[1]).length + bytesNeededToEncodeLength; - if ( valsPerPage % 3 > 1 ) leftOverBytes += ((byte[])fieldInfo.values[2]).length + bytesNeededToEncodeLength; + if ( valsPerPage % 3 > 0 ) { + leftOverBytes += ((byte[])fieldInfo.values[1]).length + bytesNeededToEncodeLength; + } + if ( valsPerPage % 3 > 1 ) { + leftOverBytes += ((byte[])fieldInfo.values[2]).length + bytesNeededToEncodeLength; + } bytes = new byte[valsPerPage / 3 * totalValLength + leftOverBytes]; } int bytesPerPage = (int) (valsPerPage * ((int) fieldInfo.bitLength / 8.0)); @@ -222,9 +228,11 @@ public class TestFileGenerator { currentBooleanByte++; } valsWritten++; - if (currentBooleanByte > bytesPerPage) break; + if (currentBooleanByte > bytesPerPage) { + break; + } } else { - if (fieldInfo.values[valsWritten % 3] instanceof byte[]){ + if (fieldInfo.values[valsWritten % 3] instanceof byte[]) { System.arraycopy(ByteArrayUtil.toByta(((byte[])fieldInfo.values[valsWritten % 3]).length), 0, bytes, bytesWritten, bytesNeededToEncodeLength); System.arraycopy(fieldInfo.values[valsWritten % 3], http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java index 8491312..6cb412c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java @@ -53,7 +53,7 @@ public class TestParquetPhysicalPlan extends ExecTest { RemoteServiceSet serviceSet = RemoteServiceSet.getLocalServiceSet(); DrillConfig config = DrillConfig.create(); - try(Drillbit bit1 = new Drillbit(config, serviceSet); DrillClient client = new DrillClient(config, serviceSet.getCoordinator());){ + try (Drillbit bit1 = new Drillbit(config, serviceSet); DrillClient client = new DrillClient(config, serviceSet.getCoordinator());) { bit1.run(); client.connect(); List<QueryResultBatch> results = client.runQuery(org.apache.drill.exec.proto.UserBitShared.QueryType.PHYSICAL, Resources.toString(Resources.getResource(fileName),Charsets.UTF_8)); @@ -88,6 +88,7 @@ public class TestParquetPhysicalPlan extends ExecTest { private class ParquetResultsListener implements UserResultsListener { AtomicInteger count = new AtomicInteger(); private CountDownLatch latch = new CountDownLatch(1); + @Override public void submissionFailed(RpcException ex) { logger.error("submission failed", ex); @@ -99,7 +100,9 @@ public class TestParquetPhysicalPlan extends ExecTest { int rows = result.getHeader().getRowCount(); System.out.println(String.format("Result batch arrived. Number of records: %d", rows)); count.addAndGet(rows); - if (result.getHeader().getIsLastChunk()) latch.countDown(); + if (result.getHeader().getIsLastChunk()) { + latch.countDown(); + } result.release(); } @@ -112,12 +115,13 @@ public class TestParquetPhysicalPlan extends ExecTest { public void queryIdArrived(QueryId queryId) { } } + @Test @Ignore public void testParseParquetPhysicalPlanRemote() throws Exception { DrillConfig config = DrillConfig.create(); - try(DrillClient client = new DrillClient(config);){ + try(DrillClient client = new DrillClient(config);) { client.connect(); ParquetResultsListener listener = new ParquetResultsListener(); Stopwatch watch = new Stopwatch(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java index 7e9dbbd..a502c32 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java @@ -127,8 +127,9 @@ public class MiniZooKeeperCluster { */ public int startup(File baseDir, int numZooKeeperServers) throws IOException, InterruptedException { - if (numZooKeeperServers <= 0) + if (numZooKeeperServers <= 0) { return -1; + } setupTestEnv(); shutdown(); @@ -368,4 +369,5 @@ public class MiniZooKeeperCluster { public int getClientPort() { return clientPort; } + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java index c92495f..9e13ae4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java @@ -62,12 +62,12 @@ public class TestJsonReader extends BaseTestQuery { private static final boolean VERBOSE_DEBUG = true; @BeforeClass - public static void setupAllocator(){ + public static void setupAllocator() { allocator = new TopLevelAllocator(); } @AfterClass - public static void destroyAllocator(){ + public static void destroyAllocator() { allocator.close(); } @@ -254,7 +254,9 @@ public class TestJsonReader extends BaseTestQuery { "}\n }"; String compound = simple; - for(int i =0; i < repeatSize; i++) compound += simple; + for (int i =0; i < repeatSize; i++) { + compound += simple; + } // simple = "{ \"integer\" : 2001, \n" + // " \"float\" : 1.2\n" + @@ -272,9 +274,9 @@ public class TestJsonReader extends BaseTestQuery { int i =0; List<Integer> batchSizes = Lists.newArrayList(); - outside: while(true){ + outside: while(true) { writer.setPosition(i); - switch(jsonReader.write(writer)){ + switch (jsonReader.write(writer)) { case WRITE_SUCCEED: i++; break; @@ -291,7 +293,7 @@ public class TestJsonReader extends BaseTestQuery { writer.allocate(); writer.reset(); - switch(jsonReader.write(writer)){ + switch(jsonReader.write(writer)) { case NO_MORE: System.out.println("no more records - new alloc loop."); break outside; @@ -306,7 +308,7 @@ public class TestJsonReader extends BaseTestQuery { int total = 0; int lastRecordCount = 0; - for(Integer records : batchSizes){ + for (Integer records : batchSizes) { total += records; lastRecordCount = records; } @@ -340,4 +342,5 @@ public class TestJsonReader extends BaseTestQuery { writer.clear(); buffer.release(); } + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java index b01b3e0..b3c653f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java @@ -51,8 +51,9 @@ public class TestSpoolingBuffer extends ExecTest { Charsets.UTF_8)); int count = 0; for(QueryResultBatch b : results) { - if (b.getHeader().getRowCount() != 0) + if (b.getHeader().getRowCount() != 0) { count += b.getHeader().getRowCount(); + } b.release(); } assertEquals(500024, count); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/hashagg/q6.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/hashagg/q6.json b/exec/java-exec/src/test/resources/agg/hashagg/q6.json index 10f4cba..c155391 100644 --- a/exec/java-exec/src/test/resources/agg/hashagg/q6.json +++ b/exec/java-exec/src/test/resources/agg/hashagg/q6.json @@ -42,7 +42,7 @@ exprs : [ { ref : "SUM", expr : "sum($f1) " - }, { + }, { ref : "MIN", expr : "min($f1) " }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/hashagg/q7_1.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/hashagg/q7_1.json b/exec/java-exec/src/test/resources/agg/hashagg/q7_1.json index 256bec6..ef05613 100644 --- a/exec/java-exec/src/test/resources/agg/hashagg/q7_1.json +++ b/exec/java-exec/src/test/resources/agg/hashagg/q7_1.json @@ -42,7 +42,7 @@ ref : "$f0", expr : "$f0" }, { - ref : "$f2", + ref : "$f2", expr : "$f2" } ], exprs : [ { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/hashagg/q7_2.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/hashagg/q7_2.json b/exec/java-exec/src/test/resources/agg/hashagg/q7_2.json index d444fc8..62cf5c3 100644 --- a/exec/java-exec/src/test/resources/agg/hashagg/q7_2.json +++ b/exec/java-exec/src/test/resources/agg/hashagg/q7_2.json @@ -42,7 +42,7 @@ ref : "$f0", expr : "$f0" }, { - ref : "$f1", + ref : "$f1", expr : "$f1" } ], exprs : [ { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/hashagg/q7_3.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/hashagg/q7_3.json b/exec/java-exec/src/test/resources/agg/hashagg/q7_3.json index 6c5fff0..8edc110 100644 --- a/exec/java-exec/src/test/resources/agg/hashagg/q7_3.json +++ b/exec/java-exec/src/test/resources/agg/hashagg/q7_3.json @@ -42,7 +42,7 @@ ref : "$f0", expr : "$f0" }, { - ref : "$f1", + ref : "$f1", expr : "$f1" }, { ref : "$f2", http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/hashagg/q8_1.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/hashagg/q8_1.json b/exec/java-exec/src/test/resources/agg/hashagg/q8_1.json index adc5e75..3461c8c 100644 --- a/exec/java-exec/src/test/resources/agg/hashagg/q8_1.json +++ b/exec/java-exec/src/test/resources/agg/hashagg/q8_1.json @@ -65,8 +65,8 @@ child: 5, first: 0, last: 100 - }, { - pop : "screen", + }, { + pop : "screen", @id : 7, child : 6 } ] http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/agg/test1.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/test1.json b/exec/java-exec/src/test/resources/agg/test1.json index eb4647d..12dab5f 100644 --- a/exec/java-exec/src/test/resources/agg/test1.json +++ b/exec/java-exec/src/test/resources/agg/test1.json @@ -6,16 +6,16 @@ type:"manual" } }, - graph:[ + graph:[ { @id:1, pop:"mock-sub-scan", entries:[ - {records: 20000, types: [ - {name: "blue", type: "INT", mode: "REQUIRED"}, - {name: "red", type: "BIGINT", mode: "REQUIRED"}, - {name: "green", type: "INT", mode: "REQUIRED"} - ]} + {records: 20000, types: [ + {name: "blue", type: "INT", mode: "REQUIRED"}, + {name: "red", type: "BIGINT", mode: "REQUIRED"}, + {name: "green", type: "INT", mode: "REQUIRED"} + ]} ] }, { @@ -30,7 +30,7 @@ @id:3, child: 2, pop:"streaming-aggregate", - keys: [ + keys: [ { ref: "blue", expr: "blue" } ], exprs: [ @@ -43,4 +43,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/agg/twokey.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/twokey.json b/exec/java-exec/src/test/resources/agg/twokey.json index a237279..5e33c58 100644 --- a/exec/java-exec/src/test/resources/agg/twokey.json +++ b/exec/java-exec/src/test/resources/agg/twokey.json @@ -6,16 +6,16 @@ type:"manual" } }, - graph:[ + graph:[ { @id:1, pop:"mock-sub-scan", entries:[ - {records: 204, types: [ - {name: "blue", type: "INT", mode: "REQUIRED"}, - {name: "red", type: "BIGINT", mode: "REQUIRED"}, - {name: "green", type: "INT", mode: "REQUIRED"} - ]} + {records: 204, types: [ + {name: "blue", type: "INT", mode: "REQUIRED"}, + {name: "red", type: "BIGINT", mode: "REQUIRED"}, + {name: "green", type: "INT", mode: "REQUIRED"} + ]} ] }, { @@ -40,10 +40,10 @@ @id:4, child: 3, pop:"streaming-aggregate", - keys: [ + keys: [ { ref: "key1", expr: "key1" }, { ref: "key2", expr: "alt" } - + ], exprs: [ { ref: "cnt", expr:"count(1)" }, @@ -56,4 +56,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/donuts.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/donuts.json b/exec/java-exec/src/test/resources/donuts.json index 276bcbe..a5ed4da 100644 --- a/exec/java-exec/src/test/resources/donuts.json +++ b/exec/java-exec/src/test/resources/donuts.json @@ -1,132 +1,131 @@ { - "id": "0001", - "type": "donut", - "name": "Cake", - "ppu": 0.55, - "sales": 35, - - - "batters": - { - "batter": - [ - { "id": "1001", "type": "Regular" }, - { "id": "1002", "type": "Chocolate" }, - { "id": "1003", "type": "Blueberry" }, - { "id": "1004", "type": "Devil's Food" } - ] - }, - "topping": - [ - { "id": "5001", "type": "None" }, - { "id": "5002", "type": "Glazed" }, - { "id": "5005", "type": "Sugar" }, - { "id": "5007", "type": "Powdered Sugar" }, - { "id": "5006", "type": "Chocolate with Sprinkles" }, - { "id": "5003", "type": "Chocolate" }, - { "id": "5004", "type": "Maple" } - ] - } - { - "id": "0002", - "type": "donut", - "name": "Raised", - "ppu": 0.69, - "sales": 145, - "batters": - { - "batter": - [ - { "id": "1001", "type": "Regular" } - ] - }, - "topping": - [ - { "id": "5001", "type": "None" }, - { "id": "5002", "type": "Glazed" }, - { "id": "5005", "type": "Sugar" }, - { "id": "5003", "type": "Chocolate" }, - { "id": "5004", "type": "Maple" } - ] - } - { - "id": "0003", - "type": "donut", - "name": "Old Fashioned", - "ppu": 0.55, - "sales": 300, + "id": "0001", + "type": "donut", + "name": "Cake", + "ppu": 0.55, + "sales": 35, + "batters": + { + "batter": + [ + { "id": "1001", "type": "Regular" }, + { "id": "1002", "type": "Chocolate" }, + { "id": "1003", "type": "Blueberry" }, + { "id": "1004", "type": "Devil's Food" } + ] + }, + "topping": + [ + { "id": "5001", "type": "None" }, + { "id": "5002", "type": "Glazed" }, + { "id": "5005", "type": "Sugar" }, + { "id": "5007", "type": "Powdered Sugar" }, + { "id": "5006", "type": "Chocolate with Sprinkles" }, + { "id": "5003", "type": "Chocolate" }, + { "id": "5004", "type": "Maple" } + ] +} +{ + "id": "0002", + "type": "donut", + "name": "Raised", + "ppu": 0.69, + "sales": 145, + "batters": + { + "batter": + [ + { "id": "1001", "type": "Regular" } + ] + }, + "topping": + [ + { "id": "5001", "type": "None" }, + { "id": "5002", "type": "Glazed" }, + { "id": "5005", "type": "Sugar" }, + { "id": "5003", "type": "Chocolate" }, + { "id": "5004", "type": "Maple" } + ] +} +{ + "id": "0003", + "type": "donut", + "name": "Old Fashioned", + "ppu": 0.55, + "sales": 300, - "batters": - { - "batter": - [ - { "id": "1001", "type": "Regular" }, - { "id": "1002", "type": "Chocolate" } - ] - }, - "topping": - [ - { "id": "5001", "type": "None" }, - { "id": "5002", "type": "Glazed" }, - { "id": "5003", "type": "Chocolate" }, - { "id": "5004", "type": "Maple" } - ] - } - { - "id": "0004", - "type": "donut", - "name": "Filled", - "ppu": 0.69, - "sales": 14, + "batters": + { + "batter": + [ + { "id": "1001", "type": "Regular" }, + { "id": "1002", "type": "Chocolate" } + ] + }, + "topping": + [ + { "id": "5001", "type": "None" }, + { "id": "5002", "type": "Glazed" }, + { "id": "5003", "type": "Chocolate" }, + { "id": "5004", "type": "Maple" } + ] +} +{ + "id": "0004", + "type": "donut", + "name": "Filled", + "ppu": 0.69, + "sales": 14, - "batters": - { - "batter": - [ - { "id": "1001", "type": "Regular" }, - { "id": "1002", "type": "Chocolate" }, - { "id": "1003", "type": "Blueberry" }, - { "id": "1004", "type": "Devil's Food" } - ] - }, - "topping": - [ - { "id": "5001", "type": "None" }, - { "id": "5002", "type": "Glazed" }, - { "id": "5005", "type": "Sugar" }, - { "id": "5007", "type": "Powdered Sugar" }, - { "id": "5006", "type": "Chocolate with Sprinkles" }, - { "id": "5003", "type": "Chocolate" }, - { "id": "5004", "type": "Maple" } - ], - "filling": - [ - { "id": "6001", "type": "None" }, - { "id": "6002", "type": "Raspberry" }, - { "id": "6003", "type": "Lemon" }, - { "id": "6004", "type": "Chocolate" }, - { "id": "6005", "type": "Kreme" } - ] - } - { - "id": "0005", - "type": "donut", - "name": "Apple Fritter", - "ppu": 1.00, - "sales": 700, + "batters": + { + "batter": + [ + { "id": "1001", "type": "Regular" }, + { "id": "1002", "type": "Chocolate" }, + { "id": "1003", "type": "Blueberry" }, + { "id": "1004", "type": "Devil's Food" } + ] + }, + "topping": + [ + { "id": "5001", "type": "None" }, + { "id": "5002", "type": "Glazed" }, + { "id": "5005", "type": "Sugar" }, + { "id": "5007", "type": "Powdered Sugar" }, + { "id": "5006", "type": "Chocolate with Sprinkles" }, + { "id": "5003", "type": "Chocolate" }, + { "id": "5004", "type": "Maple" } + ], + "filling": + [ + { "id": "6001", "type": "None" }, + { "id": "6002", "type": "Raspberry" }, + { "id": "6003", "type": "Lemon" }, + { "id": "6004", "type": "Chocolate" }, + { "id": "6005", "type": "Kreme" } + ] +} +{ + "id": "0005", + "type": "donut", + "name": "Apple Fritter", + "ppu": 1.00, + "sales": 700, - "batters": - { - "batter": - [ - { "id": "1001", "type": "Regular" } - ] - }, - "topping": - [ - { "id": "5002", "type": "Glazed" } - ] - } \ No newline at end of file + "batters": + { + "batter": + [ + { "id": "1001", "type": "Regular" } + ] + }, + "topping": + [ + { "id": "5002", "type": "Glazed" } + ] +} + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/drill-module.conf ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/drill-module.conf b/exec/java-exec/src/test/resources/drill-module.conf index 65e4d4c..7f0587a 100644 --- a/exec/java-exec/src/test/resources/drill-module.conf +++ b/exec/java-exec/src/test/resources/drill-module.conf @@ -26,7 +26,7 @@ drill.exec: { threads: 1 } }, - use.ip : false + use.ip : false }, operator: { packages += "org.apache.drill.exec.physical.config" @@ -42,14 +42,14 @@ drill.exec: { context: "drillbit" }, zk: { - connect: "localhost:2181", - root: "drill/happy", - refresh: 500, - timeout: 5000, - retry: { - count: 7200, - delay: 500 - } + connect: "localhost:2181", + root: "drill/happy", + refresh: 500, + timeout: 5000, + retry: { + count: 7200, + delay: 500 + } }, functions: ["org.apache.drill.expr.fn.impl"], network: { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/drill-spool-test-module.conf ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/drill-spool-test-module.conf b/exec/java-exec/src/test/resources/drill-spool-test-module.conf index c20cc85..89d248a 100644 --- a/exec/java-exec/src/test/resources/drill-spool-test-module.conf +++ b/exec/java-exec/src/test/resources/drill-spool-test-module.conf @@ -1,5 +1,5 @@ -// This file tells Drill to consider this module when class path scanning. -// This file can also include any supplementary configuration information. +// This file tells Drill to consider this module when class path scanning. +// This file can also include any supplementary configuration information. // This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information. drill.logical.function.packages += "org.apache.drill.exec.expr.fn.impl" @@ -26,7 +26,7 @@ drill.exec: { threads: 1 } }, - use.ip : false + use.ip : false }, operator: { packages += "org.apache.drill.exec.physical.config" @@ -36,9 +36,9 @@ drill.exec: { }, functions: ["org.apache.drill.expr.fn.impl"], storage: { - packages += "org.apache.drill.exec.store" + packages += "org.apache.drill.exec.store" }, - metrics : { + metrics : { context: "drillbit", jmx: { enabled : true @@ -49,14 +49,14 @@ drill.exec: { } }, zk: { - connect: "localhost:2181", - root: "/drill", - refresh: 500, - timeout: 5000, - retry: { - count: 7200, - delay: 500 - } + connect: "localhost:2181", + root: "/drill", + refresh: 500, + timeout: 5000, + retry: { + count: 7200, + delay: 500 + } }, functions: ["org.apache.drill.expr.fn.impl"], network: { @@ -80,4 +80,4 @@ drill.exec: { delete: false, size: 0 } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/filter/test1.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/filter/test1.json b/exec/java-exec/src/test/resources/filter/test1.json index 7d05928..43c934f 100644 --- a/exec/java-exec/src/test/resources/filter/test1.json +++ b/exec/java-exec/src/test/resources/filter/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"} + ]} ] }, { @@ -29,7 +29,7 @@ @id:4, child:2, pop: "selection-vector-remover" - + }, { @id: 3, @@ -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/filter/test_sv4.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/filter/test_sv4.json b/exec/java-exec/src/test/resources/filter/test_sv4.json index 685e315..69437ac 100644 --- a/exec/java-exec/src/test/resources/filter/test_sv4.json +++ b/exec/java-exec/src/test/resources/filter/test_sv4.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"} + ]} ] }, { @@ -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/functions/cast/testCastBigInt.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastBigInt.json b/exec/java-exec/src/test/resources/functions/cast/testCastBigInt.json index c0a1565..e070900 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastBigInt.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastBigInt.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,13 +25,13 @@ child: 1, pop:"project", exprs: [ - { ref: "float4col", expr:"float4col" }, - { ref: "float4_cast", expr:"cast(float4col as bigint)" }, - { ref: "float8col", expr:"float8col" }, - { ref: "float8_cast", expr:"cast(float8col as bigint)" }, - { ref: "intcol", expr:"intcol" }, - { ref: "int_cast", expr:"cast(intcol as bigint)" }, - { ref: "varchar_cast", expr:"cast('1256' as bigint)" } + { ref: "float4col", expr:"float4col" }, + { ref: "float4_cast", expr:"cast(float4col as bigint)" }, + { ref: "float8col", expr:"float8col" }, + { ref: "float8_cast", expr:"cast(float8col as bigint)" }, + { ref: "intcol", expr:"intcol" }, + { ref: "int_cast", expr:"cast(intcol as bigint)" }, + { ref: "varchar_cast", expr:"cast('1256' as bigint)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastFloat4.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastFloat4.json b/exec/java-exec/src/test/resources/functions/cast/testCastFloat4.json index f5f6e2c..8fe0131 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastFloat4.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastFloat4.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,14 +25,14 @@ child: 1, pop:"project", exprs: [ - { ref: "float8col", expr:"float8col" }, - { ref: "float8_cast", expr:"cast(float8col as float4)" }, - { ref: "intcol", expr:"intcol" }, - { ref: "int_cast", expr:"cast(intcol as float4)" }, - { ref: "bigintcol", expr:"bigintcol" }, - { ref: "bigint_cast", expr:"cast(bigintcol as float4)" }, - { ref: "varchar_cast1", expr:"cast('1256' as float4)" }, - { ref: "varchar_cast2", expr:"cast('12.56' as float4)" } + { ref: "float8col", expr:"float8col" }, + { ref: "float8_cast", expr:"cast(float8col as float4)" }, + { ref: "intcol", expr:"intcol" }, + { ref: "int_cast", expr:"cast(intcol as float4)" }, + { ref: "bigintcol", expr:"bigintcol" }, + { ref: "bigint_cast", expr:"cast(bigintcol as float4)" }, + { ref: "varchar_cast1", expr:"cast('1256' as float4)" }, + { ref: "varchar_cast2", expr:"cast('12.56' as float4)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastFloat8.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastFloat8.json b/exec/java-exec/src/test/resources/functions/cast/testCastFloat8.json index c700dd4..f16b47b 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastFloat8.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastFloat8.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,14 +25,14 @@ child: 1, pop:"project", exprs: [ - { ref: "float4col", expr:"float4col" }, - { ref: "float4_cast", expr:"cast(float4col as float8)" }, - { ref: "intcol", expr:"intcol" }, - { ref: "int_cast", expr:"cast(intcol as float8)" }, - { ref: "bigintcol", expr:"bigintcol" }, - { ref: "bigint_cast", expr:"cast(bigintcol as float8)" }, - { ref: "varchar_cast1", expr:"cast('1256' as float8)" }, - { ref: "varchar_cast2", expr:"cast('12.56' as float8)" } + { ref: "float4col", expr:"float4col" }, + { ref: "float4_cast", expr:"cast(float4col as float8)" }, + { ref: "intcol", expr:"intcol" }, + { ref: "int_cast", expr:"cast(intcol as float8)" }, + { ref: "bigintcol", expr:"bigintcol" }, + { ref: "bigint_cast", expr:"cast(bigintcol as float8)" }, + { ref: "varchar_cast1", expr:"cast('1256' as float8)" }, + { ref: "varchar_cast2", expr:"cast('12.56' as float8)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastInt.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastInt.json b/exec/java-exec/src/test/resources/functions/cast/testCastInt.json index 271e276..40b02cd 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastInt.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastInt.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,13 +25,13 @@ child: 1, pop:"project", exprs: [ - { ref: "float4col", expr:"float4col" }, - { ref: "float4_cast", expr:"cast(float4col as int)" }, - { ref: "float8col", expr:"float8col" }, - { ref: "float8_cast", expr:"cast(float8col as int)" }, - { ref: "bigintcol", expr:"bigintcol" }, - { ref: "bigint_cast", expr:"cast(bigintcol as int)" }, - { ref: "varchar_cast", expr:"cast('1256' as int)" } + { ref: "float4col", expr:"float4col" }, + { ref: "float4_cast", expr:"cast(float4col as int)" }, + { ref: "float8col", expr:"float8col" }, + { ref: "float8_cast", expr:"cast(float8col as int)" }, + { ref: "bigintcol", expr:"bigintcol" }, + { ref: "bigint_cast", expr:"cast(bigintcol as int)" }, + { ref: "varchar_cast", expr:"cast('1256' as int)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastNested.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastNested.json b/exec/java-exec/src/test/resources/functions/cast/testCastNested.json index 4a2d80a..f9698b4 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastNested.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastNested.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,12 +25,12 @@ child: 1, pop:"project", exprs: [ - { ref: "float4col", expr:"float4col" }, - { ref: "float4_cast", expr:"cast(cast(float4col as bigint) as varchar(10))" }, - { ref: "intcol", expr:"intcol" }, - { ref: "int_float4_add", expr:"cast(intcol as bigint) + cast(float4col as bigint)" }, - { ref: "bigintcol", expr:"bigintcol" }, - { ref: "bigint2varchar2int", expr:"cast(cast(bigintcol as varchar(8)) as int)" }, + { ref: "float4col", expr:"float4col" }, + { ref: "float4_cast", expr:"cast(cast(float4col as bigint) as varchar(10))" }, + { ref: "intcol", expr:"intcol" }, + { ref: "int_float4_add", expr:"cast(intcol as bigint) + cast(float4col as bigint)" }, + { ref: "bigintcol", expr:"bigintcol" }, + { ref: "bigint2varchar2int", expr:"cast(cast(bigintcol as varchar(8)) as int)" }, { ref: "add_cast", expr:"cast('100' as int) + cast(cast(200 as varchar(8)) as int)"} ] }, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastNumException.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastNumException.json b/exec/java-exec/src/test/resources/functions/cast/testCastNumException.json index 27103af..2302da0 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastNumException.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastNumException.json @@ -12,12 +12,12 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , - {name: "intcol", type: "INT", mode: "REQUIRED"} , - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"} , + {name: "intcol", type: "INT", mode: "REQUIRED"} , + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"} + ]} ] }, { @@ -25,7 +25,7 @@ child: 1, pop:"project", exprs: [ - { ref: "varchar_cast", expr:"cast('abc' as int)" } + { ref: "varchar_cast", expr:"cast('abc' as int)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastVarBinary.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastVarBinary.json b/exec/java-exec/src/test/resources/functions/cast/testCastVarBinary.json index b82a620..62f9dca 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastVarBinary.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastVarBinary.json @@ -12,14 +12,14 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"}, - {name: "intcol", type: "INT", mode: "REQUIRED"}, - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"}, - {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"} - ]} + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"}, + {name: "intcol", type: "INT", mode: "REQUIRED"}, + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"}, + {name: "varcharcol", type: "VARCHAR", mode: "REQUIRED"} + ]} ] }, { @@ -27,23 +27,23 @@ child: 1, pop:"project", exprs: [ - { ref: "bigintcol", expr:"bigintcol" }, - { ref: "bigintcast1", expr:"cast(bigintcol as varbinary(10))" }, - { ref: "bigintcast2", expr:"cast(bigintcol as varbinary(30))" }, - { ref: "bigintcast3", expr:"cast(bigintcol as varbinary(2))" }, - { ref: "intcol", expr:"intcol" }, - { ref: "intcast1", expr:"cast(intcol as varbinary(10))" }, - { ref: "intcast2", expr:"cast(intcol as varbinary(2))" }, - { ref: "float4col", expr:"float4col" }, - { ref: "float4cast1", expr:"cast(float4col as varbinary(2))" }, - { ref: "float4cast2", expr:"cast(float4col as varbinary(15))" }, - { ref: "float8col", expr:"float8col" }, - { ref: "float8cast1", expr:"cast(float8col as varbinary(2))" }, - { ref: "float8cast2", expr:"cast(float8col as varbinary(15))" }, - { ref: "varcharcol", expr:"varcharcol" }, - { ref: "varchar_cast1", expr:"cast(varcharcol as varbinary(30))" }, - { ref: "varchar_cast2", expr:"cast(varcharcol as varbinary(2))" }, - { ref: "int_lit_cast", expr:"cast(123 as varbinary(5))" } + { ref: "bigintcol", expr:"bigintcol" }, + { ref: "bigintcast1", expr:"cast(bigintcol as varbinary(10))" }, + { ref: "bigintcast2", expr:"cast(bigintcol as varbinary(30))" }, + { ref: "bigintcast3", expr:"cast(bigintcol as varbinary(2))" }, + { ref: "intcol", expr:"intcol" }, + { ref: "intcast1", expr:"cast(intcol as varbinary(10))" }, + { ref: "intcast2", expr:"cast(intcol as varbinary(2))" }, + { ref: "float4col", expr:"float4col" }, + { ref: "float4cast1", expr:"cast(float4col as varbinary(2))" }, + { ref: "float4cast2", expr:"cast(float4col as varbinary(15))" }, + { ref: "float8col", expr:"float8col" }, + { ref: "float8cast1", expr:"cast(float8col as varbinary(2))" }, + { ref: "float8cast2", expr:"cast(float8col as varbinary(15))" }, + { ref: "varcharcol", expr:"varcharcol" }, + { ref: "varchar_cast1", expr:"cast(varcharcol as varbinary(30))" }, + { ref: "varchar_cast2", expr:"cast(varcharcol as varbinary(2))" }, + { ref: "int_lit_cast", expr:"cast(123 as varbinary(5))" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastVarChar.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastVarChar.json b/exec/java-exec/src/test/resources/functions/cast/testCastVarChar.json index 16615d5..910d91d 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastVarChar.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastVarChar.json @@ -12,14 +12,14 @@ pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 5, types: [ - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"}, - {name: "intcol", type: "INT", mode: "REQUIRED"}, - {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8col", type: "FLOAT8", mode: "REQUIRED"}, + {records: 5, types: [ + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "bigintcol", type: "BIGINT", mode: "REQUIRED"}, + {name: "intcol", type: "INT", mode: "REQUIRED"}, + {name: "float4col", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8col", type: "FLOAT8", mode: "REQUIRED"}, {name: "varbinarycol", type: "VARBINARY", mode: "REQUIRED"} - ]} + ]} ] }, { @@ -27,18 +27,18 @@ child: 1, pop:"project", exprs: [ - { ref: "bigint1", expr:"cast(bigintcol as varchar(10))" }, - { ref: "bigint2", expr:"cast(bigintcol as varchar(30))" }, - { ref: "bigint3", expr:"cast(bigintcol as varchar(2))" }, - { ref: "int1", expr:"cast(intcol as varchar(10))" }, - { ref: "int2", expr:"cast(intcol as varchar(2))" }, - { ref: "float4_1", expr:"cast(float4col as varchar(2))" }, - { ref: "float4_2", expr:"cast(float4col as varchar(15))" }, - { ref: "float8_1", expr:"cast(float8col as varchar(2))" }, - { ref: "float8_2", expr:"cast(float8col as varchar(15))" }, - { ref: "varbinarycol", expr:"varbinarycol"}, - { ref: "varbinary_cast1", expr:"cast(varbinarycol as varchar(15))" }, - { ref: "varbinary_cast2", expr:"cast(varbinarycol as varchar(2))" }, + { ref: "bigint1", expr:"cast(bigintcol as varchar(10))" }, + { ref: "bigint2", expr:"cast(bigintcol as varchar(30))" }, + { ref: "bigint3", expr:"cast(bigintcol as varchar(2))" }, + { ref: "int1", expr:"cast(intcol as varchar(10))" }, + { ref: "int2", expr:"cast(intcol as varchar(2))" }, + { ref: "float4_1", expr:"cast(float4col as varchar(2))" }, + { ref: "float4_2", expr:"cast(float4col as varchar(15))" }, + { ref: "float8_1", expr:"cast(float8col as varchar(2))" }, + { ref: "float8_2", expr:"cast(float8col as varchar(15))" }, + { ref: "varbinarycol", expr:"varbinarycol"}, + { ref: "varbinary_cast1", expr:"cast(varbinarycol as varchar(15))" }, + { ref: "varbinary_cast2", expr:"cast(varbinarycol as varchar(2))" }, { ref: "int_lit_cast", expr:"cast(123 as varchar(10))"} ] }, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testCastVarCharNull.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testCastVarCharNull.json b/exec/java-exec/src/test/resources/functions/cast/testCastVarCharNull.json index 3ca7ed6..dceecd1 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testCastVarCharNull.json +++ b/exec/java-exec/src/test/resources/functions/cast/testCastVarCharNull.json @@ -8,7 +8,7 @@ }, graph:[ { - @id:1, + @id:1, pop:"fs-scan", format: {type: "json"}, storage:{type: "file", connection: "classpath:///"}, @@ -18,9 +18,9 @@ child: 1, pop:"project", exprs: [ - { ref: "int2varchar", expr:"cast(integer as varchar(20))" }, - { ref: "float2varchar", expr:"cast(float as varchar(20))" } - ] + { ref: "int2varchar", expr:"cast(integer as varchar(20))" }, + { ref: "float2varchar", expr:"cast(float as varchar(20))" } + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testICastConstant.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testICastConstant.json b/exec/java-exec/src/test/resources/functions/cast/testICastConstant.json index d85dd6c..69e4058 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testICastConstant.json +++ b/exec/java-exec/src/test/resources/functions/cast/testICastConstant.json @@ -6,44 +6,44 @@ type:"manual" } }, - graph:[ + graph:[ { @id:1, pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 1, types: [ - {name: "intColumn", type: "INT", mode: "REQUIRED"} - ]} + {records: 1, types: [ + {name: "intColumn", type: "INT", mode: "REQUIRED"} + ]} ] }, { @id:2, child: 1, - pop:"project", + pop:"project", exprs: [ - { ref: "BigIntAddFloat8", expr:"10+20.1" }, - { ref: "Float8AddBigInt", expr:"20.1+10" }, - { ref: "Float8AddChar", expr:"20.1 + '10'" }, - { ref: "IntAddFloat8", expr:"cast('10' as int) + 20.1"}, - { ref: "IntAddBigInt", expr:"cast('10' as int) + cast('20' as bigint)"}, - { ref: "BigIntAddInt", expr:"cast('10' as bigint) + cast('20' as int)"}, - { ref: "IntAddFloat8", expr:"cast('10' as int) + cast('20.1' as float8)"}, - { ref: "Float8AddInt", expr:"cast('20.1' as float8) + cast('10' as int) "}, - { ref: "IntAddFloat4", expr:"cast('10' as int) + cast('20.1' as float4)"}, - { ref: "BigIntAddFloat4", expr:"cast('10' as bigint) + cast('20.1' as float4)"}, - { ref: "BigIntAddFloat8", expr:"cast('10' as bigint) + cast('20.1' as float8)"}, - { ref: "Float4AddFloat8", expr:"cast('10' as float4) + cast('20.1' as float8)"}, - { ref: "CharAddFloat4", expr:"'10' + cast('20.1' as float4)"}, - { ref: "CharAddFloat8", expr:"'10' + cast('20.1' as float8)"}, - { ref: "Float4AddFloat8", expr:"cast('10' as float4) + '20.1' "}, - { ref: "Float8AddChar", expr:"cast('10' as float8) + '20.1' "}, - { ref: "CompBigIntFloat8", expr:"10 < 20.1" }, - { ref: "CompCharFloat8", expr:"'10' < 20.1" }, - { ref: "CompFloat8Char", expr:"20.1 > '10' " }, - { ref: "nested1", expr:" 20.1 + 10 > '10' " }, - { ref: "nested2", expr:" 20.1 + 10 > '10' + 15.1" } - ] + { ref: "BigIntAddFloat8", expr:"10+20.1" }, + { ref: "Float8AddBigInt", expr:"20.1+10" }, + { ref: "Float8AddChar", expr:"20.1 + '10'" }, + { ref: "IntAddFloat8", expr:"cast('10' as int) + 20.1"}, + { ref: "IntAddBigInt", expr:"cast('10' as int) + cast('20' as bigint)"}, + { ref: "BigIntAddInt", expr:"cast('10' as bigint) + cast('20' as int)"}, + { ref: "IntAddFloat8", expr:"cast('10' as int) + cast('20.1' as float8)"}, + { ref: "Float8AddInt", expr:"cast('20.1' as float8) + cast('10' as int) "}, + { ref: "IntAddFloat4", expr:"cast('10' as int) + cast('20.1' as float4)"}, + { ref: "BigIntAddFloat4", expr:"cast('10' as bigint) + cast('20.1' as float4)"}, + { ref: "BigIntAddFloat8", expr:"cast('10' as bigint) + cast('20.1' as float8)"}, + { ref: "Float4AddFloat8", expr:"cast('10' as float4) + cast('20.1' as float8)"}, + { ref: "CharAddFloat4", expr:"'10' + cast('20.1' as float4)"}, + { ref: "CharAddFloat8", expr:"'10' + cast('20.1' as float8)"}, + { ref: "Float4AddFloat8", expr:"cast('10' as float4) + '20.1' "}, + { ref: "Float8AddChar", expr:"cast('10' as float8) + '20.1' "}, + { ref: "CompBigIntFloat8", expr:"10 < 20.1" }, + { ref: "CompCharFloat8", expr:"'10' < 20.1" }, + { ref: "CompFloat8Char", expr:"20.1 > '10' " }, + { ref: "nested1", expr:" 20.1 + 10 > '10' " }, + { ref: "nested2", expr:" 20.1 + 10 > '10' + 15.1" } + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testICastMockCol.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testICastMockCol.json b/exec/java-exec/src/test/resources/functions/cast/testICastMockCol.json index b9fd242..27b06fd 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testICastMockCol.json +++ b/exec/java-exec/src/test/resources/functions/cast/testICastMockCol.json @@ -6,35 +6,35 @@ type:"manual" } }, - graph:[ + graph:[ { @id: 1, pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 1, types: [ - {name: "intColumn", type: "INT", mode: "REQUIRED"}, - {name: "bigIntColumn", type: "BIGINT", mode: "REQUIRED"}, - {name: "float4Column", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8Column", type: "FLOAT8", mode: "REQUIRED"}, - {name: "intNullableColumn", type: "INT", mode: "OPTIONAL"}, - {name: "bigIntNullableColumn", type: "BIGINT", mode: "OPTIONAL"}, - {name: "float4NullableColumn", type: "FLOAT4", mode: "OPTIONAL"}, - {name: "float8NullableColumn", type: "FLOAT8", mode: "OPTIONAL"} - ]} + {records: 1, types: [ + {name: "intColumn", type: "INT", mode: "REQUIRED"}, + {name: "bigIntColumn", type: "BIGINT", mode: "REQUIRED"}, + {name: "float4Column", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8Column", type: "FLOAT8", mode: "REQUIRED"}, + {name: "intNullableColumn", type: "INT", mode: "OPTIONAL"}, + {name: "bigIntNullableColumn", type: "BIGINT", mode: "OPTIONAL"}, + {name: "float4NullableColumn", type: "FLOAT4", mode: "OPTIONAL"}, + {name: "float8NullableColumn", type: "FLOAT8", mode: "OPTIONAL"} + ]} ] }, { @id:2, child: 1, - pop:"project", + pop:"project", exprs: [ - { ref: "NullIntAddInt", expr:"intNullableColumn + intColumn" }, - { ref: "IntAddNullInt", expr:"intColumn + intNullableColumn " }, - { ref: "IntAddNullFloat4", expr:"intColumn + float4NullableColumn " }, - { ref: "Float4AddNullInt", expr:"float4Column + intNullableColumn " }, - { ref: "Float8AddNullBigInt", expr:"float8Column + bigIntNullableColumn " } - ] + { ref: "NullIntAddInt", expr:"intNullableColumn + intColumn" }, + { ref: "IntAddNullInt", expr:"intColumn + intNullableColumn " }, + { ref: "IntAddNullFloat4", expr:"intColumn + float4NullableColumn " }, + { ref: "Float4AddNullInt", expr:"float4Column + intNullableColumn " }, + { ref: "Float8AddNullBigInt", expr:"float8Column + bigIntNullableColumn " } + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/testICastNullExp.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/testICastNullExp.json b/exec/java-exec/src/test/resources/functions/cast/testICastNullExp.json index 6b8fd44..8c214ad 100644 --- a/exec/java-exec/src/test/resources/functions/cast/testICastNullExp.json +++ b/exec/java-exec/src/test/resources/functions/cast/testICastNullExp.json @@ -6,33 +6,33 @@ type:"manual" } }, - graph:[ + graph:[ { @id:1, pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 1, types: [ - {name: "float8Column", type: "FLOAT8", mode: "OPTIONAL"} - ]} + {records: 1, types: [ + {name: "float8Column", type: "FLOAT8", mode: "OPTIONAL"} + ]} ] }, { @id:2, child: 1, - pop:"project", - exprs: [ - { ref: "isNullOfNullExp", expr:"isnull(unkonwCol)" }, - { ref: "isNullOfKnowCol", expr:"isnull(float8Column)" }, - { ref: "isNotNullOfNullExp", expr:"isnotnull(unkonwCol)" }, - { ref: "isNotNullOfKnowCol", expr:"isnotnull(float8Column)" }, - { ref: "BigIntAddNullExp", expr:"1 + unknowCol" }, - { ref: "NullExpAddBigInt", expr:"unknowCol + 1" }, - { ref: "Float8AddNullExp", expr:"1.2 + unknowCol" }, - { ref: "NullExpAddFloat8", expr:"unknowCol + 1.2" }, - { ref: "Float4AddNullExp", expr:"cast(1.2 as float4) + unknowCol" }, - { ref: "NullExpAddFloat4", expr:"unknowCol +cast(1.2 as float4) " } - ] + pop:"project", + exprs: [ + { ref: "isNullOfNullExp", expr:"isnull(unkonwCol)" }, + { ref: "isNullOfKnowCol", expr:"isnull(float8Column)" }, + { ref: "isNotNullOfNullExp", expr:"isnotnull(unkonwCol)" }, + { ref: "isNotNullOfKnowCol", expr:"isnotnull(float8Column)" }, + { ref: "BigIntAddNullExp", expr:"1 + unknowCol" }, + { ref: "NullExpAddBigInt", expr:"unknowCol + 1" }, + { ref: "Float8AddNullExp", expr:"1.2 + unknowCol" }, + { ref: "NullExpAddFloat8", expr:"unknowCol + 1.2" }, + { ref: "Float4AddNullExp", expr:"cast(1.2 as float4) + unknowCol" }, + { ref: "NullExpAddFloat4", expr:"unknowCol +cast(1.2 as float4) " } + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/cast/two_way_implicit_cast.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/cast/two_way_implicit_cast.json b/exec/java-exec/src/test/resources/functions/cast/two_way_implicit_cast.json index 31cf541..008a59d 100644 --- a/exec/java-exec/src/test/resources/functions/cast/two_way_implicit_cast.json +++ b/exec/java-exec/src/test/resources/functions/cast/two_way_implicit_cast.json @@ -12,10 +12,10 @@ pop:"mock-scan", url: "http://apache.org";, entries:[ - {records: 1, types: [ - {name: "col1", type: "FLOAT4", mode: "REQUIRED"}, - {name: "col2", type: "FLOAT8", mode: "REQUIRED"} - ]} + {records: 1, types: [ + {name: "col1", type: "FLOAT4", mode: "REQUIRED"}, + {name: "col2", type: "FLOAT8", mode: "REQUIRED"} + ]} ] }, { @@ -23,8 +23,8 @@ child: 1, pop:"project", exprs: [ - {ref: "str_to_int_cast", expr:"8 + '2'" }, - {ref: "int_to_str_cast", expr:"substr(10123, 1, 3)" } + {ref: "str_to_int_cast", expr:"8 + '2'" }, + {ref: "int_to_str_cast", expr:"substr(10123, 1, 3)" } ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/comparisonTest.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/comparisonTest.json b/exec/java-exec/src/test/resources/functions/comparisonTest.json index eac6e68..986dbcc 100644 --- a/exec/java-exec/src/test/resources/functions/comparisonTest.json +++ b/exec/java-exec/src/test/resources/functions/comparisonTest.json @@ -6,22 +6,22 @@ type:"manual" } }, - graph:[ + graph:[ { @id:1, pop:"mock-sub-scan", url: "http://apache.org";, entries:[ - {records: 100, types: [ - {name: "intColumn", type: "INT", mode: "REQUIRED"}, - {name: "bigIntColumn", type: "BIGINT", mode: "REQUIRED"}, - {name: "float4Column", type: "FLOAT4", mode: "REQUIRED"}, - {name: "float8Column", type: "FLOAT8", mode: "REQUIRED"}, - {name: "intNullableColumn", type: "INT", mode: "OPTIONAL"}, - {name: "bigIntNullableColumn", type: "BIGINT", mode: "OPTIONAL"}, - {name: "float4NullableColumn", type: "FLOAT4", mode: "OPTIONAL"}, - {name: "float8NullableColumn", type: "FLOAT8", mode: "OPTIONAL"} - ]} + {records: 100, types: [ + {name: "intColumn", type: "INT", mode: "REQUIRED"}, + {name: "bigIntColumn", type: "BIGINT", mode: "REQUIRED"}, + {name: "float4Column", type: "FLOAT4", mode: "REQUIRED"}, + {name: "float8Column", type: "FLOAT8", mode: "REQUIRED"}, + {name: "intNullableColumn", type: "INT", mode: "OPTIONAL"}, + {name: "bigIntNullableColumn", type: "BIGINT", mode: "OPTIONAL"}, + {name: "float4NullableColumn", type: "FLOAT4", mode: "OPTIONAL"}, + {name: "float8NullableColumn", type: "FLOAT8", mode: "OPTIONAL"} + ]} ] }, { @@ -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/functions/string/testCharLength.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testCharLength.json b/exec/java-exec/src/test/resources/functions/string/testCharLength.json index ae29f67..4d45607 100644 --- a/exec/java-exec/src/test/resources/functions/string/testCharLength.json +++ b/exec/java-exec/src/test/resources/functions/string/testCharLength.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,19 +23,19 @@ child: 1, pop:"project", exprs: [ - { ref: "col1", expr: "char_length('aababcdf')"}, - { ref: "col2", expr: "char_length('')"}, - { ref: "col3", expr: "char_length(varcharcol)"}, - { ref: "col4", expr: "char_length(nullvarcharcol)"}, - { ref: "col5", expr: "character_length('aababcdf')"}, - { ref: "col6", expr: "character_length('')"}, - { ref: "col7", expr: "character_length(varcharcol)"}, - { ref: "col8", expr: "character_length(nullvarcharcol)"}, - { ref: "col9", expr: "length('aababcdf')"}, - { ref: "col10", expr: "length('')"}, - { ref: "col11", expr: "length(varcharcol)"}, - { ref: "col12", expr: "length(nullvarcharcol)"} - ] + { ref: "col1", expr: "char_length('aababcdf')"}, + { ref: "col2", expr: "char_length('')"}, + { ref: "col3", expr: "char_length(varcharcol)"}, + { ref: "col4", expr: "char_length(nullvarcharcol)"}, + { ref: "col5", expr: "character_length('aababcdf')"}, + { ref: "col6", expr: "character_length('')"}, + { ref: "col7", expr: "character_length(varcharcol)"}, + { ref: "col8", expr: "character_length(nullvarcharcol)"}, + { ref: "col9", expr: "length('aababcdf')"}, + { ref: "col10", expr: "length('')"}, + { ref: "col11", expr: "length(varcharcol)"}, + { ref: "col12", expr: "length(nullvarcharcol)"} + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testConcat.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testConcat.json b/exec/java-exec/src/test/resources/functions/string/testConcat.json index 5b21710..e8e9a31 100644 --- a/exec/java-exec/src/test/resources/functions/string/testConcat.json +++ b/exec/java-exec/src/test/resources/functions/string/testConcat.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,10 +23,10 @@ child: 1, pop:"project", exprs: [ - { ref: "col1", expr: "concat('abc', 'ABC')"}, - { ref: "col2", expr: "concat('abc', '')"}, - { ref: "col3", expr: "concat('', 'ABC')"}, - { ref: "col4", expr: "concat('', '')"} + { ref: "col1", expr: "concat('abc', 'ABC')"}, + { ref: "col2", expr: "concat('abc', '')"}, + { ref: "col3", expr: "concat('', 'ABC')"}, + { ref: "col4", expr: "concat('', '')"} ] }, { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testLeft.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testLeft.json b/exec/java-exec/src/test/resources/functions/string/testLeft.json index e8126a5..b30ddb9 100644 --- a/exec/java-exec/src/test/resources/functions/string/testLeft.json +++ b/exec/java-exec/src/test/resources/functions/string/testLeft.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: "left('abcdef', 2)"}, - { ref: "col2", expr: "left('abcdef', 6)"}, + { ref: "col1", expr: "left('abcdef', 2)"}, + { ref: "col2", expr: "left('abcdef', 6)"}, { ref: "col3", expr: "left('abcdef', 7)"}, { ref: "col4", expr: "left('abcdef', -2)"}, { ref: "col5", expr: "left('abcdef', -5)"}, { ref: "col6", expr: "left('abcdef', -6)"}, { ref: "col7", expr: "left('abcdef', -7)"} - ] + ] }, { @id: 3, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testLike.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testLike.json b/exec/java-exec/src/test/resources/functions/string/testLike.json index fc99ef2..59880f6 100644 --- a/exec/java-exec/src/test/resources/functions/string/testLike.json +++ b/exec/java-exec/src/test/resources/functions/string/testLike.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/testLower.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testLower.json b/exec/java-exec/src/test/resources/functions/string/testLower.json index d6351d8..d7dd186 100644 --- a/exec/java-exec/src/test/resources/functions/string/testLower.json +++ b/exec/java-exec/src/test/resources/functions/string/testLower.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: "lower('ABcEFgh')"}, - { ref: "lower", expr: "lower('aBc')"}, + { ref: "lower", expr: "lower('ABcEFgh')"}, + { ref: "lower", expr: "lower('aBc')"}, { ref: "lower", expr: "lower('')"} ] }, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/java-exec/src/test/resources/functions/string/testLpad.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/string/testLpad.json b/exec/java-exec/src/test/resources/functions/string/testLpad.json index 017df71..fc21ee8 100644 --- a/exec/java-exec/src/test/resources/functions/string/testLpad.json +++ b/exec/java-exec/src/test/resources/functions/string/testLpad.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,18 +23,17 @@ child: 1, pop:"project", exprs: [ - { ref: "col1", expr: "lpad('abcdef', 0, 'abc')"}, - { ref: "col2", expr: "lpad('abcdef', -3, 'abc')"}, - { ref: "col3", expr: "lpad('abcdef', 6, 'abc')"}, - { ref: "col4", expr: "lpad('abcdef', 2, 'abc')"}, - { ref: "col5", expr: "lpad('abcdef', 2, '')"}, - { ref: "col7", expr: "lpad('abcdef', 10, '')"}, - { ref: "col8", expr: "lpad('abcdef', 10, 'A')"}, - { ref: "col9", expr: "lpad('abcdef', 10, 'AB')"}, - { ref: "col10", expr: "lpad('abcdef', 10, 'ABC')"}, - { ref: "col11", expr: "lpad('abcdef', 10, 'ABCDEFGHIJKLMN')"} - - ] + { ref: "col1", expr: "lpad('abcdef', 0, 'abc')"}, + { ref: "col2", expr: "lpad('abcdef', -3, 'abc')"}, + { ref: "col3", expr: "lpad('abcdef', 6, 'abc')"}, + { ref: "col4", expr: "lpad('abcdef', 2, 'abc')"}, + { ref: "col5", expr: "lpad('abcdef', 2, '')"}, + { ref: "col7", expr: "lpad('abcdef', 10, '')"}, + { ref: "col8", expr: "lpad('abcdef', 10, 'A')"}, + { ref: "col9", expr: "lpad('abcdef', 10, 'AB')"}, + { ref: "col10", expr: "lpad('abcdef', 10, 'ABC')"}, + { ref: "col11", expr: "lpad('abcdef', 10, 'ABCDEFGHIJKLMN')"} + ] }, { @id: 3,
