diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 19110ce..c291294 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -9880,7 +9880,8 @@ public void analyzeInternal(ASTNode ast) throws SemanticException { || ast.getToken().getType() == HiveParser.TOK_EXPLAIN; if (!tokenTypeIsQuery || createVwDesc != null || !HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CBO_ENABLED) - || !canHandleQuery(qb, true) || !HiveOptiqUtil.validateASTForCBO(ast)) { + || !canHandleQuery(qb, true) || !HiveOptiqUtil.validateASTForCBO(ast) + || HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVEOPTINDEXFILTER)) { runCBO = false; }