Fix timestamp with timezone mapping in iceberg type converter #23534
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.facebook.presto.iceberg; | ||
|
|
||
| import com.facebook.presto.Session; | ||
| import com.facebook.presto.common.type.TimestampType; | ||
| import com.facebook.presto.common.type.TimestampWithTimeZoneType; | ||
| import com.facebook.presto.common.type.Type; | ||
| import com.facebook.presto.testing.MaterializedResult; | ||
| import com.facebook.presto.testing.MaterializedRow; | ||
| import com.facebook.presto.testing.QueryRunner; | ||
| import com.facebook.presto.tests.AbstractTestQueryFramework; | ||
| import com.google.common.collect.ImmutableMap; | ||
| import org.testng.annotations.DataProvider; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static com.facebook.presto.hive.HiveCommonSessionProperties.PARQUET_BATCH_READ_OPTIMIZATION_ENABLED; | ||
| import static com.facebook.presto.iceberg.IcebergQueryRunner.createIcebergQueryRunner; | ||
| import static org.testng.Assert.assertEquals; | ||
| import static org.testng.Assert.assertTrue; | ||
|
|
||
| public class TestIcebergTypes | ||
| extends AbstractTestQueryFramework | ||
| { | ||
| protected QueryRunner createQueryRunner() throws Exception | ||
| { | ||
| return createIcebergQueryRunner(ImmutableMap.of(), ImmutableMap.of()); | ||
| } | ||
|
|
||
| @DataProvider(name = "testTimestampWithTimezone") | ||
| public Object[][] createTestTimestampWithTimezoneData() | ||
| { | ||
| return new Object[][] { | ||
| {Session.builder(getSession()) | ||
| .setCatalogSessionProperty("iceberg", PARQUET_BATCH_READ_OPTIMIZATION_ENABLED, "true") | ||
| .build()}, | ||
| {Session.builder(getSession()) | ||
| .setCatalogSessionProperty("iceberg", PARQUET_BATCH_READ_OPTIMIZATION_ENABLED, "false") | ||
| .build()} | ||
|
Member
There was a problem hiding this comment. Shouldn't this be different timezone data for test as the name suggests?
Contributor
Author
There was a problem hiding this comment. This is just to test with batch reader enabled and disabled. We are not changing the data used
Member
There was a problem hiding this comment. Then I think name of the DataProvider and Object method according to the properties would be better? |
||
| }; | ||
| } | ||
|
|
||
| @Test(dataProvider = "testTimestampWithTimezone") | ||
| public void testTimestampWithTimezone(Session session) | ||
| { | ||
| QueryRunner runner = getQueryRunner(); | ||
| String timestamptz = "TIMESTAMP '1984-12-08 00:10:00 America/Los_Angeles'"; | ||
| String timestamp = "TIMESTAMP '1984-12-08 00:10:00'"; | ||
|
|
||
| dropTableIfExists(runner, session.getCatalog().get(), session.getSchema().get(), "test_timestamptz"); | ||
| assertQuerySucceeds(session, "CREATE TABLE test_timestamptz(a TIMESTAMP WITH TIME ZONE, b TIMESTAMP, c TIMESTAMP WITH TIME ZONE)"); | ||
|
|
||
| String row = "(" + timestamptz + ", " + timestamp + ", " + timestamptz + ")"; | ||
| for (int i = 0; i < 10; i++) { | ||
| assertUpdate(session, "INSERT INTO test_timestamptz values " + row, 1); | ||
| } | ||
|
|
||
| MaterializedResult initialRows = runner.execute(session, "SELECT * FROM test_timestamptz"); | ||
|
|
||
| List<Type> types = initialRows.getTypes(); | ||
| assertTrue(types.get(0) instanceof TimestampWithTimeZoneType); | ||
| assertTrue(types.get(1) instanceof TimestampType); | ||
|
|
||
| List<MaterializedRow> rows = initialRows.getMaterializedRows(); | ||
| for (int i = 0; i < 10; i++) { | ||
| assertEquals("[1984-12-08T08:10Z[UTC], 1984-12-08T00:10, 1984-12-08T08:10Z[UTC]]", rows.get(i).toString()); | ||
| } | ||
|
|
||
| dropTableIfExists(runner, session.getCatalog().get(), session.getSchema().get(), "test_timestamptz_partition"); | ||
| assertQuerySucceeds(session, "CREATE TABLE test_timestamptz_partition(a TIMESTAMP WITH TIME ZONE, b TIMESTAMP, c TIMESTAMP WITH TIME ZONE) " + | ||
| "WITH (PARTITIONING = ARRAY['b'])"); | ||
| assertUpdate(session, "INSERT INTO test_timestamptz_partition (a, b, c) SELECT a, b, c FROM test_timestamptz", 10); | ||
|
|
||
| MaterializedResult partitionRows = runner.execute(session, "SELECT * FROM test_timestamptz"); | ||
|
|
||
| List<Type> partitionTypes = partitionRows.getTypes(); | ||
| assertTrue(partitionTypes.get(0) instanceof TimestampWithTimeZoneType); | ||
| assertTrue(partitionTypes.get(1) instanceof TimestampType); | ||
|
|
||
| rows = partitionRows.getMaterializedRows(); | ||
| for (int i = 0; i < 10; i++) { | ||
| assertEquals("[1984-12-08T08:10Z[UTC], 1984-12-08T00:10, 1984-12-08T08:10Z[UTC]]", rows.get(i).toString()); | ||
| } | ||
|
|
||
| String earlyTimestamptz = "TIMESTAMP '1980-12-08 00:10:00 America/Los_Angeles'"; | ||
| dropTableIfExists(runner, session.getCatalog().get(), session.getSchema().get(), "test_timestamptz_filter"); | ||
| assertQuerySucceeds(session, "CREATE TABLE test_timestamptz_filter(a TIMESTAMP WITH TIME ZONE)"); | ||
|
|
||
| for (int i = 0; i < 5; i++) { | ||
| assertUpdate(session, "INSERT INTO test_timestamptz_filter VALUES (" + earlyTimestamptz + ")", 1); | ||
| } | ||
| for (int i = 0; i < 5; i++) { | ||
| assertUpdate(session, "INSERT INTO test_timestamptz_filter VALUES (" + timestamptz + ")", 1); | ||
| } | ||
|
|
||
| MaterializedResult lateRows = runner.execute(session, "SELECT a FROM test_timestamptz_filter WHERE a > " + earlyTimestamptz); | ||
| assertEquals(lateRows.getMaterializedRows().size(), 5); | ||
|
|
||
| MaterializedResult lateRowsFromEquals = runner.execute(session, "SELECT a FROM test_timestamptz_filter WHERE a = " + timestamptz); | ||
| com.facebook.presto.testing.assertions.Assert.assertEquals(lateRows, lateRowsFromEquals); | ||
|
|
||
| MaterializedResult earlyRows = runner.execute(session, "SELECT a FROM test_timestamptz_filter WHERE a < " + timestamptz); | ||
| assertEquals(earlyRows.getMaterializedRows().size(), 5); | ||
|
|
||
| MaterializedResult earlyRowsFromEquals = runner.execute(session, "SELECT a FROM test_timestamptz_filter WHERE a = " + earlyTimestamptz); | ||
| com.facebook.presto.testing.assertions.Assert.assertEquals(earlyRows, earlyRowsFromEquals); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.