You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jp...@apache.org on 2014/12/29 19:05:28 UTC

svn commit: r1648399 [5/5] - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/parse/ test/org/apache/hadoop/hive/ql/parse/

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java?rev=1648399&r1=1648398&r2=1648399&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java Mon Dec 29 18:05:28 2014
@@ -273,8 +273,12 @@ public final class SemanticAnalyzerFacto
       case HiveParser.TOK_DELETE_FROM:
         return new UpdateDeleteSemanticAnalyzer(conf);
 
-      default:
-        return new SemanticAnalyzer(conf);
+      default: {
+        SemanticAnalyzer semAnalyzer = HiveConf
+            .getBoolVar(conf, HiveConf.ConfVars.HIVE_CBO_ENABLED) ? new CalcitePlanner(conf)
+            : new SemanticAnalyzer(conf);
+        return semAnalyzer;
+      }
       }
     }
   }

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestIUD.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestIUD.java?rev=1648399&r1=1648398&r2=1648399&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestIUD.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestIUD.java Mon Dec 29 18:05:28 2014
@@ -42,7 +42,7 @@ public class TestIUD {
   @Before
   public void setup() throws SemanticException {
     pd = new ParseDriver();
-    sA = new SemanticAnalyzer(conf);
+    sA = new CalcitePlanner(conf);
   }
 
   ASTNode parse(String query) throws ParseException {

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java?rev=1648399&r1=1648398&r2=1648399&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java Mon Dec 29 18:05:28 2014
@@ -42,7 +42,7 @@ public class TestQBJoinTreeApplyPredicat
 
   @Before
   public void setup() throws SemanticException {
-    sA = new SemanticAnalyzer(conf);
+    sA = new CalcitePlanner(conf);
   }
 
   static ASTNode constructIdentifier(String nm) {

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java?rev=1648399&r1=1648398&r2=1648399&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBSubQuery.java Mon Dec 29 18:05:28 2014
@@ -54,7 +54,7 @@ public class TestQBSubQuery {
   @Before
   public void setup() throws SemanticException {
     pd = new ParseDriver();
-    sA = new SemanticAnalyzer(conf);
+    sA = new CalcitePlanner(conf);
   }
 
   ASTNode parse(String query) throws ParseException {