HIVE-25010: Create TestIcebergCliDriver and TestIcebergNegativeCliDriver (#2193) (Laszlo Pinter, reviewed by Marton Bod and Peter Vary)
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 86febc5..96f08a7 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -770,6 +770,8 @@
"If not set, defaults to the codec extension for text files (e.g. \".gz\"), or no extension otherwise."),
HIVE_IN_TEST("hive.in.test", false, "internal usage only, true in test mode", true),
+ HIVE_IN_TEST_ICEBERG("hive.in.iceberg.test", false, "internal usage only, true when " +
+ "testing iceberg", true),
HIVE_IN_TEST_SSL("hive.in.ssl.test", false, "internal usage only, true in SSL test mode", true),
// TODO: this needs to be removed; see TestReplicationScenarios* comments.
HIVE_IN_TEST_REPL("hive.in.repl.test", false, "internal usage only, true in replication test mode", true),
diff --git a/data/conf/iceberg/hive-site.xml b/data/conf/iceberg/hive-site.xml
new file mode 100644
index 0000000..49a8d3f
--- /dev/null
+++ b/data/conf/iceberg/hive-site.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ 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.
+-->
+
+<configuration>
+
+<property>
+ <name>hive.in.test</name>
+ <value>true</value>
+ <description>Internal marker for test. Used for masking env-dependent values</description>
+</property>
+<property>
+ <!-- set to true so that TxnManager#checkLock does not throw exception when using UNSET data type operation in the requested lock component -->
+ <name>hive.in.iceberg.test</name>
+ <value>true</value>
+</property>
+
+<!-- Hive Configuration can either be stored in this file or in the hadoop configuration files -->
+<!-- that are implied by Hadoop setup variables. -->
+<!-- Aside from Hadoop setup variables - this file is provided as a convenience so that Hive -->
+<!-- users do not have to edit hadoop configuration files (that may be managed as a centralized -->
+<!-- resource). -->
+
+<!-- Hive Execution Parameters -->
+<property>
+ <name>hadoop.tmp.dir</name>
+ <value>${test.tmp.dir}/hadoop-tmp</value>
+ <description>A base for other temporary directories.</description>
+</property>
+
+<property>
+ <name>hive.tez.container.size</name>
+ <value>128</value>
+ <description></description>
+</property>
+
+<property>
+ <name>hive.merge.tezfiles</name>
+ <value>false</value>
+ <description>Merge small files at the end of a Tez DAG</description>
+</property>
+
+<property>
+ <name>hive.tez.input.format</name>
+ <value>org.apache.hadoop.hive.ql.io.HiveInputFormat</value>
+ <description>The default input format for tez. Tez groups splits in the AM.</description>
+</property>
+
+<property>
+ <name>hive.exec.scratchdir</name>
+ <value>${test.tmp.dir}/scratchdir</value>
+ <description>Scratch space for Hive jobs</description>
+</property>
+
+<property>
+ <name>datanucleus.schema.autoCreateAll</name>
+ <value>true</value>
+</property>
+
+<property>
+ <name>datanucleus.connectionPool.maxPoolSize</name>
+ <value>4</value>
+</property>
+
+<property>
+ <name>hive.exec.local.scratchdir</name>
+ <value>${test.tmp.dir}/localscratchdir/</value>
+ <description>Local scratch space for Hive jobs</description>
+</property>
+
+<property>
+ <name>javax.jdo.option.ConnectionURL</name>
+ <value>jdbc:derby:memory:${test.tmp.dir}/junit_metastore_db;create=true</value>
+</property>
+
+<property>
+ <name>hive.metastore.schema.verification</name>
+ <value>false</value>
+</property>
+
+<property>
+ <name>javax.jdo.option.ConnectionDriverName</name>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+</property>
+
+<property>
+ <name>javax.jdo.option.ConnectionUserName</name>
+ <value>APP</value>
+</property>
+
+<property>
+ <name>javax.jdo.option.ConnectionPassword</name>
+ <value>mine</value>
+</property>
+
+<property>
+ <!-- this should eventually be deprecated since the metastore should supply this -->
+ <name>hive.metastore.warehouse.dir</name>
+ <value>${test.warehouse.dir}</value>
+ <description></description>
+</property>
+
+<property>
+ <name>hive.metastore.metadb.dir</name>
+ <value>file://${test.tmp.dir}/metadb/</value>
+ <description>
+ Required by metastore server or if the uris argument below is not supplied
+ </description>
+</property>
+
+<property>
+ <name>test.log.dir</name>
+ <value>${test.tmp.dir}/log/</value>
+ <description></description>
+</property>
+
+<property>
+ <name>test.data.files</name>
+ <value>${hive.root}/data/files</value>
+ <description></description>
+</property>
+
+<property>
+ <name>test.data.scripts</name>
+ <value>${hive.root}/data/scripts</value>
+ <description></description>
+</property>
+
+<property>
+ <name>hive.jar.path</name>
+ <value>${maven.local.repository}/org/apache/hive/hive-exec/${hive.version}/hive-exec-${hive.version}.jar</value>
+ <description></description>
+</property>
+
+<property>
+ <name>hive.metastore.rawstore.impl</name>
+ <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
+ <description>Name of the class that implements org.apache.hadoop.hive.metastore.rawstore interface. This class is used to store and retrieval of raw metadata objects such as table, database</description>
+</property>
+
+<property>
+ <name>hive.querylog.location</name>
+ <value>${test.tmp.dir}/tmp</value>
+ <description>Location of the structured hive logs</description>
+</property>
+
+<property>
+ <name>hive.exec.pre.hooks</name>
+ <value>org.apache.hadoop.hive.ql.hooks.PreExecutePrinter, org.apache.hadoop.hive.ql.hooks.EnforceReadOnlyTables</value>
+ <description>Pre Execute Hook for Tests</description>
+</property>
+
+<property>
+ <name>hive.exec.post.hooks</name>
+ <value>org.apache.hadoop.hive.ql.hooks.PostExecutePrinter</value>
+ <description>Post Execute Hook for Tests</description>
+</property>
+
+<property>
+ <name>hive.support.concurrency</name>
+ <value>false</value>
+ <description>Whether hive supports concurrency or not. A zookeeper instance must be up and running for the default hive lock manager to support read-write locks.</description>
+</property>
+
+<property>
+ <name>fs.pfile.impl</name>
+ <value>org.apache.hadoop.fs.ProxyLocalFileSystem</value>
+ <description>A proxy for local file system used for cross file system testing</description>
+</property>
+
+<property>
+ <name>hive.exec.mode.local.auto</name>
+ <value>false</value>
+ <description>
+ Let hive determine whether to run in local mode automatically
+ Disabling this for tests so that minimr is not affected
+ </description>
+</property>
+
+<property>
+ <name>hive.auto.convert.join</name>
+ <value>false</value>
+ <description>Whether Hive enable the optimization about converting common join into mapjoin based on the input file size</description>
+</property>
+
+<property>
+ <name>hive.ignore.mapjoin.hint</name>
+ <value>true</value>
+ <description>Whether Hive ignores the mapjoin hint</description>
+</property>
+
+<property>
+ <name>io.sort.mb</name>
+ <value>10</value>
+</property>
+
+<property>
+ <name>hive.input.format</name>
+ <value>org.apache.hadoop.hive.ql.io.CombineHiveInputFormat</value>
+ <description>The default input format, if it is not specified, the system assigns it. It is set to HiveInputFormat for hadoop versions 17, 18 and 19, whereas it is set to CombineHiveInputFormat for hadoop 20. The user can always overwrite it - if there is a bug in CombineHiveInputFormat, it can always be manually set to HiveInputFormat. </description>
+</property>
+
+<property>
+ <name>hive.default.rcfile.serde</name>
+ <value>org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe</value>
+ <description>The default SerDe hive will use for the rcfile format</description>
+</property>
+
+<property>
+ <name>hive.stats.dbclass</name>
+ <value>fs</value>
+ <description>The default storatge that stores temporary hive statistics. Currently, fs type is supported</description>
+</property>
+
+<property>
+ <name>hive.stats.fetch.column.stats</name>
+ <value>true</value>
+ <description>Use column stats to annotate stats for physical optimization phase</description>
+</property>
+
+<property>
+ <name>hive.execution.engine</name>
+ <value>tez</value>
+ <description>Whether to use MR or Tez</description>
+</property>
+
+<property>
+ <name>tez.am.node-blacklisting.enabled</name>
+ <value>false</value>
+</property>
+
+<property>
+ <name>hive.prewarm.enabled</name>
+ <value>true</value>
+ <description>
+ Enables container prewarm for tez (hadoop 2 only)
+ </description>
+</property>
+
+<property>
+ <name>hive.prewarm.numcontainers</name>
+ <value>3</value>
+ <description>
+ Controls the number of containers to prewarm for tez (hadoop 2 only)
+ </description>
+</property>
+
+<property>
+ <name>hive.in.tez.test</name>
+ <value>true</value>
+ <description>
+ Indicates that we are in tez testing mode.
+ </description>
+</property>
+
+<property>
+ <name>hive.tez.java.opts</name>
+ <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+</property>
+
+<property>
+ <name>tez.am.launch.cmd-opts</name>
+ <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+</property>
+
+<property>
+ <name>hive.orc.splits.ms.footer.cache.enabled</name>
+ <value>true</value>
+</property>
+
+<property>
+ <name>hive.join.inner.residual</name>
+ <value>true</value>
+</property>
+
+<property>
+ <name>hive.stats.fetch.bitvector</name>
+ <value>true</value>
+</property>
+
+<property>
+ <name>hive.tez.cartesian-product.enabled</name>
+ <value>true</value>
+</property>
+
+<property>
+ <name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage</name>
+ <value>99</value>
+</property>
+
+<property>
+ <name>hive.query.results.cache.enabled</name>
+ <value>false</value>
+</property>
+
+<property>
+ <name>hive.query.reexecution.stats.persist.scope</name>
+ <value>query</value>
+</property>
+
+<property>
+ <name>hive.cbo.fallback.strategy</name>
+ <value>TEST</value>
+</property>
+
+</configuration>
diff --git a/data/conf/iceberg/tez-site.xml b/data/conf/iceberg/tez-site.xml
new file mode 100644
index 0000000..c575544
--- /dev/null
+++ b/data/conf/iceberg/tez-site.xml
@@ -0,0 +1,10 @@
+<configuration>
+ <property>
+ <name>tez.am.resource.memory.mb</name>
+ <value>128</value>
+ </property>
+ <property>
+ <name>tez.am.dag.scheduler.class</name>
+ <value>org.apache.tez.dag.app.dag.impl.DAGSchedulerNaturalOrderControlled</value>
+ </property>
+</configuration>
diff --git a/iceberg/iceberg-handler/src/test/queries/negative/create_iceberg_table_failure.q b/iceberg/iceberg-handler/src/test/queries/negative/create_iceberg_table_failure.q
new file mode 100644
index 0000000..04f0e4e
--- /dev/null
+++ b/iceberg/iceberg-handler/src/test/queries/negative/create_iceberg_table_failure.q
@@ -0,0 +1,2 @@
+set hive.vectorized.execution.enabled=true;
+CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler';
\ No newline at end of file
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q
new file mode 100644
index 0000000..9a2970b
--- /dev/null
+++ b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q
@@ -0,0 +1,4 @@
+set hive.vectorized.execution.enabled=false;
+CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler';
+DESCRIBE FORMATTED ice_t;
+DROP TABLE ice_t;
diff --git a/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_failure.q.out b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_failure.q.out
new file mode 100644
index 0000000..cc096bc
--- /dev/null
+++ b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_failure.q.out
@@ -0,0 +1,5 @@
+PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@ice_t
+FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DDLTask. java.lang.UnsupportedOperationException: Vectorized execution on Tez is currently not supported when using Iceberg tables. Please set hive.vectorized.execution.enabled=false and rerun the query.
diff --git a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
new file mode 100644
index 0000000..9e29814
--- /dev/null
+++ b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
@@ -0,0 +1,57 @@
+PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@ice_t
+POSTHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@ice_t
+PREHOOK: query: DESCRIBE FORMATTED ice_t
+PREHOOK: type: DESCTABLE
+PREHOOK: Input: default@ice_t
+POSTHOOK: query: DESCRIBE FORMATTED ice_t
+POSTHOOK: type: DESCTABLE
+POSTHOOK: Input: default@ice_t
+# col_name data_type comment
+i int from deserializer
+s string from deserializer
+ts timestamp from deserializer
+d date from deserializer
+
+# Detailed Table Information
+Database: default
+#### A masked pattern was here ####
+Retention: 0
+#### A masked pattern was here ####
+Table Type: EXTERNAL_TABLE
+Table Parameters:
+ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"d\":\"true\",\"i\":\"true\",\"s\":\"true\",\"ts\":\"true\"}}
+ EXTERNAL TRUE
+ bucketing_version 2
+ engine.hive.enabled true
+ external.table.purge TRUE
+ metadata_location hdfs://### HDFS PATH ###
+ numFiles 0
+ numRows 0
+ rawDataSize 0
+ storage_handler org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
+ table_type ICEBERG
+ totalSize 0
+#### A masked pattern was here ####
+
+# Storage Information
+SerDe Library: org.apache.iceberg.mr.hive.HiveIcebergSerDe
+InputFormat: org.apache.iceberg.mr.hive.HiveIcebergInputFormat
+OutputFormat: org.apache.iceberg.mr.hive.HiveIcebergOutputFormat
+Compressed: No
+Num Buckets: 0
+Bucket Columns: []
+Sort Columns: []
+PREHOOK: query: DROP TABLE ice_t
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@ice_t
+PREHOOK: Output: default@ice_t
+POSTHOOK: query: DROP TABLE ice_t
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: default@ice_t
diff --git a/itests/pom.xml b/itests/pom.xml
index b59df82..19f0914 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -250,6 +250,17 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-iceberg-handler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-iceberg-handler</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc-handler</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index fcc6d62..e2e93fd 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -125,6 +125,11 @@
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
+ <artifactId>hive-iceberg-handler</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
<artifactId>kafka-handler</artifactId>
<scope>test</scope>
<exclusions>
@@ -539,6 +544,8 @@
<mkdir dir="${project.build.directory}/qfile-results/contribnegative"/>
<mkdir dir="${project.build.directory}/qfile-results/contribclientpositive"/>
<mkdir dir="${project.build.directory}/qfile-results/contribclientnegative"/>
+ <mkdir dir="${project.build.directory}/qfile-results/iceberg-handler/positive/"/>
+ <mkdir dir="${project.build.directory}/qfile-results/iceberg-handler/negative/"/>
</target>
</configuration>
<goals>
diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergCliDriver.java
new file mode 100644
index 0000000..8bc1d94
--- /dev/null
+++ b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergCliDriver.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.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 TestIcebergCliDriver {
+
+ static CliAdapter adapter = new CliConfigs.IcebergCliConfig().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 TestIcebergCliDriver(String name, File qfile) {
+ this.name = name;
+ this.qfile = qfile;
+ }
+
+ @Test
+ public void testCliDriver() throws Exception {
+ adapter.runTest(name, qfile);
+ }
+}
diff --git a/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergNegativeCliDriver.java b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergNegativeCliDriver.java
new file mode 100644
index 0000000..adbc0a2
--- /dev/null
+++ b/itests/qtest/src/test/java/org/apache/hadoop/hive/cli/TestIcebergNegativeCliDriver.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 TestIcebergNegativeCliDriver {
+
+ static CliAdapter adapter = new CliConfigs.IcebergNegativeCliConfig().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 TestIcebergNegativeCliDriver(String name, File qfile) {
+ this.name = name;
+ this.qfile = qfile;
+ }
+
+ @Test
+ public void testCliDriver() throws Exception {
+ adapter.runTest(name, qfile);
+ }
+}
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index c242bd4..249107d 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -756,4 +756,40 @@
}
}
}
+
+ public static class IcebergCliConfig extends AbstractCliConfig {
+
+ public IcebergCliConfig() {
+ super(CoreCliDriver.class);
+ try {
+ setQueryDir("iceberg/iceberg-handler/src/test/queries/positive");
+ setResultsDir("iceberg/iceberg-handler/src/test/results/positive");
+ setLogDir("itests/qtest/target/qfile-results/iceberg-handler/positive");
+ setInitScript("q_test_init_tez.sql");
+ setCleanupScript("q_test_cleanup_tez.sql");
+ setHiveConfDir("data/conf/iceberg");
+ setClusterType(MiniClusterType.TEZ);
+ } catch (Exception e) {
+ throw new RuntimeException("can't contruct cliconfig", e);
+ }
+ }
+ }
+
+ public static class IcebergNegativeCliConfig extends AbstractCliConfig {
+
+ public IcebergNegativeCliConfig() {
+ super(CoreNegativeCliDriver.class);
+ try {
+ setQueryDir("iceberg/iceberg-handler/src/test/queries/negative");
+ setResultsDir("iceberg/iceberg-handler/src/test/results/negative");
+ setLogDir("itests/qtest/target/qfile-results/iceberg-handler/negative");
+ setInitScript("q_test_init_tez.sql");
+ setCleanupScript("q_test_cleanup_tez.sql");
+ setHiveConfDir("data/conf/iceberg");
+ setClusterType(MiniClusterType.TEZ);
+ } catch (Exception e) {
+ throw new RuntimeException("can't construct cliconfig", e);
+ }
+ }
+ }
}
diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
index 5501988..5e8430a 100644
--- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
+++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -1360,6 +1360,8 @@
HIVE_IN_TEST("hive.in.test", "hive.in.test", false, "internal usage only, true in test mode"),
HIVE_IN_TEZ_TEST("hive.in.tez.test", "hive.in.tez.test", false,
"internal use only, true when in testing tez"),
+ HIVE_IN_TEST_ICEBERG("hive.in.iceberg.test", "hive.in.iceberg.test", false,
+ "internal usage only, true when testing iceberg"),
// We need to track this as some listeners pass it through our config and we need to honor
// the system properties.
HIVE_AUTHORIZATION_MANAGER("hive.security.authorization.manager",
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index b92d0bb..cb05378 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -2941,7 +2941,9 @@
try (PreparedStatement pstmt = dbConn.prepareStatement(insertLocksQuery)) {
for (LockComponent lc : rqst.getComponent()) {
if (lc.isSetOperationType() && lc.getOperationType() == DataOperationType.UNSET &&
- (MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST) || MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEZ_TEST))) {
+ ((MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST) ||
+ MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEZ_TEST)) &&
+ !MetastoreConf.getBoolVar(conf, ConfVars.HIVE_IN_TEST_ICEBERG))) {
//Old version of thrift client should have (lc.isSetOperationType() == false), but they do not
//If you add a default value to a variable, isSet() for that variable is true regardless of the where the
//message was created (for object variables).
