Skip to content

Run id column mapping tests in OSS Delta Lake #16055

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
ebyhr merged 3 commits into from
Feb 15, 2023
Merged

Run id column mapping tests in OSS Delta Lake #16055

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db26bbd
Add missing delta. prefix to checkpointInterval
ebyhr Feb 15, 2023
81cd871
Run id column mapping tests in OSS Delta Lake
ebyhr Feb 15, 2023
f9a88e2
Merge column mapping product tests
ebyhr Feb 15, 2023
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
142 changes: 28 additions & 114 deletions ...-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.google.common.collect.ImmutableList;
import io.trino.tempto.assertions.QueryAssert.Row;
import io.trino.testng.services.Flaky;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import java.util.List;
Expand Down Expand Up @@ -66,21 +67,9 @@ public void testColumnMappingModeNone()
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeId()
{
testColumnMappingMode("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeName()
{
testColumnMappingMode("name");
}

private void testColumnMappingMode(String mode)
public void testColumnMappingMode(String mode)
{
String tableName = "test_dl_column_mapping_mode_name_" + randomNameSuffix();

Expand Down Expand Up @@ -137,21 +126,9 @@ private void testColumnMappingMode(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeNameWithNonLowerCaseColumnId()
{
testColumnMappingModeNameWithNonLowerCaseColumn("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeNameWithNonLowerCaseColumnName()
{
testColumnMappingModeNameWithNonLowerCaseColumn("name");
}

private void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
public void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
{
String tableName = "test_dl_column_mapping_mode_name_non_loewr_case_" + randomNameSuffix();

Expand Down Expand Up @@ -185,21 +162,9 @@ private void testColumnMappingModeNameWithNonLowerCaseColumn(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeIdAddColumn()
{
testColumnMappingModeAddColumn("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testColumnMappingModeNameAddColumn()
{
testColumnMappingModeAddColumn("name");
}

private void testColumnMappingModeAddColumn(String mode)
public void testColumnMappingModeAddColumn(String mode)
{
String tableName = "test_dl_column_mapping_mode_add_column_" + randomNameSuffix();

Expand Down Expand Up @@ -256,21 +221,9 @@ private void testColumnMappingModeAddColumn(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsFromJsonForColumnMappingModeId()
{
testShowStatsFromJsonForColumnMappingMode("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsFromJsonForColumnMappingModeName()
{
testShowStatsFromJsonForColumnMappingMode("name");
}

private void testShowStatsFromJsonForColumnMappingMode(String mode)
public void testShowStatsFromJsonForColumnMappingMode(String mode)
{
String tableName = "test_dl_show_stats_json_for_column_mapping_mode_" + randomNameSuffix();

Expand Down Expand Up @@ -301,21 +254,9 @@ private void testShowStatsFromJsonForColumnMappingMode(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsFromParquetForColumnMappingModeId()
{
testShowStatsFromParquetForColumnMappingMode("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsFromParquetForColumnMappingModeName()
{
testShowStatsFromParquetForColumnMappingMode("name");
}

private void testShowStatsFromParquetForColumnMappingMode(String mode)
public void testShowStatsFromParquetForColumnMappingMode(String mode)
{
String tableName = "test_dl_show_parquet_stats_parquet_for_column_mapping_mode_" + randomNameSuffix();

Expand Down Expand Up @@ -349,21 +290,9 @@ private void testShowStatsFromParquetForColumnMappingMode(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsOnPartitionedForColumnMappingModeId()
{
testShowStatsOnPartitionedForColumnMappingMode("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testShowStatsOnPartitionedForColumnMappingModeName()
{
testShowStatsOnPartitionedForColumnMappingMode("name");
}

private void testShowStatsOnPartitionedForColumnMappingMode(String mode)
public void testShowStatsOnPartitionedForColumnMappingMode(String mode)
{
String tableName = "test_dl_show_stats_partitioned_for_column_mapping_mode_" + randomNameSuffix();

Expand All @@ -375,7 +304,7 @@ private void testShowStatsOnPartitionedForColumnMappingMode(String mode)
" LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
" TBLPROPERTIES (" +
" 'delta.columnMapping.mode' = '" + mode + "'," +
" 'checkpointInterval' = 3" +
" 'delta.checkpointInterval' = 3" +
")");

try {
Expand All @@ -394,21 +323,9 @@ private void testShowStatsOnPartitionedForColumnMappingMode(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testUnsupportedOperationsColumnMappingModeId()
{
testUnsupportedOperationsColumnMappingModeName("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testUnsupportedOperationsColumnMappingModeName()
{
testUnsupportedOperationsColumnMappingModeName("name");
}

private void testUnsupportedOperationsColumnMappingModeName(String mode)
public void testUnsupportedOperationsColumnMappingModeName(String mode)
{
String tableName = "test_dl_unsupported_column_mapping_mode_" + randomNameSuffix();

Expand Down Expand Up @@ -443,21 +360,9 @@ private void testUnsupportedOperationsColumnMappingModeName(String mode)
}
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testSpecialCharacterColumnNamesWithColumnMappingModeId()
{
testSpecialCharacterColumnNamesWithColumnMappingMode("id");
}

@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, DELTA_LAKE_EXCLUDE_73, DELTA_LAKE_EXCLUDE_91, PROFILE_SPECIFIC_TESTS})
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
public void testSpecialCharacterColumnNamesWithColumnMappingModeName()
{
testSpecialCharacterColumnNamesWithColumnMappingMode("name");
}

private void testSpecialCharacterColumnNamesWithColumnMappingMode(String mode)
public void testSpecialCharacterColumnNamesWithColumnMappingMode(String mode)
{
String tableName = "test_dl_special_character_column_mapping_mode_" + randomNameSuffix();

Expand All @@ -468,7 +373,7 @@ private void testSpecialCharacterColumnNamesWithColumnMappingMode(String mode)
" LOCATION 's3://" + bucketName + "/databricks-compatibility-test-" + tableName + "'" +
" TBLPROPERTIES (" +
" 'delta.columnMapping.mode' = '" + mode + "'," +
" 'checkpointInterval' = 3" +
" 'delta.checkpointInterval' = 3" +
Copy link
Contributor

@findinpath findinpath Feb 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting - Databricks supports both checkpointInterval and delta.checkpointInterval settings :).

")");

try {
Expand All @@ -485,4 +390,13 @@ private void testSpecialCharacterColumnNamesWithColumnMappingMode(String mode)
onDelta().executeQuery("DROP TABLE default." + tableName);
}
}

@DataProvider
public Object[][] columnMappingDataProvider()
{
return new Object[][] {
{"id"},
{"name"},
};
}
}