Repository: hive Updated Branches: refs/heads/master 83dcaa78c -> 2f5a2a79d
HIVE-16538 : TestExecDriver fails if run after TestOperators#testScriptOperator (Yussuf Shaikh via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <hashut...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2f5a2a79 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2f5a2a79 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2f5a2a79 Branch: refs/heads/master Commit: 2f5a2a79d1bf1f8b418c731be7040dea0d85a39a Parents: 83dcaa7 Author: Yussuf Shaikh <yus...@us.ibm.com> Authored: Thu Apr 27 13:41:22 2017 -0700 Committer: Ashutosh Chauhan <hashut...@apache.org> Committed: Thu Apr 27 13:41:22 2017 -0700 ---------------------------------------------------------------------- .../test/org/apache/hadoop/hive/ql/exec/TestOperators.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/2f5a2a79/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java index b569549..0287ff2 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hive.ql.io.IOContextMap; import org.apache.hadoop.hive.ql.optimizer.ConvertJoinMapJoin; import org.apache.hadoop.hive.ql.parse.TypeCheckProcFactory; import org.apache.hadoop.hive.ql.plan.CollectDesc; +import org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc; import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc; import org.apache.hadoop.hive.ql.plan.ExprNodeDesc; import org.apache.hadoop.hive.ql.plan.MapredWork; @@ -55,6 +56,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; +import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.JobConf; @@ -214,10 +216,11 @@ public class TestOperators extends TestCase { try { System.out.println("Testing Script Operator"); // col1 - ExprNodeDesc exprDesc1 = TestExecDriver.getStringColumn("col1"); - + ExprNodeDesc exprDesc1 = new ExprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, "col1", "", + false); // col2 - ExprNodeDesc expr1 = TestExecDriver.getStringColumn("col0"); + ExprNodeDesc expr1 = new ExprNodeColumnDesc(TypeInfoFactory.stringTypeInfo, "col0", "", + false); ExprNodeDesc expr2 = new ExprNodeConstantDesc("1"); ExprNodeDesc exprDesc2 = TypeCheckProcFactory.DefaultExprProcessor .getFuncExprNodeDesc("concat", expr1, expr2);