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 2014/10/07 17:17:35 UTC

svn commit: r1629910 - /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java

Author: hashutosh
Date: Tue Oct  7 15:17:34 2014
New Revision: 1629910

URL: http://svn.apache.org/r1629910
Log:
HIVE-8366 : CBO fails if there is a table sample in subquery (Ashutosh Chauhan via John Pullokkaran)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java?rev=1629910&r1=1629909&r2=1629910&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/HiveOptiqUtil.java Tue Oct  7 15:17:34 2014
@@ -77,7 +77,8 @@ public class HiveOptiqUtil {
 
   public static boolean validateASTForCBO(ASTNode ast) {
     String astTree = ast.toStringTree();
-    String[] tokens = { "TOK_CHARSETLITERAL" };
+    // if any of following tokens are present in AST, bail out
+    String[] tokens = { "TOK_CHARSETLITERAL","TOK_TABLESPLITSAMPLE" };
     for (String token : tokens) {
       if (astTree.contains(token)) {
         return false;