HIVE-28576: Add jdbc tests for tpcds queries

itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestMiniLlapLocalJdbcCliDriver.java

@@ -0,0 +1,60 @@
+/*
+ * 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.cli;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.hadoop.hive.cli.control.CliAdapter;
+import org.apache.hadoop.hive.cli.control.CliConfigs;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TestMiniLlapLocalJdbcCliDriver {
+  static CliAdapter adapter = new CliConfigs.MiniLlapLocalJdbcCliConfig().getCliAdapter();
+
+  @Parameters(name = "{0}")
+  public static List<Object[]> getParameters() throws Exception {
+    return adapter.getParameters();
+  }
+
+  @ClassRule
+  public static TestRule cliClassRule = adapter.buildClassRule();
+
+  @Rule
+  public TestRule cliTestRule = adapter.buildTestRule();
+
+  private String name;
+  private File qfile;
+
+  public TestMiniLlapLocalJdbcCliDriver(String name, File qfile) {
+    this.name = name;
+    this.qfile = qfile;
+  }
+
+  @Test
+  public void testCliDriver() throws Exception {
+    adapter.runTest(name, qfile);
+  }
+}

itests/src/test/resources/testconfiguration.properties

@@ -372,6 +372,13 @@ tez.perf.disabled.query.files=\
   mv_query67.q,\
   mv_query68.q
 
+jdbc.disabled.query.files=\
+  mv_query30.q,\
+  mv_query44.q,\
+  mv_query45.q,\
+  mv_query67.q,\
+  mv_query68.q
+
 druid.query.files=\
   druid_materialized_view_rewrite_ssb.q,\
   druid_timeseries.q,\

itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java

@@ -62,6 +62,8 @@ public abstract class AbstractCliConfig {
   // these should have viable defaults
   private String cleanupScript;
   private String initScript;
+  private String jdbcInitScript;
+  private String externalTablesForJdbcInitScript;
   private String hiveConfDir;
   private MiniClusterType clusterType;
   private FsType fsType;
@@ -345,6 +347,22 @@ protected void setInitScript(String initScript) {
       this.initScript = initScript;
     }
   }
+
+  public String getJdbcInitScript() {
+    return jdbcInitScript;
+  }
+
+  public void setJdbcInitScript(String jdbcInitScript) {
+    this.jdbcInitScript = jdbcInitScript;
+  }
+
+  public String getExternalTablesForJdbcInitScript() {
+    return externalTablesForJdbcInitScript;
+  }
+
+  public void setExternalTablesForJdbcInitScript(String externalTablesForJdbcInitScript) {
+    this.externalTablesForJdbcInitScript = externalTablesForJdbcInitScript;
+  }
   public String getHiveConfDir() {
     return hiveConfDir;
   }

itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java

@@ -339,6 +339,24 @@ public TezTPCDS30TBCliConfig() {
     }
   }
 
+  public static class MiniLlapLocalJdbcCliConfig extends AbstractCliConfig {
+    public MiniLlapLocalJdbcCliConfig() {
+      super(CoreJdbcCliDriver.class);
+      try {
+        setQueryDir("ql/src/test/queries/clientpositive/perf");
+        setLogDir("itests/qtest/target/qfile-results/clientpositive/jdbc/postgres");
+        setResultsDir("ql/src/test/results/clientpositive/jdbc/postgres");
+        setHiveConfDir("data/conf/llap");
+        setClusterType(MiniClusterType.LLAP_LOCAL);
+        setJdbcInitScript("q_test_tpcds_schema.postgres.sql");
+        setExternalTablesForJdbcInitScript("q_test_tpcds_extDB_schema-postgres.sql");
+        excludesFrom(testConfigProps, "jdbc.disabled.query.files");
+      } catch (Exception e) {
+        throw new RuntimeException("can't construct cliconfig", e);
+      }
+    }
+  }
+
   public static class NegativeLlapLocalCliConfig extends AbstractCliConfig {
     public NegativeLlapLocalCliConfig() {
       super(CoreNegativeCliDriver.class);

itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CoreJdbcCliDriver.java

@@ -0,0 +1,104 @@
+/*
+ * 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.cli.control;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.hive.cli.control.CoreCliDriver;
+import org.apache.hadoop.hive.cli.control.AbstractCliConfig;
+import org.apache.hadoop.hive.ql.externalDB.AbstractExternalDB;
+import org.apache.hadoop.hive.ql.qoption.QTestDatabaseHandler;
+import org.apache.hadoop.hive.ql.QTestArguments;
+import org.apache.hadoop.hive.ql.QTestUtil;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class CoreJdbcCliDriver extends CoreCliDriver {
+  private AbstractExternalDB externalDB;
+  private static final Logger LOG = LoggerFactory.getLogger(CoreJdbcCliDriver.class);
+  private boolean externalTablesCreated = false;
+
+  public CoreJdbcCliDriver(AbstractCliConfig testCliConfig) {
+    super(testCliConfig);
+  }
+
+  @Override
+  @BeforeClass
+  public void beforeClass() throws Exception {
+    super.beforeClass();
+
+    if (cliConfig.getJdbcInitScript() != null) {
+      LOG.info("Launching docker container, running jdbc init script...");
+      java.nio.file.Path scriptFile = Paths.get(
+          QTestUtil.getScriptsDir(getQt().getConf()) + File.separator + cliConfig.getJdbcInitScript()
+      );
+      if (Files.notExists(scriptFile)) {
+        LOG.info("No jdbc init script detected. Skipping");
+        return;
+      }
+      externalDB = QTestDatabaseHandler.DatabaseType.valueOf("POSTGRES").create();
+      externalDB.launchDockerContainer();
+      externalDB.execute(scriptFile.toString());
+    }
+  }
+
+  @Override
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    if (!externalTablesCreated && cliConfig.getExternalTablesForJdbcInitScript() != null) {
+      LOG.info("Running init script for external tables...");
+      File scriptFile = new File(
+          QTestUtil.getScriptsDir(getQt().getConf()) + File.separator + 
+              cliConfig.getExternalTablesForJdbcInitScript()
+      );
+      if (!scriptFile.isFile()) {
+        LOG.info("No init script for external tables detected. Skipping");
+        return;
+      }
+      String initCommands = FileUtils.readFileToString(scriptFile);
+      getQt().getCliDriver().processLine(initCommands);
+      externalTablesCreated = true;
+    }
+  }
+
+  @Override
+  @After
+  public void tearDown() throws Exception {
+    getQt().clearPostTestEffects();
+  }
+
+  @Override
+  @AfterClass
+  public void shutdown() throws Exception {
+    LOG.info("Cleaning up...");
+    super.tearDown();
+    super.shutdown();
+    if (externalDB != null) {
+      LOG.info("Cleaning up docker...");
+      externalDB.cleanupDockerContainer();
+    }
+  }
+}

itests/util/src/main/java/org/apache/hadoop/hive/ql/qoption/QTestDatabaseHandler.java

@@ -51,35 +51,35 @@
 public class QTestDatabaseHandler implements QTestOptionHandler {
   private static final Logger LOG = LoggerFactory.getLogger(QTestDatabaseHandler.class);
 
-  private enum DatabaseType {
+  public enum DatabaseType {
     POSTGRES {
       @Override
-      AbstractExternalDB create() {
+      public AbstractExternalDB create() {
         return new PostgresExternalDB();
       }
     }, MYSQL {
       @Override
-      AbstractExternalDB create() {
+      public AbstractExternalDB create() {
         return new MySQLExternalDB();
       }
     }, MARIADB {
       @Override
-      AbstractExternalDB create() {
+      public AbstractExternalDB create() {
         return new MariaDB();
       }
     }, MSSQL {
       @Override
-      AbstractExternalDB create() {
+      public AbstractExternalDB create() {
         return new MSSQLServer();
       }
     }, ORACLE {
       @Override
-      AbstractExternalDB create() {
+      public AbstractExternalDB create() {
         return new Oracle();
       }
     };
 
-    abstract AbstractExternalDB create();
+    public abstract AbstractExternalDB create();
   }
 
   private final Map<DatabaseType, String> databaseToScript = new EnumMap<>(DatabaseType.class);