Skip to content
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

[pull] master from trinodb:master #1035

Merged
merged 1 commit into from
Jan 30, 2025
Merged

[pull] master from trinodb:master #1035

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ jobs:
- suite-clickhouse
- suite-mysql
- suite-iceberg
- suite-snowflake
- suite-hudi
- suite-ignite
exclude:
Expand Down
4 changes: 1 addition & 3 deletions ...trino/plugin/iceberg/catalog/snowflake/TestIcebergSnowflakeCatalogConnectorSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.trino.testing.QueryRunner;
import io.trino.testing.TestingConnectorBehavior;
import io.trino.tpch.TpchTable;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;

Expand All @@ -44,7 +43,6 @@
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;

@TestInstance(PER_CLASS)
@Disabled("Temporary disabled due to lack of payment for the Snowflake account")
public class TestIcebergSnowflakeCatalogConnectorSmokeTest
extends BaseIcebergConnectorSmokeTest
{
Expand Down Expand Up @@ -612,7 +610,7 @@ public void testListViews()
public void testExecuteDelete()
{
assertThatThrownBy(() -> assertUpdate("DELETE FROM " + TpchTable.REGION.getTableName()))
.hasMessageMatching("Failed to close manifest writer");
.hasMessageContaining("Failed to close manifest writer");
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions ...n/trino-iceberg/src/test/java/org/apache/iceberg/snowflake/TestTrinoSnowflakeCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import org.apache.iceberg.jdbc.JdbcClientPool;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import java.net.URI;
Expand Down Expand Up @@ -82,7 +81,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

@Disabled("Temporary disabled due to lack of payment for the Snowflake account")
public class TestTrinoSnowflakeCatalog
extends BaseTrinoCatalogTest
{
Expand Down
1 change: 0 additions & 1 deletion ...n/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@

@TestInstance(PER_CLASS)
@Execution(CONCURRENT)
@Disabled("Temporary disabled due to lack of payment for the Snowflake account")
public class TestSnowflakeConnectorTest
extends BaseJdbcConnectorTest
{
Expand Down
20 changes: 9 additions & 11 deletions plugin/trino-snowflake/src/test/java/io/trino/plugin/snowflake/TestSnowflakeTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import io.trino.testing.sql.TestTable;
import io.trino.testing.sql.TrinoSqlExecutor;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.parallel.Execution;
Expand Down Expand Up @@ -54,21 +53,20 @@

@TestInstance(PER_CLASS)
@Execution(CONCURRENT)
@Disabled("Temporary disabled due to lack of payment for the Snowflake account")
public class TestSnowflakeTypeMapping
extends AbstractTestQueryFramework
{
private final ZoneId jvmZone = ZoneId.systemDefault();
// no DST in 1970, but has DST in later years (e.g. 2018)
private final ZoneId vilnius = ZoneId.of("Europe/Vilnius");
// minutes offset change since 1970-01-01, no DST
// minutes offset change since 1932-04-01, no DST
private final ZoneId kathmandu = ZoneId.of("Asia/Kathmandu");

@BeforeAll
public void setUp()
{
checkState(jvmZone.getId().equals("America/Bahia_Banderas"), "Timezone not configured correctly. Add -Duser.timezone=America/Bahia_Banderas to your JVM arguments");
checkIsGap(jvmZone, LocalDate.of(1970, 1, 1));
checkIsGap(jvmZone, LocalDate.of(1932, 4, 1));
checkIsGap(vilnius, LocalDate.of(1983, 4, 1));
verify(vilnius.getRules().getValidOffsets(LocalDate.of(1983, 10, 1).atStartOfDay().minusMinutes(1)).size() == 2);
}
Expand Down Expand Up @@ -371,7 +369,7 @@ private void testTimestamp(ZoneId sessionZone)
.addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 01:33:17.456'", createTimestampType(3), "TIMESTAMP '2018-10-28 01:33:17.456'")
// time double in Vilnius
.addRoundTrip("timestamp(3)", "TIMESTAMP '2018-10-28 03:33:33.333'", createTimestampType(3), "TIMESTAMP '2018-10-28 03:33:33.333'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:13:42.000'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1932-04-01 00:13:42.000'", createTimestampType(3), "TIMESTAMP '1932-04-01 00:13:42.000'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '2018-04-01 02:13:55.123'", createTimestampType(3), "TIMESTAMP '2018-04-01 02:13:55.123'")
// time gap in Vilnius
.addRoundTrip("timestamp(3)", "TIMESTAMP '2018-03-25 03:17:17.000'", createTimestampType(3), "TIMESTAMP '2018-03-25 03:17:17.000'")
Expand All @@ -380,12 +378,12 @@ private void testTimestamp(ZoneId sessionZone)
// max value 2038-01-19 03:14:07
.addRoundTrip("timestamp(3)", "TIMESTAMP '2038-01-19 03:14:07.000'", createTimestampType(3), "TIMESTAMP '2038-01-19 03:14:07.000'")
// test arbitrary time for all supported precisions
.addRoundTrip("timestamp(0)", "TIMESTAMP '1970-01-01 00:00:01'", createTimestampType(0), "TIMESTAMP '1970-01-01 00:00:01'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.1'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.1'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '1970-01-01 00:00:01.9'", createTimestampType(1), "TIMESTAMP '1970-01-01 00:00:01.9'")
.addRoundTrip("timestamp(2)", "TIMESTAMP '1970-01-01 00:00:01.12'", createTimestampType(2), "TIMESTAMP '1970-01-01 00:00:01.12'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.123'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.123'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1970-01-01 00:00:01.999'", createTimestampType(3), "TIMESTAMP '1970-01-01 00:00:01.999'")
.addRoundTrip("timestamp(0)", "TIMESTAMP '1932-04-01 00:00:01'", createTimestampType(0), "TIMESTAMP '1932-04-01 00:00:01'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '1932-04-01 00:00:01.1'", createTimestampType(1), "TIMESTAMP '1932-04-01 00:00:01.1'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '1932-04-01 00:00:01.9'", createTimestampType(1), "TIMESTAMP '1932-04-01 00:00:01.9'")
.addRoundTrip("timestamp(2)", "TIMESTAMP '1932-04-01 00:00:01.12'", createTimestampType(2), "TIMESTAMP '1932-04-01 00:00:01.12'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1932-04-01 00:00:01.123'", createTimestampType(3), "TIMESTAMP '1932-04-01 00:00:01.123'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '1932-04-01 00:00:01.999'", createTimestampType(3), "TIMESTAMP '1932-04-01 00:00:01.999'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.1'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.1'")
.addRoundTrip("timestamp(1)", "TIMESTAMP '2020-09-27 12:34:56.9'", createTimestampType(1), "TIMESTAMP '2020-09-27 12:34:56.9'")
.addRoundTrip("timestamp(3)", "TIMESTAMP '2020-09-27 12:34:56.123'", createTimestampType(3), "TIMESTAMP '2020-09-27 12:34:56.123'")
Expand Down
Loading