-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bugfix](iceberg)fix datetime conversion error and data path error (#…
…35708) ## Proposed changes Issue #31442 <!--Describe your changes.--> 1. The unit of the seventh parameter of `ZonedDateTime.of` is nanosecond, so we should multiply the microsecond by 1000. 2. When writing to a non-partitioned iceberg table, the data path has an extra slash
- Loading branch information
Showing
6 changed files
with
201 additions
and
9 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
54 changes: 54 additions & 0 deletions
54
regression-test/data/external_table_p0/iceberg/test_iceberg_filter.out
This file contains 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,54 @@ | ||
| -- This file is automatically generated. You should know what you did if you want to edit this | ||
| -- !qt01 -- | ||
| 1 2024-05-30T20:34:56 | ||
| 2 2024-05-30T20:34:56.100 | ||
| 3 2024-05-30T20:34:56.120 | ||
| 4 2024-05-30T20:34:56.123 | ||
| 5 2024-05-30T20:34:56.123400 | ||
| 6 2024-05-30T20:34:56.123450 | ||
| 7 2024-05-30T20:34:56.123456 | ||
|
|
||
| -- !qt02 -- | ||
| 1 2024-05-30T20:34:56 | ||
|
|
||
| -- !qt03 -- | ||
| 2 2024-05-30T20:34:56.100 | ||
|
|
||
| -- !qt04 -- | ||
| 2 2024-05-30T20:34:56.100 | ||
|
|
||
| -- !qt05 -- | ||
| 2 2024-05-30T20:34:56.100 | ||
|
|
||
| -- !qt06 -- | ||
| 4 2024-05-30T20:34:56.123 | ||
|
|
||
| -- !qt07 -- | ||
| 4 2024-05-30T20:34:56.123 | ||
|
|
||
| -- !qt08 -- | ||
| 5 2024-05-30T20:34:56.123400 | ||
|
|
||
| -- !qt09 -- | ||
| 7 2024-05-30T20:34:56.123456 | ||
|
|
||
| -- !qt10 -- | ||
| 1 2024-05-30T20:34:56 | ||
| 2 2024-05-30T20:34:56.100 | ||
|
|
||
| -- !qt11 -- | ||
| 4 2024-05-30T20:34:56.123 | ||
| 5 2024-05-30T20:34:56.123400 | ||
| 6 2024-05-30T20:34:56.123450 | ||
| 7 2024-05-30T20:34:56.123456 | ||
|
|
||
| -- !qt12 -- | ||
| 1 2024-05-30T20:34:56 | ||
| 2 2024-05-30T20:34:56.100 | ||
|
|
||
| -- !qt13 -- | ||
| 4 2024-05-30T20:34:56.123 | ||
| 5 2024-05-30T20:34:56.123400 | ||
| 6 2024-05-30T20:34:56.123450 | ||
| 7 2024-05-30T20:34:56.123456 | ||
|
|
102 changes: 102 additions & 0 deletions
102
regression-test/suites/external_table_p0/iceberg/test_iceberg_filter.groovy
This file contains 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,102 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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. | ||
|
|
||
| suite("test_iceberg_filter", "p0,external,doris,external_docker,external_docker_doris") { | ||
| String enabled = context.config.otherConfigs.get("enableIcebergTest") | ||
| if (enabled != null && enabled.equalsIgnoreCase("true")) { | ||
| try { | ||
| String rest_port = context.config.otherConfigs.get("iceberg_rest_uri_port") | ||
| String minio_port = context.config.otherConfigs.get("iceberg_minio_port") | ||
| String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") | ||
| String catalog_name = "test_iceberg_filter" | ||
|
|
||
| sql """drop catalog if exists ${catalog_name}""" | ||
| sql """CREATE CATALOG ${catalog_name} PROPERTIES ( | ||
| 'type'='iceberg', | ||
| 'iceberg.catalog.type'='rest', | ||
| 'uri' = 'http://${externalEnvIp}:${rest_port}', | ||
| "s3.access_key" = "admin", | ||
| "s3.secret_key" = "password", | ||
| "s3.endpoint" = "http://${externalEnvIp}:${minio_port}", | ||
| "s3.region" = "us-east-1" | ||
| );""" | ||
|
|
||
| sql """ switch ${catalog_name} """ | ||
| sql """ create database if not exists ${catalog_name} """ | ||
| sql """ use ${catalog_name} """ | ||
|
|
||
| String tb_ts_filter = "tb_ts_filter"; | ||
| sql """ drop table if exists ${tb_ts_filter} """ | ||
| sql """ create table ${tb_ts_filter} (id int, ts datetime)""" | ||
| sql """ insert into ${tb_ts_filter} values (1, '2024-05-30 20:34:56') """ | ||
| sql """ insert into ${tb_ts_filter} values (2, '2024-05-30 20:34:56.1') """ | ||
| sql """ insert into ${tb_ts_filter} values (3, '2024-05-30 20:34:56.12') """ | ||
| sql """ insert into ${tb_ts_filter} values (4, '2024-05-30 20:34:56.123') """ | ||
| sql """ insert into ${tb_ts_filter} values (5, '2024-05-30 20:34:56.1234') """ | ||
| sql """ insert into ${tb_ts_filter} values (6, '2024-05-30 20:34:56.12345') """ | ||
| sql """ insert into ${tb_ts_filter} values (7, '2024-05-30 20:34:56.123456') """ | ||
|
|
||
| qt_qt01 """ select * from ${tb_ts_filter} order by id """ | ||
| qt_qt02 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56' order by id """ | ||
| qt_qt03 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.1' order by id """ | ||
| qt_qt04 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.10' order by id """ | ||
| qt_qt05 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.100' order by id """ | ||
| qt_qt06 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.123' order by id """ | ||
| qt_qt07 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.1230' order by id """ | ||
| qt_qt08 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.123400' order by id """ | ||
| qt_qt09 """ select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.123456' order by id """ | ||
|
|
||
| qt_qt10 """ select * from ${tb_ts_filter} where ts < '2024-05-30 20:34:56.12' order by id """ | ||
| qt_qt11 """ select * from ${tb_ts_filter} where ts > '2024-05-30 20:34:56.12' order by id """ | ||
| qt_qt12 """ select * from ${tb_ts_filter} where ts < '2024-05-30 20:34:56.1200' order by id """ | ||
| qt_qt13 """ select * from ${tb_ts_filter} where ts > '2024-05-30 20:34:56.1200' order by id """ | ||
|
|
||
| // TODO support filter | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts < '2024-05-30 20:34:56'") | ||
| // contains "inputSplitNum=0" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts < '2024-05-30 20:34:56.12'") | ||
| // contains "inputSplitNum=1" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts > '2024-05-30 20:34:56.1234'") | ||
| // contains "inputSplitNum=2" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts > '2024-05-30 20:34:56.0'") | ||
| // contains "inputSplitNum=1" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts = '2024-05-30 20:34:56.123456'") | ||
| // contains "inputSplitNum=1" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts < '2024-05-30 20:34:56.123456'") | ||
| // contains "inputSplitNum=5" | ||
| // } | ||
| // explain { | ||
| // sql("select * from ${tb_ts_filter} where ts > '2024-05-30 20:34:56.123456'") | ||
| // contains "inputSplitNum=0" | ||
| // } | ||
|
|
||
| } finally { | ||
| } | ||
| } | ||
| } | ||
|
|