You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/10/21 06:43:06 UTC
svn commit: r1534023 [2/3] - in /hive/trunk:
hbase-handler/src/java/org/apache/hadoop/hive/hbase/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/exec/vector/
ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/ ql/s...
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java Mon Oct 21 04:43:04 2013
@@ -18,20 +18,21 @@
package org.apache.hadoop.hive.ql.io.sarg;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.ql.exec.Utilities;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+import java.beans.XMLDecoder;
+import java.io.ByteArrayInputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
import org.apache.hadoop.hive.ql.io.sarg.SearchArgument.TruthValue;
import org.apache.hadoop.hive.ql.io.sarg.SearchArgumentImpl.ExpressionBuilder;
import org.apache.hadoop.hive.ql.io.sarg.SearchArgumentImpl.ExpressionTree;
-import org.apache.hadoop.hive.ql.plan.ExprNodeDesc;
+import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
import org.apache.mina.util.IdentityHashSet;
import org.junit.Test;
-import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
/**
* These test the SARG implementation.
* The xml files were generated by setting hive.optimize.index.filter
@@ -224,6 +225,23 @@ public class TestSearchArgumentImpl {
}
}
+ private ExprNodeGenericFuncDesc getFuncDesc (String xmlSerialized) {
+ byte[] bytes;
+ try {
+ bytes = xmlSerialized.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException ex) {
+ throw new RuntimeException("UTF-8 support required", ex);
+ }
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ XMLDecoder decoder = new XMLDecoder(bais, null, null);
+
+ try {
+ return (ExprNodeGenericFuncDesc) decoder.readObject();
+ } finally {
+ decoder.close();
+ }
+ }
@Test
public void testExpression1() throws Exception {
// first_name = 'john' or
@@ -237,35 +255,35 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -310,7 +328,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -357,7 +375,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -404,7 +422,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -455,7 +473,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -502,7 +520,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -549,7 +567,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -596,11 +614,11 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -637,7 +655,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -692,10 +710,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> \n";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(9, leaves.size());
@@ -771,19 +788,19 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -818,7 +835,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -865,7 +882,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -916,7 +933,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -961,10 +978,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> \n";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(4, leaves.size());
@@ -1048,23 +1064,23 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -1129,7 +1145,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1180,11 +1196,11 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -1210,9 +1226,6 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void property=\"genericUDF\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge\"> \n" +
- " <void property=\"udfClass\"> \n" +
- " <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> \n" +
- " </void> \n" +
" <void property=\"udfClassName\"> \n" +
" <string>org.apache.hadoop.hive.ql.udf.UDFSubstr</string> \n" +
" </void> \n" +
@@ -1261,7 +1274,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -1308,11 +1321,11 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1341,9 +1354,6 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void property=\"genericUDF\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge\"> \n" +
- " <void property=\"udfClass\"> \n" +
- " <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> \n" +
- " </void> \n" +
" <void property=\"udfClassName\"> \n" +
" <string>org.apache.hadoop.hive.ql.udf.UDFSubstr</string> \n" +
" </void> \n" +
@@ -1387,10 +1397,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> \n";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(3, leaves.size());
@@ -1428,15 +1437,15 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1481,7 +1490,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1542,7 +1551,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1598,10 +1607,9 @@ public class TestSearchArgumentImpl {
" </object> \n" +
"</java> \n" +
"\n";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(3, leaves.size());
@@ -1654,15 +1662,15 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1707,7 +1715,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -1721,7 +1729,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1754,9 +1762,6 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void property=\"genericUDF\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.udf.generic.GenericUDFBridge\"> \n" +
- " <void property=\"udfClass\"> \n" +
- " <class>org.apache.hadoop.hive.ql.udf.UDFSubstr</class> \n" +
- " </void> \n" +
" <void property=\"udfClassName\"> \n" +
" <string>org.apache.hadoop.hive.ql.udf.UDFSubstr</string> \n" +
" </void> \n" +
@@ -1792,7 +1797,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -1857,10 +1862,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> \n";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(1, leaves.size());
@@ -1884,27 +1888,27 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1949,7 +1953,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -1996,7 +2000,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2043,15 +2047,15 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2088,7 +2092,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2135,7 +2139,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2192,11 +2196,11 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2233,7 +2237,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2290,7 +2294,7 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2335,10 +2339,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object>\n" +
"</java>";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(9, leaves.size());
@@ -2424,7 +2427,7 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2470,10 +2473,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> ";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(0, leaves.size());
@@ -2487,7 +2489,7 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n" +
@@ -2508,11 +2510,11 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n" +
- " <void property=\"childExprs\"> \n" +
+ " <void property=\"children\"> \n" +
" <object class=\"java.util.ArrayList\"> \n" +
" <void method=\"add\"> \n" +
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc\"> \n" +
@@ -2541,9 +2543,6 @@ public class TestSearchArgumentImpl {
" <void property=\"operator\"> \n" +
" <boolean>true</boolean> \n" +
" </void> \n" +
- " <void property=\"udfClass\"> \n" +
- " <class>org.apache.hadoop.hive.ql.udf.UDFOPPlus</class> \n" +
- " </void> \n" +
" <void property=\"udfClassName\"> \n" +
" <string>org.apache.hadoop.hive.ql.udf.UDFOPPlus</string> \n" +
" </void> \n" +
@@ -2574,9 +2573,6 @@ public class TestSearchArgumentImpl {
" <void property=\"operator\"> \n" +
" <boolean>true</boolean> \n" +
" </void> \n" +
- " <void property=\"udfClass\"> \n" +
- " <class>org.apache.hadoop.hive.ql.udf.UDFOPPlus</class> \n" +
- " </void> \n" +
" <void property=\"udfClassName\"> \n" +
" <string>org.apache.hadoop.hive.ql.udf.UDFOPPlus</string> \n" +
" </void> \n" +
@@ -2604,10 +2600,9 @@ public class TestSearchArgumentImpl {
" </void> \n" +
" </object> \n" +
"</java> ";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(0, leaves.size());
@@ -2622,11 +2617,11 @@ public class TestSearchArgumentImpl {
String exprStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \n" +
"<java version=\"1.6.0_31\" class=\"java.beans.XMLDecoder\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n"+
- " <void property=\"childExprs\"> \n"+
+ " <void property=\"children\"> \n"+
" <object class=\"java.util.ArrayList\"> \n"+
" <void method=\"add\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n"+
- " <void property=\"childExprs\"> \n"+
+ " <void property=\"children\"> \n"+
" <object class=\"java.util.ArrayList\"> \n"+
" <void method=\"add\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n"+
@@ -2671,11 +2666,11 @@ public class TestSearchArgumentImpl {
" </void> \n"+
" <void method=\"add\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n"+
- " <void property=\"childExprs\"> \n"+
+ " <void property=\"children\"> \n"+
" <object class=\"java.util.ArrayList\"> \n"+
" <void method=\"add\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc\"> \n"+
- " <void property=\"childExprs\"> \n"+
+ " <void property=\"children\"> \n"+
" <object class=\"java.util.ArrayList\"> \n"+
" <void method=\"add\"> \n"+
" <object class=\"org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc\"> \n"+
@@ -2730,10 +2725,9 @@ public class TestSearchArgumentImpl {
" </void> \n"+
" </object> \n"+
"</java>";
- Configuration conf = new Configuration();
- ExprNodeDesc expr = Utilities.deserializeExpression(exprStr, conf);
+
SearchArgumentImpl sarg =
- (SearchArgumentImpl) SearchArgument.FACTORY.create(expr);
+ (SearchArgumentImpl) SearchArgument.FACTORY.create(getFuncDesc(exprStr));
List<PredicateLeaf> leaves = sarg.getLeaves();
assertEquals(1, leaves.size());
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/physical/TestVectorizer.java Mon Oct 21 04:43:04 2013
@@ -70,7 +70,7 @@ public class TestVectorizer {
ExprNodeColumnDesc colExprA = new ExprNodeColumnDesc(Integer.class, "col1", "T", false);
ExprNodeColumnDesc colExprB = new ExprNodeColumnDesc(Integer.class, "col2", "T", false);
children.add(colExprA);
- exprNodeDesc.setChildExprs(children);
+ exprNodeDesc.setChildren(children);
ArrayList<String> outputColumnNames = new ArrayList<String>();
outputColumnNames.add("_col0");
Modified: hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml Mon Oct 21 04:43:04 2013
@@ -772,7 +772,7 @@
<object id="ExprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc">
<void property="desc">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -856,7 +856,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -989,11 +989,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml Mon Oct 21 04:43:04 2013
@@ -388,7 +388,7 @@
<void method="put">
<string>_col6</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -420,7 +420,7 @@
<void method="put">
<string>_col5</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -452,7 +452,7 @@
<void method="put">
<string>_col4</string>
<object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -466,7 +466,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -518,7 +518,7 @@
<void method="put">
<string>_col3</string>
<object id="ExprNodeGenericFuncDesc3" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -563,7 +563,7 @@
<void method="put">
<string>_col2</string>
<object id="ExprNodeGenericFuncDesc4" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -608,7 +608,7 @@
<void method="put">
<string>_col1</string>
<object id="ExprNodeGenericFuncDesc5" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -653,7 +653,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc6" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
@@ -905,7 +905,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml Mon Oct 21 04:43:04 2013
@@ -561,7 +561,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml Mon Oct 21 04:43:04 2013
@@ -462,7 +462,7 @@
<void method="put">
<string>_col1</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -511,7 +511,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -589,7 +589,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -650,7 +650,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -1480,7 +1480,7 @@
<void method="put">
<string>_col2</string>
<object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml Mon Oct 21 04:43:04 2013
@@ -542,7 +542,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -611,7 +611,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -672,7 +672,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -736,7 +736,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -797,7 +797,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -858,7 +858,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml Mon Oct 21 04:43:04 2013
@@ -341,7 +341,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml Mon Oct 21 04:43:04 2013
@@ -414,7 +414,7 @@
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml Mon Oct 21 04:43:04 2013
@@ -341,7 +341,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml Mon Oct 21 04:43:04 2013
@@ -887,7 +887,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml Mon Oct 21 04:43:04 2013
@@ -1939,7 +1939,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2259,11 +2259,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2300,7 +2300,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2593,7 +2593,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml Mon Oct 21 04:43:04 2013
@@ -555,7 +555,7 @@
<void method="put">
<string>_col1</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -611,7 +611,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml Mon Oct 21 04:43:04 2013
@@ -2325,7 +2325,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2645,11 +2645,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2686,7 +2686,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -2979,11 +2979,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -3020,7 +3020,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -3271,7 +3271,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml Mon Oct 21 04:43:04 2013
@@ -550,7 +550,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object idref="ExprNodeColumnDesc1"/>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml Mon Oct 21 04:43:04 2013
@@ -887,7 +887,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml Mon Oct 21 04:43:04 2013
@@ -320,7 +320,7 @@
<void method="put">
<string>_col2</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/>
@@ -351,7 +351,7 @@
<void method="put">
<string>_col1</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -396,7 +396,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml Mon Oct 21 04:43:04 2013
@@ -882,7 +882,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeNullDesc"/>
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Oct 21 04:43:04 2013
@@ -584,7 +584,7 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml Mon Oct 21 04:43:04 2013
@@ -324,7 +324,7 @@
<void method="put">
<string>_col2</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -371,7 +371,7 @@
<object id="ExprNodeFieldDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeFieldDesc">
<void property="desc">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -451,7 +451,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml Mon Oct 21 04:43:04 2013
@@ -324,7 +324,7 @@
<void method="put">
<string>_col2</string>
<object id="ExprNodeGenericFuncDesc0" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -363,7 +363,7 @@
<void method="put">
<string>_col1</string>
<object id="ExprNodeGenericFuncDesc1" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -422,7 +422,7 @@
<void method="put">
<string>_col0</string>
<object id="ExprNodeGenericFuncDesc2" class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -573,11 +573,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -608,11 +608,11 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml Mon Oct 21 04:43:04 2013
@@ -345,7 +345,7 @@
<object id="ArrayList0" class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -663,7 +663,7 @@
<object id="ArrayList1" class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
Modified: hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml?rev=1534023&r1=1534022&r2=1534023&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml (original)
+++ hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml Mon Oct 21 04:43:04 2013
@@ -644,11 +644,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -693,7 +693,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -1275,11 +1275,11 @@
<object class="org.apache.hadoop.hive.ql.plan.FilterDesc">
<void property="predicate">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">
@@ -1316,7 +1316,7 @@
</void>
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc">
- <void property="childExprs">
+ <void property="children">
<object class="java.util.ArrayList">
<void method="add">
<object class="org.apache.hadoop.hive.ql.plan.ExprNodeColumnDesc">