diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java similarity index 79% rename from testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java rename to testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java index fc01e08bc691..51357d20ca55 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/AbstractHiveCostBasedPlanTest.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseCostBasedPlanTest.java @@ -21,11 +21,6 @@ import io.trino.execution.warnings.WarningCollector; import io.trino.metadata.TableHandle; import io.trino.metadata.TableMetadata; -import io.trino.plugin.hive.RecordingMetastoreConfig; -import io.trino.plugin.hive.TestingHiveConnectorFactory; -import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore; -import io.trino.plugin.hive.metastore.recording.HiveMetastoreRecording; -import io.trino.plugin.hive.metastore.recording.RecordingHiveMetastore; import io.trino.spi.connector.ConnectorFactory; import io.trino.sql.planner.OptimizerConfig.JoinDistributionType; import io.trino.sql.planner.OptimizerConfig.JoinReorderingStrategy; @@ -40,25 +35,23 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; -import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; +import java.util.List; +import java.util.stream.IntStream; import java.util.stream.Stream; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; -import static com.google.common.collect.MoreCollectors.onlyElement; +import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.io.Files.createParentDirs; import static com.google.common.io.Files.write; import static com.google.common.io.Resources.getResource; import static io.trino.Session.SessionBuilder; import static io.trino.SystemSessionProperties.JOIN_DISTRIBUTION_TYPE; import static io.trino.SystemSessionProperties.JOIN_REORDERING_STRATEGY; -import static io.trino.plugin.hive.metastore.recording.TestRecordingHiveMetastore.createJsonCodec; import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED; import static io.trino.sql.planner.plan.JoinNode.DistributionType.REPLICATED; import static io.trino.sql.planner.plan.JoinNode.Type.INNER; @@ -72,15 +65,26 @@ import static java.util.stream.Collectors.joining; import static org.testng.Assert.assertEquals; -public abstract class AbstractHiveCostBasedPlanTest +public abstract class BaseCostBasedPlanTest extends BasePlanTest { + public static final List TPCH_SQL_FILES = IntStream.rangeClosed(1, 22) + .mapToObj(i -> format("q%02d", i)) + .map(queryId -> format("/sql/presto/tpch/%s.sql", queryId)) + .collect(toImmutableList()); + + public static final List TPCDS_SQL_FILES = IntStream.range(1, 100) + .mapToObj(i -> format("q%02d", i)) + .map(queryId -> format("/sql/presto/tpcds/%s.sql", queryId)) + .collect(toImmutableList()); + + private static final String CATALOG_NAME = "local"; + @Override protected LocalQueryRunner createLocalQueryRunner() { - String catalog = "local"; SessionBuilder sessionBuilder = testSessionBuilder() - .setCatalog(catalog) + .setCatalog(CATALOG_NAME) .setSchema(getSchema()) .setSystemProperty("task_concurrency", "1") // these tests don't handle exchanges from local parallel .setSystemProperty(JOIN_REORDERING_STRATEGY, JoinReorderingStrategy.AUTOMATIC.name()) @@ -89,56 +93,15 @@ protected LocalQueryRunner createLocalQueryRunner() .withNodeCountForStats(8) .build(); queryRunner.createCatalog( - catalog, + CATALOG_NAME, createConnectorFactory(), ImmutableMap.of()); return queryRunner; } - protected ConnectorFactory createConnectorFactory() - { - RecordingMetastoreConfig recordingConfig = new RecordingMetastoreConfig() - .setRecordingPath(getRecordingPath()) - .setReplay(true); - try { - // The RecordingHiveMetastore loads the metadata files generated through HiveMetadataRecorder - // which essentially helps to generate the optimal query plans for validation purposes. These files - // contains all the metadata including statistics. - RecordingHiveMetastore metastore = new RecordingHiveMetastore( - new UnimplementedHiveMetastore(), - new HiveMetastoreRecording(recordingConfig, createJsonCodec())); - return new TestingHiveConnectorFactory(metastore); - } - catch (IOException e) { - throw new UncheckedIOException(e); - } - } - - private String getSchema() - { - String fileName = Paths.get(getRecordingPath()).getFileName().toString(); - return fileName.split("\\.")[0]; - } - - private String getRecordingPath() - { - URL resource = getClass().getResource(getMetadataDir()); - if (resource == null) { - throw new RuntimeException("Hive metadata directory doesn't exist: " + getMetadataDir()); - } - - File[] files = new File(resource.getPath()).listFiles(); - if (files == null) { - throw new RuntimeException("Hive metadata recording file doesn't exist in directory: " + getMetadataDir()); - } - - return Arrays.stream(files) - .filter(f -> !f.isDirectory()) - .collect(onlyElement()) - .getPath(); - } + protected abstract ConnectorFactory createConnectorFactory(); - protected abstract String getMetadataDir(); + protected abstract String getSchema(); protected abstract Stream getQueryResourcePaths(); @@ -157,9 +120,10 @@ public void test(String queryResourcePath) private String getQueryPlanResourcePath(String queryResourcePath) { + String connectorName = getQueryRunner().getCatalogManager().getCatalog(CATALOG_NAME).orElseThrow().getConnectorName(); String subDir = isPartitioned() ? "partitioned" : "unpartitioned"; - java.nio.file.Path tempPath = Paths.get(queryResourcePath.replaceAll("\\.sql$", ".plan.txt")); - return Paths.get(tempPath.getParent().toString(), subDir, tempPath.getFileName().toString()).toString(); + Path tempPath = Paths.get(queryResourcePath.replaceAll("\\.sql$", ".plan.txt")); + return Paths.get(tempPath.getParent().toString(), connectorName, subDir, tempPath.getFileName().toString()).toString(); } protected abstract boolean isPartitioned(); @@ -201,7 +165,7 @@ public static String readQuery(String resource) private static String read(String resource) { try { - return Resources.toString(getResource(AbstractHiveCostBasedPlanTest.class, resource), UTF_8); + return Resources.toString(getResource(BaseCostBasedPlanTest.class, resource), UTF_8); } catch (IOException e) { throw new UncheckedIOException(e); diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java new file mode 100644 index 000000000000..36f0246717fc --- /dev/null +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/BaseHiveCostBasedPlanTest.java @@ -0,0 +1,83 @@ +/* + * 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.sql.planner; + +import io.trino.plugin.hive.RecordingMetastoreConfig; +import io.trino.plugin.hive.TestingHiveConnectorFactory; +import io.trino.plugin.hive.metastore.UnimplementedHiveMetastore; +import io.trino.plugin.hive.metastore.recording.HiveMetastoreRecording; +import io.trino.plugin.hive.metastore.recording.RecordingHiveMetastore; +import io.trino.spi.connector.ConnectorFactory; + +import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.URL; +import java.nio.file.Paths; +import java.util.Arrays; + +import static com.google.common.collect.MoreCollectors.onlyElement; +import static io.trino.plugin.hive.metastore.recording.TestRecordingHiveMetastore.createJsonCodec; + +public abstract class BaseHiveCostBasedPlanTest + extends BaseCostBasedPlanTest +{ + @Override + protected ConnectorFactory createConnectorFactory() + { + RecordingMetastoreConfig recordingConfig = new RecordingMetastoreConfig() + .setRecordingPath(getRecordingPath()) + .setReplay(true); + try { + // The RecordingHiveMetastore loads the metadata files generated through HiveMetadataRecorder + // which essentially helps to generate the optimal query plans for validation purposes. These files + // contain all the metadata including statistics. + RecordingHiveMetastore metastore = new RecordingHiveMetastore( + new UnimplementedHiveMetastore(), + new HiveMetastoreRecording(recordingConfig, createJsonCodec())); + return new TestingHiveConnectorFactory(metastore); + } + catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @Override + protected String getSchema() + { + String fileName = Paths.get(getRecordingPath()).getFileName().toString(); + return fileName.split("\\.")[0]; + } + + private String getRecordingPath() + { + URL resource = getClass().getResource(getMetadataDir()); + if (resource == null) { + throw new RuntimeException("Hive metadata directory doesn't exist: " + getMetadataDir()); + } + + File[] files = new File(resource.getPath()).listFiles(); + if (files == null) { + throw new RuntimeException("Hive metadata recording file doesn't exist in directory: " + getMetadataDir()); + } + + return Arrays.stream(files) + .filter(f -> !f.isDirectory()) + .collect(onlyElement()) + .getPath(); + } + + protected abstract String getMetadataDir(); +} diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java index 37951fad1bca..5791e87af4dd 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/HiveMetadataRecorder.java @@ -106,14 +106,14 @@ public static void main(String[] args) TPCH_METADATA_DIR, "tpch_sf1000_orc", PARTITIONED_TPCH_METADATA_DIR, "tpch_sf1000_orc_part"), TPCH_SQL_FILES.stream() - .map(AbstractHiveCostBasedPlanTest::readQuery) + .map(BaseHiveCostBasedPlanTest::readQuery) .collect(toImmutableList())); recordMetadata( ImmutableMap.of( TPCDS_METADATA_DIR, "tpcds_sf1000_orc", PARTITIONED_TPCDS_METADATA_DIR, "tpcds_sf1000_orc_part"), TPCDS_SQL_FILES.stream() - .map(AbstractHiveCostBasedPlanTest::readQuery) + .map(BaseHiveCostBasedPlanTest::readQuery) .collect(toImmutableList())); } diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java index f4e60a2deaca..889a4b373e6f 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpcdsCostBasedPlan.java @@ -15,14 +15,12 @@ import java.util.stream.Stream; -import static io.trino.sql.planner.TestHiveTpcdsCostBasedPlan.TPCDS_SQL_FILES; - /** * This class tests cost-based optimization rules related to joins. It contains unmodified TPCDS queries. * This class is using Hive connector with mocked in memory thrift metastore with partitioned TPCDS tables. */ public class TestHivePartitionedTpcdsCostBasedPlan - extends AbstractHiveCostBasedPlanTest + extends BaseHiveCostBasedPlanTest { /* * CAUTION: The expected plans here are not necessarily optimal yet. Their role is to prevent diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java index 6df1e78f35bf..45efe4ed691a 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHivePartitionedTpchCostBasedPlan.java @@ -15,14 +15,12 @@ import java.util.stream.Stream; -import static io.trino.sql.planner.TestHiveTpchCostBasedPlan.TPCH_SQL_FILES; - /** * This class tests cost-based optimization rules related to joins. It contains unmodified TPCH queries. * This class is using Hive connector with mocked in memory thrift metastore with partitioned TPCH tables. */ public class TestHivePartitionedTpchCostBasedPlan - extends AbstractHiveCostBasedPlanTest + extends BaseHiveCostBasedPlanTest { /* * CAUTION: The expected plans here are not necessarily optimal yet. Their role is to prevent diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java index 7b49b3a72a51..e18e3c5214d0 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpcdsCostBasedPlan.java @@ -14,19 +14,14 @@ package io.trino.sql.planner; -import java.util.List; -import java.util.stream.IntStream; import java.util.stream.Stream; -import static com.google.common.collect.ImmutableList.toImmutableList; -import static java.lang.String.format; - /** * This class tests cost-based optimization rules related to joins. It contains unmodified TPCDS queries. * This class is using Hive connector with mocked in memory thrift metastore with un-partitioned TPCDS tables. */ public class TestHiveTpcdsCostBasedPlan - extends AbstractHiveCostBasedPlanTest + extends BaseHiveCostBasedPlanTest { /* * CAUTION: The expected plans here are not necessarily optimal yet. Their role is to prevent @@ -36,10 +31,6 @@ public class TestHiveTpcdsCostBasedPlan */ public static final String TPCDS_METADATA_DIR = "/hive_metadata/unpartitioned_tpcds"; - public static final List TPCDS_SQL_FILES = IntStream.range(1, 100) - .mapToObj(i -> format("q%02d", i)) - .map(queryId -> format("/sql/presto/tpcds/%s.sql", queryId)) - .collect(toImmutableList()); @Override protected String getMetadataDir() diff --git a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java index 9c0c6de72f8a..0d8f69841120 100644 --- a/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java +++ b/testing/trino-tests/src/test/java/io/trino/sql/planner/TestHiveTpchCostBasedPlan.java @@ -14,19 +14,14 @@ package io.trino.sql.planner; -import java.util.List; -import java.util.stream.IntStream; import java.util.stream.Stream; -import static com.google.common.collect.ImmutableList.toImmutableList; -import static java.lang.String.format; - /** * This class tests cost-based optimization rules related to joins. It contains unmodified TPCH queries. * This class is using Hive connector with mocked in memory thrift metastore with un-partitioned TPCH tables. */ public class TestHiveTpchCostBasedPlan - extends AbstractHiveCostBasedPlanTest + extends BaseHiveCostBasedPlanTest { /* * CAUTION: The expected plans here are not necessarily optimal yet. Their role is to prevent @@ -36,10 +31,6 @@ public class TestHiveTpchCostBasedPlan */ public static final String TPCH_METADATA_DIR = "/hive_metadata/unpartitioned_tpch"; - public static final List TPCH_SQL_FILES = IntStream.rangeClosed(1, 22) - .mapToObj(i -> format("q%02d", i)) - .map(queryId -> format("/sql/presto/tpch/%s.sql", queryId)) - .collect(toImmutableList()); @Override protected String getMetadataDir() diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q01.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q01.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q02.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q02.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q03.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q03.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q04.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q04.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q05.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q05.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q06.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q06.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q07.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q07.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q08.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q08.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q09.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q09.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q10.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q10.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q11.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q11.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q12.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q12.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q13.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q13.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q14.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q14.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q15.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q15.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q16.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q16.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q17.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q17.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q18.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q18.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q19.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q19.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q20.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q20.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q21.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q21.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q22.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q22.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q23.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q23.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q24.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q24.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q25.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q25.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q26.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q26.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q27.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q27.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q28.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q28.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q28.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q29.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q29.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q30.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q30.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q31.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q31.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q32.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q32.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q33.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q33.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q34.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q34.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q35.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q35.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q36.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q36.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q37.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q37.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q38.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q38.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q39.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q39.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q40.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q40.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q41.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q41.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q42.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q42.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q43.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q43.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q44.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q44.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q44.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q45.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q45.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q46.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q46.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q47.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q47.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q48.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q48.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q49.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q49.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q50.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q50.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q51.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q51.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q52.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q52.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q53.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q53.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q54.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q54.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q55.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q55.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q56.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q56.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q57.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q57.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q58.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q58.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q59.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q59.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q60.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q60.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q61.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q61.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q62.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q62.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q63.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q63.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q64.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q64.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q65.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q65.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q66.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q66.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q67.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q67.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q68.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q68.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q69.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q69.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q70.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q70.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q71.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q71.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q72.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q72.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q73.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q73.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q74.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q74.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q75.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q75.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q76.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q76.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q77.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q77.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q78.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q78.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q79.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q79.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q80.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q80.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q81.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q81.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q82.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q82.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q83.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q83.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q84.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q84.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q85.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q85.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q86.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q86.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q87.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q87.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q88.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q88.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q89.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q89.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q90.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q90.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q91.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q91.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q92.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q92.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q93.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q93.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q94.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q94.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q95.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q95.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q96.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q96.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q97.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q97.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q98.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q98.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/partitioned/q99.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/partitioned/q99.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q01.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q01.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q02.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q02.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q03.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q03.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q04.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q04.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q05.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q05.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q06.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q06.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q07.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q07.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q08.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q08.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q09.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q09.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q10.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q10.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q11.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q11.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q12.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q12.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q13.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q13.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q14.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q14.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q15.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q15.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q16.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q16.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q17.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q17.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q18.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q18.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q19.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q19.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q20.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q20.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q21.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q21.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q22.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q22.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q23.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q23.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q24.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q24.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q25.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q25.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q26.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q26.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q27.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q27.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q28.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q28.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q28.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q29.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q29.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q30.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q30.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q31.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q31.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q32.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q32.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q33.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q33.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q34.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q34.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q35.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q35.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q36.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q36.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q37.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q37.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q38.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q38.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q39.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q39.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q40.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q40.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q41.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q41.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q42.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q42.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q43.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q43.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q44.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q44.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q44.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q45.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q45.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q46.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q46.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q47.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q47.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q48.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q48.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q49.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q49.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q50.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q50.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q51.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q51.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q52.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q52.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q53.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q53.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q54.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q54.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q55.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q55.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q56.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q56.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q57.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q57.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q58.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q58.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q59.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q59.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q60.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q60.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q61.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q61.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q62.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q62.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q63.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q63.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q64.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q64.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q65.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q65.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q66.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q66.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q67.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q67.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q68.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q68.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q69.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q69.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q70.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q70.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q71.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q71.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q72.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q72.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q73.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q73.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q74.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q74.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q75.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q75.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q76.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q76.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q77.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q77.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q78.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q78.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q79.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q79.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q80.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q80.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q81.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q81.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q82.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q82.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q83.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q83.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q84.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q84.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q85.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q85.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q86.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q86.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q87.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q87.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q88.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q88.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q89.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q89.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q90.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q90.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q91.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q91.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q92.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q92.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q93.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q93.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q94.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q94.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q95.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q95.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q96.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q96.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q97.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q97.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q98.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q98.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpcds/unpartitioned/q99.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpcds/hive/unpartitioned/q99.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q01.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q01.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q01.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q02.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q02.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q03.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q03.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q04.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q04.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q05.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q05.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q06.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q06.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q06.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q07.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q07.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q08.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q08.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q09.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q09.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q10.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q10.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q11.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q11.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q12.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q12.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q13.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q13.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q14.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q14.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q15.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q15.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q16.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q16.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q17.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q17.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q18.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q18.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q19.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q19.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q20.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q20.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q21.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q21.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/partitioned/q22.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/partitioned/q22.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q01.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q01.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q01.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q02.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q02.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q03.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q03.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q04.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q04.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q05.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q05.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q06.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q06.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q06.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q07.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q07.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q08.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q08.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q09.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q09.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q10.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q10.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q11.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q11.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q12.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q12.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q13.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q13.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q14.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q14.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q15.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q15.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q16.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q16.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q17.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q17.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q18.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q18.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q19.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q19.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q20.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q20.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q21.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q21.plan.txt diff --git a/testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt b/testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt similarity index 100% rename from testing/trino-tests/src/test/resources/sql/presto/tpch/unpartitioned/q22.plan.txt rename to testing/trino-tests/src/test/resources/sql/presto/tpch/hive/unpartitioned/q22.plan.txt