HIVE-29312: Concatenate equality conditions in AND nodes

ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java

@@ -4701,7 +4701,7 @@ List<Partition> getPartitionsWithSpecsByNames(Table tbl, List<String> partNames,
     }
 
     try {
-      Batchable.runBatched(batchSize, partNames, new Batchable<String, Void>() {
+      new Batchable<String, Void>() {
         @Override
         public List<Void> run(List<String> list) throws Exception {
           req.getFilterSpec().setFilters(list);
@@ -4712,7 +4712,7 @@ public List<Void> run(List<String> list) throws Exception {
           }
           return Collections.emptyList();
         }
-      });
+      }.runBatched(batchSize, partNames);
     } catch (Exception e) {
       throw new HiveException(e);
     }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java → standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/Batchable.java

@@ -21,68 +21,36 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.jdo.Query;
 
 import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *  Base class to add the batch process for DirectSQL or RawStore queries.
+ *  Base class to add the batch process.
  *  1. Provide the implementation of run() to process one batch
- *  2. Call Batchable.runBatched() to process the whole dataset
+ *  2. Call runBatched() to process the whole dataset
  *
  *  I: input type, R: result type
  */
 public abstract class Batchable<I, R> {
-  private static final Logger LOG = LoggerFactory.getLogger(Batchable.class);
   public static final int NO_BATCHING = -1;
 
-  private List<Query> queries = null;
   public abstract List<R> run(List<I> input) throws Exception;
 
-  public void addQueryAfterUse(Query query) {
-    if (queries == null) {
-      queries = new ArrayList<Query>(1);
-    }
-    queries.add(query);
-  }
-  protected void addQueryAfterUse(Batchable<?, ?> b) {
-    if (b.queries == null) {
-      return;
-    }
-    if (queries == null) {
-      queries = new ArrayList<>(b.queries);
-    } else {
-      queries.addAll(b.queries);
-    }
-  }
-  public void closeAllQueries() {
-    for (Query q : queries) {
-      try {
-        q.closeAll();
-      } catch (Throwable t) {
-        LOG.error("Failed to close a query", t);
-      }
-    }
-  }
-
-  public static <I, R> List<R> runBatched(
+  public final List<R> runBatched(
       final int batchSize,
-      List<I> input,
-      Batchable<I, R> runnable) throws MetaException {
+      List<I> input) throws MetaException {
     if (input == null || input.isEmpty()) {
       return Collections.emptyList();
     }
     try {
       if (batchSize == NO_BATCHING || batchSize >= input.size()) {
-        return runnable.run(input);
+        return run(input);
       }
       List<R> result = new ArrayList<>(input.size());
       for (int fromIndex = 0, toIndex = 0; toIndex < input.size(); fromIndex = toIndex) {
         toIndex = Math.min(fromIndex + batchSize, input.size());
         List<I> batchedInput = input.subList(fromIndex, toIndex);
-        List<R> batchedOutput = runnable.run(batchedInput);
+        List<R> batchedOutput = run(batchedInput);
         if (batchedOutput != null) {
           result.addAll(batchedOutput);
         }

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ExceptionHandler.java → standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/ExceptionHandler.java

@@ -22,6 +22,7 @@
 import org.apache.hadoop.hive.metastore.utils.JavaUtils;
 import org.apache.thrift.TException;
 
+
 import static java.util.Objects.requireNonNull;
 
 /**

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/BatchableQuery.java

@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.metastore;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.jdo.Query;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *  Base class to add the batch process for DirectSQL or RawStore queries.
+ */
+public abstract class BatchableQuery<I, R> extends Batchable<I, R> {
+  private static final Logger LOG = LoggerFactory.getLogger(Batchable.class);
+
+  private List<Query> queries = null;
+
+  public void addQueryAfterUse(Query query) {
+    if (queries == null) {
+      queries = new ArrayList<Query>(1);
+    }
+    queries.add(query);
+  }
+  protected void addQueryAfterUse(BatchableQuery<?, ?> b) {
+    if (b.queries == null) {
+      return;
+    }
+    if (queries == null) {
+      queries = new ArrayList<>(b.queries);
+    } else {
+      queries.addAll(b.queries);
+    }
+  }
+  public void closeAllQueries() {
+    for (Query q : queries) {
+      try {
+        q.closeAll();
+      } catch (Throwable t) {
+        LOG.error("Failed to close a query", t);
+      }
+    }
+  }
+}