apache · maheshrajus · Sep 23, 2026
diff --git a/accumulo-handler/src/test/queries/positive/accumulo_queries.q b/accumulo-handler/src/test/queries/positive/accumulo_queries.q
@@ -1,6 +1,5 @@
 --! qt:dataset:src
 -- remove these; after HIVE-18802 is fixed
-set hive.optimize.index.filter=false;
 set hive.optimize.ppd=false;
 -- remove these; after HIVE-18802 is fixed
 

diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2486,8 +2486,6 @@ public static enum ConfVars {
 
     HIVE_SCRIPT_OPERATOR_TRUST("hive.exec.script.trust", false, ""),
     // Optimizer
-    HIVE_OPT_INDEX_FILTER("hive.optimize.index.filter", true, "Whether to enable automatic use of indexes"),
-
     HIVE_OPT_PPD("hive.optimize.ppd", true,
         "Whether to enable predicate pushdown"),
     HIVE_OPT_PPD_WINDOWING("hive.optimize.ppd.windowing", true,
@@ -4790,7 +4788,7 @@ public static enum ConfVars {
         "hive.tez.bucket.pruning", true,
          "When pruning is enabled, filters on bucket columns will be processed by \n" +
          "filtering the splits against a bitset of included buckets. This needs predicates \n"+
-            "produced by hive.optimize.ppd and hive.optimize.index.filter."),
+            "produced by hive.optimize.ppd."),
     TEZ_OPTIMIZE_BUCKET_PRUNING_COMPAT(
         "hive.tez.bucket.pruning.compat", true,
         "When pruning is enabled, handle possibly broken inserts due to negative hashcodes.\n" +
@@ -6791,8 +6789,6 @@ private static String[] convertVarsToRegex(String[] paramList) {
     "hive\\.fetch.task\\..*",
     "hive\\.groupby\\..*",
     "hive\\.hbase\\..*",
-    "hive\\.index\\..*",
-    "hive\\.index\\..*",
     "hive\\.intermediate\\..*",
     "hive\\.jdbc\\..*",
     "hive\\.join\\..*",

diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHBaseTableInputFormat.java
@@ -205,7 +205,7 @@ private Scan createFilterScan(JobConf jobConf, int iKey, int iTimestamp, boolean
     ExprNodeDesc residualPredicate = analyzer.analyzePredicate(filterExpr, conditions);
 
     // There should be no residual since we already negotiated that earlier in
-    // HBaseStorageHandler.decomposePredicate. However, with hive.optimize.index.filter
+    // HBaseStorageHandler.decomposePredicate. However,
     // OpProcFactory#pushFilterToStorageHandler pushes the original filter back down again.
     // Since pushed-down filters are not omitted at the higher levels (and thus the
     // contract of negotiation is ignored anyway), just ignore the residuals.

diff --git a/hbase-handler/src/test/queries/positive/hbase_pushdown.q b/hbase-handler/src/test/queries/positive/hbase_pushdown.q
@@ -20,11 +20,9 @@ explain select * from hbase_pushdown where key=90 and value like '%90%';
 
 select * from hbase_pushdown where key=90 and value like '%90%';
 
-set hive.optimize.index.filter=true;
 -- with partial pushdown with optimization (HIVE-6650)
 explain select * from hbase_pushdown where key=90 and value like '%90%';
 select * from hbase_pushdown where key=90 and value like '%90%';
-set hive.optimize.index.filter=false;
 
 -- with two residuals
 

diff --git a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/test/TestHiveShell.java b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/test/TestHiveShell.java
@@ -199,7 +199,6 @@ private HiveConf initializeConf() {
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_CBO_ENABLED, true);
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_INFER_BUCKET_SORT, false);
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_METADATA_ONLY_QUERIES, false);
-    hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_OPT_INDEX_FILTER, false);
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_CONVERT_JOIN, false);
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_SKEW_JOIN, false);
 

diff --git a/iceberg/iceberg-handler/src/test/queries/positive/dynamic_partition_pruning.q b/iceberg/iceberg-handler/src/test/queries/positive/dynamic_partition_pruning.q
@@ -7,7 +7,6 @@ set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.tez.min.bloom.filter.entries=1;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 

diff --git a/iceberg/iceberg-handler/src/test/queries/positive/dynamic_semijoin_reduction.q b/iceberg/iceberg-handler/src/test/queries/positive/dynamic_semijoin_reduction.q
@@ -8,7 +8,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;
@@ -35,4 +34,4 @@ EXPLAIN select count(*) from srcpart_date_n7 join srcpart_small_n3 on (srcpart_d
 select count(*) from srcpart_date_n7 join srcpart_small_n3 on (srcpart_date_n7.key = srcpart_small_n3.key1);
 
 drop table srcpart_date_n7;
-drop table srcpart_small_n3;
+drop table srcpart_small_n3;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java
@@ -98,8 +98,7 @@ public boolean hasPpd() {
   public void configure(HiveConf queryConfig) {
     this.conf = queryConfig;
     this.sarg = ConvertAstToSearchArg.createFromConf(conf);
-    this.isPpdEnabled = HiveConf.getBoolVar(conf, ConfVars.HIVE_OPT_INDEX_FILTER)
-        && HiveConf.getBoolVar(conf, ConfVars.HIVE_ORC_MS_FOOTER_CACHE_PPD);
+    this.isPpdEnabled = HiveConf.getBoolVar(conf, ConfVars.HIVE_ORC_MS_FOOTER_CACHE_PPD);
     this.isInTest = HiveConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST);
     this.sargIsOriginal = this.sargNotIsOriginal = null;
   }

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/LeafFilterFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/io/parquet/LeafFilterFactory.java
@@ -47,7 +47,7 @@
 
   @VisibleForTesting
   public static final String FILTER_PREDICATE_CONVERSION_NOT_SUPPORTED =
-      "The conversion to Parquet FilterPredicate is not supported for %s. Please try to set the following configurations at the session level\n set hive.optimize.index.filter=false;\n"
+      "The conversion to Parquet FilterPredicate is not supported for %s. Please try to set the following configuration at the session level\n"
           + " set hive.optimize.ppd=false;\n";
 
   class IntFilterPredicateLeafBuilder extends FilterPredicateLeafBuilder {

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java
@@ -110,7 +110,7 @@ protected void generatePredicate(NodeProcessorCtx procCtx,
       if (filter == null) {
         return;
       }
-      // the sargs are closely tied to hive.optimize.index.filter
+      // the sargs are closely tied to predicate push-down (hive.optimize.ppd)
       SearchArgument sarg = ConvertAstToSearchArg.create(ctxt.pctx.getConf(), filter);
       if (sarg == null) {
         return;

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
@@ -172,8 +172,7 @@ public void initialize(HiveConf hiveConf) {
 
     if (HiveConf.getBoolVar(hiveConf,
         HiveConf.ConfVars.TEZ_OPTIMIZE_BUCKET_PRUNING)
-        && HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPT_PPD)
-        && HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPT_INDEX_FILTER)) {
+        && HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPT_PPD)) {
       final boolean compatMode =
           HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.TEZ_OPTIMIZE_BUCKET_PRUNING_COMPAT);
       transformations.add(new FixedBucketPruningOptimizer(compatMode));

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
@@ -1323,16 +1323,14 @@
    TableScanOperator tableScanOp,
    ExprNodeGenericFuncDesc originalPredicate,
    OpWalkerInfo owi,
    HiveConf hiveConf) throws SemanticException {
 
     TableScanDesc tableScanDesc = tableScanOp.getConf();
     Table tbl = tableScanDesc.getTableMetadata();
-    if (HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_OPT_INDEX_FILTER)) {
-      // attach the original predicate to the table scan operator for index
-      // optimizations that require the pushed predicate before pcr & later
-      // optimizations are applied
-      tableScanDesc.setFilterExpr(originalPredicate);
-    }
+    // Attach the original predicate to the table scan operator so that downstream
+    // storage-handler and predicate push-down consumers see the pushed predicate
+    // before pcr and later optimizations are applied.
+    tableScanDesc.setFilterExpr(originalPredicate);
     if (!tbl.isNonNative()) {
       return originalPredicate;
     }

diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands2.java
@@ -210,7 +210,6 @@ public void testOrcNoPPD() throws Exception {
   private void testOrcPPD(boolean enablePPD) throws Exception {
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_EXPLAIN_USER, false);
     hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_OPT_PPD, enablePPD);//enables PPD
-    hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_OPT_INDEX_FILTER, enablePPD);//enables ORC PPD
     //create delta_0001_0001_0000 (should push predicate here)
     runStatementOnDriver("insert into " + Table.ACIDTBL + "(a,b) " + makeValuesClause(new int[][]{{1, 2}, {3, 4}}));
     List<String> explain;
@@ -1712,7 +1711,6 @@ protected void createAbortLowWaterMark() throws Exception{
   @Test
   public void testETLSplitStrategyForACID() throws Exception {
     hiveConf.setVar(HiveConf.ConfVars.HIVE_ORC_SPLIT_STRATEGY, "ETL");
-    hiveConf.setBoolVar(HiveConf.ConfVars.HIVE_OPT_INDEX_FILTER, true);
     runStatementOnDriver("insert into " + Table.ACIDTBL + " values(1,2)");
     runStatementOnDriver("alter table " + Table.ACIDTBL + " compact 'MAJOR'");
     runWorker(hiveConf);

diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcSplitElimination.java b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcSplitElimination.java
@@ -700,7 +700,6 @@ private void setupExternalCacheConfig(boolean isPpd, String paths) {
     conf.setLong(HiveConf.ConfVars.MAPRED_MIN_SPLIT_SIZE.varname, 1000);
     conf.setLong(HiveConf.ConfVars.MAPRED_MAX_SPLIT_SIZE.varname, 5000);
     conf.setBoolean(ConfVars.HIVE_ORC_MS_FOOTER_CACHE_PPD.varname, isPpd);
-    conf.setBoolean(ConfVars.HIVE_OPT_INDEX_FILTER.varname, isPpd);
   }
 
   private ObjectInspector createIO() {

diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java b/ql/src/test/org/apache/hadoop/hive/ql/io/sarg/TestSearchArgumentImpl.java
@@ -41,8 +41,8 @@
 
 /**
  * These test the SARG implementation.
- * The xml files were generated by setting hive.optimize.index.filter
- * to true and using a custom record reader that prints out the value of
+ * The xml files were generated with predicate push-down enabled and using
+ * a custom record reader that prints out the value of
  * hive.io.filter.expr.serialized in createRecordReader. This should be
  * replaced by generating the AST using the API and passing that in.
  * <p/>

diff --git a/...adoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java b/...adoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java
@@ -89,7 +89,7 @@ private List<String> getSettableParams() throws SecurityException, NoSuchFieldEx
 
     // create list with variables that match some of the regexes
     List<String> confVarRegexList = Arrays.asList("hive.convert.join.bucket.mapjoin.tez",
-        "hive.optimize.index.filter.compact.maxsize", "hive.tez.dummy", "tez.task.dummy",
+        "hive.tez.dummy", "tez.task.dummy",
         "hive.exec.dynamic.partition", "hive.exec.dynamic.partition.mode",
         "hive.exec.max.dynamic.partitions", "hive.exec.max.dynamic.partitions.pernode",
         "oozie.HadoopAccessorService.created", "tez.queue.name",

diff --git a/ql/src/test/queries/clientpositive/acid_bucket_pruning.q b/ql/src/test/queries/clientpositive/acid_bucket_pruning.q
@@ -1,7 +1,6 @@
 --! qt:dataset:alltypesorc
 set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
-set hive.optimize.index.filter=true;
 set hive.tez.bucket.pruning=true;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

diff --git a/ql/src/test/queries/clientpositive/acid_vectorization_original.q b/ql/src/test/queries/clientpositive/acid_vectorization_original.q
@@ -4,7 +4,6 @@ set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
 set hive.vectorized.execution.enabled=true;
 -- enable ppd
-set hive.optimize.index.filter=true;
 
 set hive.explain.user=false;
 
@@ -172,4 +171,4 @@ set hive.exec.orc.split.strategy=BI;
 select t, count(*) from over10k_orc
 group by t;
 
-select oo.ROW__ID.writeId, oo.ROW__IS__DELETED, oo.* from over10k_orc('acid.fetch.deleted.rows'='true') oo order by si;
+select oo.ROW__ID.writeId, oo.ROW__IS__DELETED, oo.* from over10k_orc('acid.fetch.deleted.rows'='true') oo order by si;
diff --git a/ql/src/test/queries/clientpositive/acid_vectorization_original_tez.q b/ql/src/test/queries/clientpositive/acid_vectorization_original_tez.q
@@ -4,7 +4,6 @@ set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
 set hive.vectorized.execution.enabled=true;
 -- enable ppd
-set hive.optimize.index.filter=true;
 
 set hive.explain.user=false;
 

diff --git a/ql/src/test/queries/clientpositive/bucketmapjoin_with_subquery.q b/ql/src/test/queries/clientpositive/bucketmapjoin_with_subquery.q
@@ -10,7 +10,6 @@ set hive.convert.join.bucket.mapjoin.tez=true;
 set hive.fetch.task.conversion=none;
 set hive.merge.nway.joins=false;
 set hive.optimize.dynamic.partition.hashjoin=true;
-set hive.optimize.index.filter=true;
 set hive.optimize.remove.sq_count_check=true;
 set hive.prewarm.enabled=false;
 set hive.join.inner.residual=false;
@@ -49,4 +48,4 @@ OVER(PARTITION BY id ORDER BY in_date DESC ) AS ROW_NUMB  FROM DUP_TEST) OUTQUER
 select * from DUP_TEST_TARGET T join (SELECT id , in_date , sample FROM (SELECT id , in_date , sample ,ROW_NUMBER()
 OVER(PARTITION BY id ORDER BY in_date DESC ) AS ROW_NUMB  FROM DUP_TEST) OUTQUERY WHERE ROW_NUMB =1) as S ON T.id = S.id;
 
-select * from DUP_TEST_TARGET T join DUP_TEST S ON T.id = S.id;
+select * from DUP_TEST_TARGET T join DUP_TEST S ON T.id = S.id;
diff --git a/ql/src/test/queries/clientpositive/bucketpruning1.q b/ql/src/test/queries/clientpositive/bucketpruning1.q
@@ -1,6 +1,5 @@
 set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
-set hive.optimize.index.filter=true;
 set hive.tez.bucket.pruning=true;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

diff --git a/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q b/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date.q
@@ -4,7 +4,6 @@ set hive.vectorized.execution.enabled=false;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.tez.bucket.pruning=true;
-set hive.optimize.index.filter=true;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 
 create table change_allowincompatible_vectorization_false_date (ts date) partitioned by (s string) clustered by (ts) into 32 buckets stored as orc tblproperties ('transactional'='true');

diff --git a/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date2.q b/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date2.q
@@ -4,7 +4,6 @@ set hive.vectorized.execution.enabled=false;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.tez.bucket.pruning=true;
-set hive.optimize.index.filter=true;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 
 create table change_allowincompatible_vectorization_false_date (ts date) partitioned by (s string) clustered by (ts) into 32 buckets stored as orc tblproperties ('transactional'='true');

diff --git a/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date3.q b/ql/src/test/queries/clientpositive/change_allowincompatible_vectorization_false_date3.q
@@ -4,7 +4,6 @@ set hive.vectorized.execution.enabled=false;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.tez.bucket.pruning=true;
-set hive.optimize.index.filter=true;
 set hive.metastore.disallow.incompatible.col.type.changes=false;
 
 create table change_allowincompatible_vectorization_false_date (ts timestamp) partitioned by (s string) clustered by (ts) into 32 buckets stored as orc tblproperties ('transactional'='true');

diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_join_noncbo.q b/ql/src/test/queries/clientpositive/dynamic_partition_join_noncbo.q
@@ -504,7 +504,6 @@ DROP TABLE t0;
 DROP TABLE t1;
 DROP TABLE t3;
 
-set hive.optimize.index.filter=true;
 set hive.cbo.enable=false;
 
 set hive.auto.convert.sortmerge.join.to.mapjoin=false;

diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q b/ql/src/test/queries/clientpositive/dynamic_partition_pruning.q
@@ -7,7 +7,6 @@ set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.tez.min.bloom.filter.entries=1;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 

diff --git a/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q b/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
@@ -5,7 +5,6 @@ set hive.optimize.ppd=true;
 set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.auto.convert.join=true;
 set hive.auto.convert.join.noconditionaltask = true;
 set hive.auto.convert.join.noconditionaltask.size = 10000000;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction.q
@@ -8,7 +8,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_2.q
@@ -7,7 +7,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;
 set hive.tez.dynamic.semijoin.reduction.threshold=-999999999999;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_3.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_3.q
@@ -11,7 +11,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;
 set hive.tez.dynamic.semijoin.reduction.threshold=-999999999999;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_4.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_4.q
@@ -7,7 +7,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw.q
@@ -8,7 +8,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw2.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_reduction_sw2.q
@@ -8,7 +8,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;

diff --git a/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q b/ql/src/test/queries/clientpositive/dynamic_semijoin_user_level.q
@@ -9,7 +9,6 @@ set hive.ppd.remove.duplicatefilters=true;
 set hive.tez.dynamic.partition.pruning=true;
 set hive.tez.dynamic.semijoin.reduction=true;
 set hive.optimize.metadataonly=false;
-set hive.optimize.index.filter=true;
 set hive.stats.autogather=true;
 set hive.tez.bigtable.minsize.semijoin.reduction=1;
 set hive.tez.min.bloom.filter.entries=1;

diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q b/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q
@@ -176,7 +176,6 @@ select count(*) from over1k_part_buck_sort2_orc;
 
 set hive.mapred.mode=nonstrict;
 set hive.optimize.ppd=true;
-set hive.optimize.index.filter=true;
 set hive.tez.bucket.pruning=true;
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;

diff --git a/ql/src/test/queries/clientpositive/explainanalyze_3.q b/ql/src/test/queries/clientpositive/explainanalyze_3.q
@@ -116,7 +116,6 @@ load data local inpath '../../data/files/orc_split_elim.orc' into table orc_merg
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=50000;
-SET hive.optimize.index.filter=true;
 set hive.merge.orcfile.stripe.level=false;
 set hive.merge.tezfiles=false;
 set hive.merge.mapfiles=false;

diff --git a/ql/src/test/queries/clientpositive/explainuser_3.q b/ql/src/test/queries/clientpositive/explainuser_3.q
@@ -114,7 +114,6 @@ load data local inpath '../../data/files/orc_split_elim.orc' into table orc_merg
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET mapred.min.split.size=1000;
 SET mapred.max.split.size=50000;
-SET hive.optimize.index.filter=true;
 set hive.merge.orcfile.stripe.level=false;
 set hive.merge.tezfiles=false;
 set hive.merge.mapfiles=false;

diff --git a/ql/src/test/queries/clientpositive/groupby_groupingset_bug.q b/ql/src/test/queries/clientpositive/groupby_groupingset_bug.q
@@ -1,5 +1,4 @@
 set hive.explain.user=true;
-set hive.optimize.index.filter=true;
 set hive.auto.convert.join=true;
 set hive.vectorized.execution.enabled=true;
 

diff --git a/ql/src/test/queries/clientpositive/llap_acid.q b/ql/src/test/queries/clientpositive/llap_acid.q
@@ -6,7 +6,6 @@ SET hive.llap.io.enabled=false;
 
 SET hive.exec.orc.default.buffer.size=32768;
 SET hive.exec.orc.default.row.index.stride=1000;
-SET hive.optimize.index.filter=true;
 set hive.fetch.task.conversion=none;
 
 set hive.support.concurrency=true;

diff --git a/ql/src/test/queries/clientpositive/llap_acid2.q b/ql/src/test/queries/clientpositive/llap_acid2.q
@@ -6,7 +6,6 @@ SET hive.llap.io.enabled=false;
 
 SET hive.exec.orc.default.buffer.size=32768;
 SET hive.exec.orc.default.row.index.stride=1000;
-SET hive.optimize.index.filter=true;
 set hive.fetch.task.conversion=none;
 
 set hive.support.concurrency=true;

diff --git a/ql/src/test/queries/clientpositive/llap_acid_fast.q b/ql/src/test/queries/clientpositive/llap_acid_fast.q
@@ -6,7 +6,6 @@ SET hive.llap.io.enabled=true;
 
 SET hive.exec.orc.default.buffer.size=32768;
 SET hive.exec.orc.default.row.index.stride=1000;
-SET hive.optimize.index.filter=true;
 set hive.fetch.task.conversion=none;
 
 set hive.support.concurrency=true;