From 0edb84cc8e2f825e257c558143edca1e154f8a72 Mon Sep 17 00:00:00 2001 From: Reetika Agrawal Date: Fri, 22 Mar 2024 04:05:14 +0530 Subject: [PATCH] Enable SqlServer product tests --- .../workflows/product-tests-specific-environment.yml | 10 ++-------- .../docker/singlenode-sqlserver/docker-compose.yml | 2 +- .../sqlserver/SqlServerDataTypesTableDefinition.java | 4 ++-- .../facebook/presto/tests/sqlserver/TestSelect.java | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/product-tests-specific-environment.yml b/.github/workflows/product-tests-specific-environment.yml index a25ab54ec323b..ed3b6499b581a 100644 --- a/.github/workflows/product-tests-specific-environment.yml +++ b/.github/workflows/product-tests-specific-environment.yml @@ -118,14 +118,6 @@ jobs: ./mvnw install ${MAVEN_FAST_INSTALL} -am -pl '!presto-docs,!presto-spark-package,!presto-spark-launcher,!presto-spark-testing,!presto-test-coverage' - name: Product Tests Specific 2.1 run: presto-product-tests/bin/run_on_docker.sh singlenode-ldap -g ldap -x simba_jdbc - # SQL server image sporadically hangs during the startup - # TODO: Uncomment it once issue is fixed - # https://github.com/Microsoft/mssql-docker/issues/76 - # - | - # if [[ -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then - # presto-product-tests/bin/run_on_docker.sh \ - # singlenode-sqlserver -g sqlserver - # fi - name: Product Tests Specific 2.2 run: presto-product-tests/bin/run_on_docker.sh multinode-tls -g smoke,cli,group-by,join,tls - name: Product Tests Specific 2.3 @@ -139,3 +131,5 @@ jobs: # run: presto-product-tests/bin/run_on_docker.sh singlenode-kerberos-hdfs-impersonation-with-wire-encryption -g storage_formats,cli,hdfs_impersonation,authorization - name: Product Tests Specific 2.7 run: presto-product-tests/bin/run_on_docker.sh singlenode-kafka -g kafka + - name: Product Tests Specific 2.8 + run: presto-product-tests/bin/run_on_docker.sh singlenode-sqlserver -g sqlserver diff --git a/presto-product-tests/conf/docker/singlenode-sqlserver/docker-compose.yml b/presto-product-tests/conf/docker/singlenode-sqlserver/docker-compose.yml index 2365dfda3cc9c..c2b2dc347c794 100644 --- a/presto-product-tests/conf/docker/singlenode-sqlserver/docker-compose.yml +++ b/presto-product-tests/conf/docker/singlenode-sqlserver/docker-compose.yml @@ -3,7 +3,7 @@ services: sqlserver: hostname: sqlserver - image: 'microsoft/mssql-server-linux:2017-CU6' + image: 'mcr.microsoft.com/mssql/server:2017-CU13' ports: - '1433:1433' environment: diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/SqlServerDataTypesTableDefinition.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/SqlServerDataTypesTableDefinition.java index cd8872750bc54..963c90ef8df82 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/SqlServerDataTypesTableDefinition.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/SqlServerDataTypesTableDefinition.java @@ -51,8 +51,8 @@ private SqlServerDataTypesTableDefinition() {} return ImmutableList.>of( ImmutableList.of(Long.MIN_VALUE, Short.MIN_VALUE, Integer.MIN_VALUE, Byte.MIN_VALUE, Double.MIN_VALUE, Float.valueOf("-3.40E+38"), "\0", "\0", "\0", "\0", "\0", "\0", - Date.valueOf("0001-01-02"), Timestamp.valueOf("1753-01-01 00:00:00.000"), - Timestamp.valueOf("0001-01-01 00:00:00.000"), Timestamp.valueOf("1900-01-01 00:00:00"), + Date.valueOf("1970-01-02"), Timestamp.valueOf("1970-01-01 00:00:00.000"), + Timestamp.valueOf("1970-01-01 00:00:00.000"), Timestamp.valueOf("1970-01-01 00:00:00"), Double.MIN_VALUE, Float.valueOf("-3.40E+38")), ImmutableList.of(Long.MAX_VALUE, Short.MAX_VALUE, Integer.MAX_VALUE, Byte.MAX_VALUE, Double.MAX_VALUE, Float.MAX_VALUE, "abcd", "abcdef", "abcd", "abcde", "abcdefg", "abcd", diff --git a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java index 9c6391402ee87..170d428dbbe35 100644 --- a/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java +++ b/presto-product-tests/src/main/java/com/facebook/presto/tests/sqlserver/TestSelect.java @@ -141,8 +141,8 @@ public void testAllDatatypes() .containsOnly( row(Long.MIN_VALUE, Short.MIN_VALUE, Integer.MIN_VALUE, Byte.MIN_VALUE, Double.MIN_VALUE, Float.valueOf("-3.40E+38"), "\0 ", "\0", "\0", "\0 ", "\0", "\0", - Date.valueOf("0001-01-02"), Timestamp.valueOf("1753-01-01 00:00:00.000"), - Timestamp.valueOf("0001-01-01 00:00:00.000"), Timestamp.valueOf("1900-01-01 00:00:00"), + Date.valueOf("1970-01-02"), Timestamp.valueOf("1970-01-01 00:00:00.000"), + Timestamp.valueOf("1970-01-01 00:00:00.000"), Timestamp.valueOf("1970-01-01 00:00:00"), Double.MIN_VALUE, Float.valueOf("-3.40E+38")), row(Long.MAX_VALUE, Short.MAX_VALUE, Integer.MAX_VALUE, Byte.MAX_VALUE, Double.MAX_VALUE, Float.MAX_VALUE, "abcd", "abcdef", "abcd", "abcde", "abcdefg", "abcd",