This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git

commit ef8b744c4be0261cf08bf72c2c66f97c87ffeac4
Author: morningman <morning...@163.com>
AuthorDate: Sun Feb 5 15:14:04 2023 +0800

    [branch1.2] update iceberg to 1.1.0
---
 fe/pom.xml                                                    |  2 +-
 .../iceberg/test_external_catalog_icebergv2.groovy            | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/fe/pom.xml b/fe/pom.xml
index 51a6fca992..f2b6b72ec9 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -223,7 +223,7 @@ under the License.
         <!-- ATTN: avro version must be consistent with Iceberg version -->
         <!-- Please modify iceberg.version and avro.version together,
          you can find avro version info in iceberg mvn repository -->
-        <iceberg.version>0.12.0</iceberg.version>
+        <iceberg.version>1.1.0</iceberg.version>
         <avro.version>1.10.1</avro.version>
         <!-- hudi -->
         <hudi.version>0.10.0</hudi.version>
diff --git 
a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
 
b/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
index 4599b1584a..3b70f1936e 100644
--- 
a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
+++ 
b/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy
@@ -49,19 +49,8 @@ suite("test_external_catalog_icebergv2", "p2") {
             qt_q11 """ select c_custkey from customer for version as of 
906874575350293177 order by c_custkey limit 3 """
             qt_q12 """ select c_custkey from customer for version as of 
6352416983354893547 order by c_custkey desc limit 3 """
         }
-        // test time travel stmt
-        def q02 = {
-            qt_q09 """ select c_custkey from customer for time as of 
'2022-12-27 10:21:36' limit 3 """
-            qt_q10 """ select c_custkey from customer for time as of 
'2022-12-28 10:21:36' limit 3 """
-            qt_q11 """ select c_custkey from customer for version as of 
906874575350293177  limit 3 """
-            qt_q12 """ select c_custkey from customer for version as of 
6352416983354893547  limit 3 """
-        }
         sql """ use `tpch_1000_icebergv2`; """
         q01()
-<<<<<<< HEAD
-        // q02()
-=======
         q02()
->>>>>>> 3ff01ca799 ([feature-wip](multi-catalog) support Iceberg time travel 
in external table (#15418))
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to