DRILL-323: Handle multiple inputs to math operators correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/43615c8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/43615c8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/43615c8d Branch: refs/heads/master Commit: 43615c8d085afe762bccd8814891779c60861bbb Parents: a5ee8f8 Author: Mehant Baid <[email protected]> Authored: Tue Apr 22 00:30:19 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Tue Apr 22 19:18:03 2014 -0700 ---------------------------------------------------------------------- .../common/expression/FunctionCallFactory.java | 2 +- .../drill/exec/fn/impl/TestMultiInputAdd.java | 86 ++++++++++++++++++++ .../functions/multi_input_add_test.json | 30 +++++++ 3 files changed, 117 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/43615c8d/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java index 50fceda..8113107 100644 --- a/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java +++ b/common/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java @@ -104,7 +104,7 @@ public class FunctionCallFactory { List<LogicalExpression> l2 = new ArrayList<LogicalExpression>(); l2.add(first); l2.add(args.get(i + 1)); - first = createExpression(opTypes.get(i), ep, args); + first = createExpression(opTypes.get(i), ep, l2); } return first; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/43615c8d/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java new file mode 100644 index 0000000..d4714c0 --- /dev/null +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java @@ -0,0 +1,86 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.drill.exec.fn.impl; + +import com.codahale.metrics.MetricRegistry; +import com.google.common.base.Charsets; +import com.google.common.io.Files; +import mockit.Injectable; +import mockit.NonStrictExpectations; +import org.apache.drill.common.config.DrillConfig; +import org.apache.drill.common.expression.ExpressionPosition; +import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.util.FileUtils; +import org.apache.drill.exec.client.DrillClient; +import org.apache.drill.exec.pop.PopUnitTestBase; +import org.apache.drill.exec.proto.UserProtos; +import org.apache.drill.exec.record.RecordBatchLoader; +import org.apache.drill.exec.record.VectorWrapper; +import org.apache.drill.exec.rpc.user.QueryResultBatch; +import org.apache.drill.exec.rpc.user.UserServer; +import org.apache.drill.exec.server.Drillbit; +import org.apache.drill.exec.server.DrillbitContext; +import org.apache.drill.exec.server.RemoteServiceSet; +import org.apache.drill.exec.vector.IntVector; +import org.apache.drill.exec.vector.Float8Vector; +import org.apache.drill.exec.vector.ValueVector; +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertTrue; + +public class TestMultiInputAdd extends PopUnitTestBase { + + static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMathFunctions.class); + DrillConfig c = DrillConfig.create(); + + + @Test + public void testMultiInputAdd(@Injectable final DrillbitContext bitContext, @Injectable UserServer.UserClientConnection connection) throws Throwable + { + try (RemoteServiceSet serviceSet = RemoteServiceSet.getLocalServiceSet(); + Drillbit bit = new Drillbit(CONFIG, serviceSet); + DrillClient client = new DrillClient(CONFIG, serviceSet.getCoordinator())) { + + // run query. + bit.run(); + client.connect(); + List<QueryResultBatch> results = client.runQuery(UserProtos.QueryType.PHYSICAL, + Files.toString(FileUtils.getResourceAsFile("/functions/multi_input_add_test.json"), Charsets.UTF_8)); + + RecordBatchLoader batchLoader = new RecordBatchLoader(bit.getContext().getAllocator()); + + QueryResultBatch batch = results.get(0); + assertTrue(batchLoader.load(batch.getHeader().getDef(), batch.getData())); + + for (VectorWrapper<?> v : batchLoader) { + + ValueVector.Accessor accessor = v.getValueVector().getAccessor(); + + assertTrue((accessor.getObject(0)).equals(10)); + } + + batchLoader.clear(); + for(QueryResultBatch b : results){ + b.release(); + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/43615c8d/exec/java-exec/src/test/resources/functions/multi_input_add_test.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/functions/multi_input_add_test.json b/exec/java-exec/src/test/resources/functions/multi_input_add_test.json new file mode 100644 index 0000000..16443a4 --- /dev/null +++ b/exec/java-exec/src/test/resources/functions/multi_input_add_test.json @@ -0,0 +1,30 @@ +{ + head : { + version : 1, + generator : { + type : "optiq", + info : "na" + }, + type : "APACHE_DRILL_PHYSICAL" + }, + graph:[ + { + @id:1, + pop:"mock-scan", + url: "http://apache.org";, + entries:[ + {records: 1, types: [ + {name: "blue", type: "BIGINT", mode: "REQUIRED"} + ]} + ] + }, { + pop : "project", + @id : 2, + exprs : [ { ref : "INTADD", expr : " 1 + 2 + 3 + 4" } ], + child : 1 + }, { + pop : "screen", + @id : 3, + child : 2 + } ] +} \ No newline at end of file
