Move Hive plan tests off benchmark module to normal tests

pom.xml

@@ -165,6 +165,7 @@
         <module>service/trino-proxy</module>
         <module>service/trino-verifier</module>
         <module>testing/trino-benchmark</module>
+        <module>testing/trino-benchmark-queries</module>
         <module>testing/trino-benchto-benchmarks</module>
         <module>testing/trino-faulttolerant-tests</module>
         <module>testing/trino-plugin-reader</module>
@@ -209,6 +210,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.trino</groupId>
+                <artifactId>trino-benchmark-queries</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.trino</groupId>
                 <artifactId>trino-benchto-benchmarks</artifactId>

testing/trino-benchmark-queries/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.trino</groupId>
+        <artifactId>trino-root</artifactId>
+        <version>399-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>trino-benchmark-queries</artifactId>
+    <name>trino-benchmark-queries</name>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

testing/trino-benchmark-queries/src/test/java/io/trino/benchmark/queries/TestDummy.java

@@ -0,0 +1,22 @@
+/*
+ * Licensed 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 io.trino.benchmark.queries;
+
+import org.testng.annotations.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}

testing/trino-benchto-benchmarks/pom.xml

@@ -13,82 +13,36 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <air.check.fail-dependency>false</air.check.fail-dependency>
         <air.check.fail-duplicate-finder>false</air.check.fail-duplicate-finder>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>io.trino.benchto</groupId>
-            <artifactId>benchto-driver</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
+            <!-- benchmark queries referenced from benchmark definition files -->
             <groupId>io.trino</groupId>
-            <artifactId>trino-jdbc</artifactId>
+            <artifactId>trino-benchmark-queries</artifactId>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
+            <!-- for connecting to Trino when running benchmarks -->
             <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-hive-hadoop2</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-main</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-spi</artifactId>
-            <scope>test</scope>
+            <artifactId>trino-jdbc</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.trino</groupId>
-            <artifactId>trino-testing</artifactId>
-            <scope>test</scope>
+            <!-- provides the main class -->
+            <groupId>io.trino.benchto</groupId>
+            <artifactId>benchto-driver</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
+            <!-- TODO document why we have explicit dependency on Guava -->
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>

testing/trino-benchto-benchmarks/src/test/java/io/trino/benchmarks/TestDummy.java

@@ -0,0 +1,22 @@
+/*
+ * Licensed 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 io.trino.benchmarks;
+
+import org.testng.annotations.Test;
+
+public class TestDummy
+{
+    @Test
+    public void buildRequiresTestToExist() {}
+}

testing/trino-tests/pom.xml

@@ -137,6 +137,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-benchmark-queries</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-blackhole</artifactId>
@@ -155,6 +161,33 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with com.google.protobuf:protobuf-java -->
+                    <groupId>org.alluxio</groupId>
+                    <artifactId>alluxio-shaded-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-hive</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <!-- conflicts with com.google.protobuf:protobuf-java -->
+                    <groupId>org.alluxio</groupId>
+                    <artifactId>alluxio-shaded-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-main</artifactId>
@@ -206,6 +239,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-testing</artifactId>
@@ -285,4 +325,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredResourcePatterns>
+                        <!-- com.amazonaws:aws-java-sdk-core and software.amazon.awssdk:sdk-core MIME type file duplicate-->
+                        <ignoredResourcePattern>mime.types</ignoredResourcePattern>
+                        <ignoredResourcePattern>about.html</ignoredResourcePattern>
+                    </ignoredResourcePatterns>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java → testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java

@@ -229,12 +229,12 @@ protected Path getSourcePath()
         verify(isDirectory(workingDir), "Working directory is not a directory");
         String topDirectoryName = workingDir.getFileName().toString();
         switch (topDirectoryName) {
-            case "trino-benchto-benchmarks":
+            case "trino-tests":
                 return workingDir;
             case "trino":
-                return workingDir.resolve("testing/trino-benchto-benchmarks");
+                return workingDir.resolve("testing/trino-tests");
             default:
-                throw new IllegalStateException("This class must be executed from trino-benchto-benchmarks or Trino source directory");
+                throw new IllegalStateException("This class must be executed from trino-tests or Trino source directory");
         }
     }
 

testing/trino-benchto-benchmarks/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java → testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java

@@ -15,7 +15,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.Session;
-import io.trino.plugin.hive.HivePlugin;
+import io.trino.plugin.hive.TestingHivePlugin;
 import io.trino.testing.DistributedQueryRunner;
 
 import java.nio.file.Path;
@@ -77,7 +77,7 @@ private static DistributedQueryRunner createQueryRunner(String schema, String co
         String recordingPath = getResourcePath(format("%s/%s.json.gz", recordingDir, schema));
         Path.of(recordingPath).toFile().getParentFile().mkdirs();
 
-        queryRunner.installPlugin(new HivePlugin());
+        queryRunner.installPlugin(new TestingHivePlugin());
         queryRunner.createCatalog("hive", "hive", configBuilder
                 .putAll(loadPropertiesFrom(configPath))
                 .put("hive.metastore-recording-path", recordingPath)
@@ -88,7 +88,7 @@ private static DistributedQueryRunner createQueryRunner(String schema, String co
 
     private static String getResourcePath(String relativePath)
     {
-        return Path.of("testing/trino-benchto-benchmarks/src/test/resources", relativePath).toString();
+        return Path.of("testing/trino-tests/src/test/resources", relativePath).toString();
     }
 
     @Override