Skip to content

Ensure TestHiveMerge table names are unique #14695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electrum merged 1 commit into from
Oct 19, 2022
Merged

Ensure TestHiveMerge table names are unique #14695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public class TestHiveMerge
@Test(groups = HIVE_TRANSACTIONAL, timeOut = 60 * 60 * 1000)
public void testMergeSimpleSelect()
{
withTemporaryTable("merge_simple_target", true, false, NONE, targetTable -> {
withTemporaryTable("merge_simple_select_target", true, false, NONE, targetTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true)", targetTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable));

withTemporaryTable("merge_simple_source", true, false, NONE, sourceTable -> {
withTemporaryTable("merge_simple_select_source", true, false, NONE, sourceTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true)", sourceTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable));
Expand All @@ -71,12 +71,12 @@ public void testMergeSimpleSelect()
@Test(groups = HIVE_TRANSACTIONAL, timeOut = 60 * 60 * 1000)
public void testMergeSimpleSelectPartitioned()
{
withTemporaryTable("merge_simple_target", true, true, NONE, targetTable -> {
withTemporaryTable("merge_simple_select_partitioned_target", true, true, NONE, targetTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true, partitioned_by = ARRAY['address'])", targetTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable));

withTemporaryTable("merge_simple_source", true, false, NONE, sourceTable -> {
withTemporaryTable("merge_simple_select_partitioned_source", true, false, NONE, sourceTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true)", sourceTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 6, 'Arches'), ('Ed', 7, 'Etherville'), ('Carol', 9, 'Centreville'), ('Dave', 11, 'Darbyshire')", sourceTable));
Expand All @@ -97,7 +97,7 @@ public void testMergeSimpleSelectPartitioned()
public void testMergeUpdateWithVariousLayouts(boolean partitioned, String bucketing)
{
BucketingType bucketingType = bucketing.isEmpty() ? NONE : BUCKETED_V2;
withTemporaryTable("merge_with_various_formats", true, partitioned, bucketingType, targetTable -> {
withTemporaryTable("merge_update_with_various_formats", true, partitioned, bucketingType, targetTable -> {
StringBuilder builder = new StringBuilder();
builder.append("CREATE TABLE ")
.append(targetTable)
Expand All @@ -113,7 +113,7 @@ public void testMergeUpdateWithVariousLayouts(boolean partitioned, String bucket
onTrino().executeQuery(format("INSERT INTO %s (customer, purchase) VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')", targetTable));
verifySelectForTrinoAndHive("SELECT * FROM " + targetTable, "TRUE", row("Dave", "dates"), row("Lou", "limes"), row("Carol", "candles"));

withTemporaryTable("merge_simple_source", true, false, NONE, sourceTable -> {
withTemporaryTable("merge_update_with_various_formats_source", true, false, NONE, sourceTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (transactional = true)", sourceTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchase) VALUES ('Craig', 'candles'), ('Len', 'limes'), ('Joe', 'jellybeans')", sourceTable));
Expand All @@ -133,13 +133,13 @@ public void testMergeUpdateWithVariousLayouts(boolean partitioned, String bucket
@Test(groups = HIVE_TRANSACTIONAL, timeOut = TEST_TIMEOUT)
public void testMergeUnBucketedUnPartitionedFailure()
{
withTemporaryTable("merge_with_various_formats", true, false, NONE, targetTable -> {
withTemporaryTable("merge_with_various_formats_failure", true, false, NONE, targetTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (transactional = true)", targetTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchase) VALUES ('Dave', 'dates'), ('Lou', 'limes'), ('Carol', 'candles')", targetTable));
verifySelectForTrinoAndHive("SELECT * FROM " + targetTable, "TRUE", row("Dave", "dates"), row("Lou", "limes"), row("Carol", "candles"));

withTemporaryTable("merge_simple_source", true, false, NONE, sourceTable -> {
withTemporaryTable("merge_with_various_formats_failure_source", true, false, NONE, sourceTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchase VARCHAR) WITH (transactional = true)", sourceTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchase) VALUES ('Craig', 'candles'), ('Len', 'limes'), ('Joe', 'jellybeans')", sourceTable));
Expand Down Expand Up @@ -263,7 +263,7 @@ private List<QueryAssert.Row> getRowsFromQueryResult(QueryResult result)
@Test(groups = HIVE_TRANSACTIONAL, timeOut = 60 * 60 * 1000)
public void testMergeSimpleQuery()
{
withTemporaryTable("merge_simple_target", true, false, NONE, targetTable -> {
withTemporaryTable("merge_simple_query_target", true, false, NONE, targetTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true)", targetTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable));
Expand Down Expand Up @@ -301,7 +301,7 @@ public void testMergeAllInserts()
@Test(groups = HIVE_TRANSACTIONAL, timeOut = 60 * 60 * 1000)
public void testMergeSimpleQueryPartitioned()
{
withTemporaryTable("merge_simple_target", true, true, NONE, targetTable -> {
withTemporaryTable("merge_simple_query_partitioned_target", true, true, NONE, targetTable -> {
onTrino().executeQuery(format("CREATE TABLE %s (customer VARCHAR, purchases INT, address VARCHAR) WITH (transactional = true, partitioned_by = ARRAY['address'])", targetTable));

onTrino().executeQuery(format("INSERT INTO %s (customer, purchases, address) VALUES ('Aaron', 5, 'Antioch'), ('Bill', 7, 'Buena'), ('Carol', 3, 'Cambridge'), ('Dave', 11, 'Devon')", targetTable));
Expand Down