Skip to content

Commit 57b16da

Browse files
ebyhrebyhr
committed
Stop running product tests with Databricks 11.3 LTS
1 parent 5b9a64d commit 57b16da

18 files changed

+41
-231
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,6 @@ jobs:
876876
- suite-7-non-generic
877877
- suite-hive-transactional
878878
- suite-azure
879-
- suite-delta-lake-databricks113
880879
- suite-delta-lake-databricks122
881880
- suite-delta-lake-databricks133
882881
- suite-delta-lake-databricks143
@@ -916,9 +915,6 @@ jobs:
916915
ignore exclusion if: >-
917916
${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.GCP_CREDENTIALS_KEY != '' }}
918917
919-
- suite: suite-delta-lake-databricks113
920-
ignore exclusion if: >-
921-
${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
922918
- suite: suite-delta-lake-databricks122
923919
ignore exclusion if: >-
924920
${{ env.CI_SKIP_SECRETS_PRESENCE_CHECKS != '' || secrets.DATABRICKS_TOKEN != '' }}
@@ -978,7 +974,6 @@ jobs:
978974
AWS_REGION: ""
979975
TRINO_AWS_ACCESS_KEY_ID: ""
980976
TRINO_AWS_SECRET_ACCESS_KEY: ""
981-
DATABRICKS_113_JDBC_URL: ""
982977
DATABRICKS_122_JDBC_URL: ""
983978
DATABRICKS_133_JDBC_URL: ""
984979
DATABRICKS_143_JDBC_URL: ""
@@ -1051,7 +1046,6 @@ jobs:
10511046
AWS_REGION: ${{ vars.TRINO_AWS_REGION }}
10521047
TRINO_AWS_ACCESS_KEY_ID: ${{ vars.TRINO_AWS_ACCESS_KEY_ID }}
10531048
TRINO_AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }}
1054-
DATABRICKS_113_JDBC_URL: ${{ vars.DATABRICKS_113_JDBC_URL }}
10551049
DATABRICKS_122_JDBC_URL: ${{ vars.DATABRICKS_122_JDBC_URL }}
10561050
DATABRICKS_133_JDBC_URL: ${{ vars.DATABRICKS_133_JDBC_URL }}
10571051
DATABRICKS_143_JDBC_URL: ${{ vars.DATABRICKS_143_JDBC_URL }}

‎testing/trino-product-tests-groups/src/main/java/io/trino/tests/product/TestGroups.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,9 @@ public final class TestGroups
9595
public static final String DELTA_LAKE_AZURE = "delta-lake-azure";
9696
public static final String DELTA_LAKE_GCS = "delta-lake-gcs";
9797
public static final String DELTA_LAKE_DATABRICKS = "delta-lake-databricks";
98-
public static final String DELTA_LAKE_DATABRICKS_122 = "delta-lake-databricks-122";
9998
public static final String DELTA_LAKE_DATABRICKS_133 = "delta-lake-databricks-133";
10099
public static final String DELTA_LAKE_DATABRICKS_143 = "delta-lake-databricks-143";
101100
public static final String DELTA_LAKE_DATABRICKS_154 = "delta-lake-databricks-154";
102-
public static final String DELTA_LAKE_EXCLUDE_113 = "delta-lake-exclude-113";
103101
// TODO: Remove it once we support generatedColumns, particularly for writes in Delta Lake
104102
public static final String DELTA_LAKE_EXCLUDE_164 = "delta-lake-exclude-164";
105103
public static final String DELTA_LAKE_ALLUXIO_CACHING = "delta-lake-alluxio-caching";

‎testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeDatabricks113.java‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks113.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/suite/suites/SuiteDeltaLakeDatabricks122.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323

2424
import static io.trino.tests.product.TestGroups.CONFIGURED_FEATURES;
25-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
25+
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
2626
import static io.trino.tests.product.launcher.suite.SuiteTestRun.testOnEnvironment;
2727

2828
public class SuiteDeltaLakeDatabricks122
@@ -33,7 +33,7 @@ public List<SuiteTestRun> getTestRuns(EnvironmentConfig config)
3333
{
3434
return ImmutableList.of(
3535
testOnEnvironment(EnvSinglenodeDeltaLakeDatabricks122.class)
36-
.withGroups(CONFIGURED_FEATURES, DELTA_LAKE_DATABRICKS_122)
36+
.withGroups(CONFIGURED_FEATURES, DELTA_LAKE_DATABRICKS)
3737
.withExcludedTests(getExcludedTests())
3838
.build());
3939
}

‎testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeAlterTableCompatibility.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import static io.trino.tempto.assertions.QueryAssert.Row.row;
2525
import static io.trino.testing.TestingNames.randomNameSuffix;
2626
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
27-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_113;
2827
import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
2928
import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
3029
import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_143_RUNTIME_VERSION;
@@ -242,7 +241,7 @@ public void testTrinoPreservesReaderAndWriterVersions()
242241
}
243242
}
244243

245-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_113, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
244+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
246245
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
247246
public void testTrinoPreservesTableFeature()
248247
{

‎testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeChangeDataFeedCompatibility.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
3333
import static io.trino.testing.TestingNames.randomNameSuffix;
3434
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
35-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
3635
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_133;
3736
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_143;
3837
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_154;
39-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_EXCLUDE_113;
4038
import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
4139
import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
4240
import static io.trino.tests.product.deltalake.S3ClientFactory.createS3Client;
@@ -108,7 +106,7 @@ public void testUpdateTableWithCdf(String columnMappingMode)
108106
}
109107
}
110108

111-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_EXCLUDE_113, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
109+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
112110
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
113111
public void testUpdateTableWithChangeDataFeedWriterFeature()
114112
{
@@ -541,7 +539,7 @@ public void testMergeDeleteIntoTableWithCdfEnabled(String columnMappingMode)
541539
}
542540
}
543541

544-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
542+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
545543
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
546544
public void testMergeMixedDeleteAndUpdateIntoTableWithCdfEnabled()
547545
{

‎testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCheckpointsCompatibility.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,20 @@
2121
import io.trino.tempto.assertions.QueryAssert.Row;
2222
import io.trino.tempto.query.QueryResult;
2323
import io.trino.testng.services.Flaky;
24-
import io.trino.tests.product.deltalake.util.DatabricksVersion;
2524
import org.testng.annotations.DataProvider;
2625
import org.testng.annotations.Test;
2726
import software.amazon.awssdk.services.s3.S3Client;
2827
import software.amazon.awssdk.services.s3.model.S3Object;
2928

3029
import java.math.BigDecimal;
3130
import java.util.List;
32-
import java.util.Optional;
3331
import java.util.function.Consumer;
3432

3533
import static com.google.common.collect.ImmutableList.toImmutableList;
3634
import static com.google.common.collect.Iterables.getOnlyElement;
3735
import static io.trino.tempto.assertions.QueryAssert.Row.row;
3836
import static io.trino.testing.TestingNames.randomNameSuffix;
3937
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
40-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
4138
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_133;
4239
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_143;
4340
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_154;
@@ -46,11 +43,9 @@
4643
import static io.trino.tests.product.deltalake.S3ClientFactory.createS3Client;
4744
import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertLastEntryIsCheckpointed;
4845
import static io.trino.tests.product.deltalake.TransactionLogAssertions.assertTransactionLogVersion;
49-
import static io.trino.tests.product.deltalake.util.DatabricksVersion.DATABRICKS_113_RUNTIME_VERSION;
5046
import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_ISSUE;
5147
import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.DATABRICKS_COMMUNICATION_FAILURE_MATCH;
5248
import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.dropDeltaTableWithRetry;
53-
import static io.trino.tests.product.deltalake.util.DeltaLakeTestUtils.getDatabricksRuntimeVersion;
5449
import static io.trino.tests.product.utils.QueryExecutors.onDelta;
5550
import static io.trino.tests.product.utils.QueryExecutors.onTrino;
5651
import static java.lang.String.format;
@@ -64,13 +59,11 @@ public class TestDeltaLakeCheckpointsCompatibility
6459
private String s3ServerType;
6560

6661
private S3Client s3;
67-
private Optional<DatabricksVersion> databricksRuntimeVersion;
6862

6963
@BeforeMethodWithContext
7064
public void setup()
7165
{
7266
s3 = createS3Client(s3ServerType);
73-
databricksRuntimeVersion = getDatabricksRuntimeVersion();
7467
}
7568

7669
@AfterMethodWithContext
@@ -283,7 +276,7 @@ private void trinoUsesCheckpointInterval(String deltaTableProperties)
283276
}
284277
}
285278

286-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, PROFILE_SPECIFIC_TESTS})
279+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, PROFILE_SPECIFIC_TESTS})
287280
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
288281
public void testDatabricksUsesCheckpointInterval()
289282
{
@@ -375,7 +368,7 @@ private void testCheckpointMinMaxStatisticsForRowType(Consumer<String> sqlExecut
375368

376369
// Assert min/max queries can be computed from just metadata
377370
String explainSelectMax = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT max(root.entry_one) FROM default." + tableName).column(1));
378-
String column = databricksRuntimeVersion.orElseThrow().isAtLeast(DATABRICKS_113_RUNTIME_VERSION) ? "root.entry_one" : "root.entry_one AS `entry_one`";
371+
String column = "root.entry_one";
379372
assertThat(explainSelectMax).matches("== Physical Plan ==\\s*LocalTableScan \\[max\\(" + column + "\\).*]\\s*");
380373

381374
// check both engines can read both tables
@@ -441,7 +434,7 @@ private void testCheckpointNullStatisticsForRowType(Consumer<String> sqlExecutor
441434

442435
// Assert counting non null entries can be computed from just metadata
443436
String explainCountNotNull = getOnlyElement(onDelta().executeQuery("EXPLAIN SELECT count(root.entry_two) FROM default." + tableName).column(1));
444-
String column = databricksRuntimeVersion.orElseThrow().isAtLeast(DATABRICKS_113_RUNTIME_VERSION) ? "root.entry_two" : "root.entry_two AS `entry_two`";
437+
String column = "root.entry_two";
445438
assertThat(explainCountNotNull).matches("== Physical Plan ==\\s*LocalTableScan \\[count\\(" + column + "\\).*]\\s*");
446439

447440
// check both engines can read both tables

‎testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeColumnMappingMode.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import static io.trino.tempto.assertions.QueryAssert.assertQueryFailure;
2828
import static io.trino.testing.TestingNames.randomNameSuffix;
2929
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
30-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
3130
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_133;
3231
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_143;
3332
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_154;
@@ -54,7 +53,7 @@
5453
public class TestDeltaLakeColumnMappingMode
5554
extends BaseTestDeltaLakeS3Storage
5655
{
57-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
56+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
5857
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
5958
public void testColumnMappingModeNone()
6059
{
@@ -227,7 +226,7 @@ private void testColumnMappingModeReaderAndWriterVersion(Consumer<String> create
227226
onTrino().executeQuery("DROP TABLE delta.default." + tableName);
228227
}
229228

230-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
229+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS}, dataProvider = "columnMappingDataProvider")
231230
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
232231
public void testTrinoColumnMappingMode(String mode)
233232
{

‎testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeCreateTableAsSelectCompatibility.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import static io.trino.tempto.assertions.QueryAssert.Row.row;
2626
import static io.trino.testing.TestingNames.randomNameSuffix;
2727
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
28-
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_122;
2928
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_133;
3029
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_143;
3130
import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS_154;
@@ -43,7 +42,7 @@
4342
public class TestDeltaLakeCreateTableAsSelectCompatibility
4443
extends BaseTestDeltaLakeS3Storage
4544
{
46-
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_122, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, PROFILE_SPECIFIC_TESTS})
45+
@Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_DATABRICKS_133, DELTA_LAKE_DATABRICKS_143, DELTA_LAKE_DATABRICKS_154, PROFILE_SPECIFIC_TESTS})
4746
@Flaky(issue = DATABRICKS_COMMUNICATION_FAILURE_ISSUE, match = DATABRICKS_COMMUNICATION_FAILURE_MATCH)
4847
public void testTrinoTypesWithDatabricks()
4948
{

0 commit comments

Comments
 (0)