From d85b144bba418a4f466f6325e5594f27ff14d8d8 Mon Sep 17 00:00:00 2001
From: Socrates <suyiteng@selectdb.com>
Date: Fri, 22 Nov 2024 17:48:21 +0800
Subject: [PATCH] test new hudi scanner

---
 .../hudi/test_hudi_incremental.out            | 348 ++++++++++++++++++
 .../hudi/test_hudi_schema_evolution.out       |  32 ++
 .../hudi/test_hudi_snapshot.out               | Bin 348526 -> 697561 bytes
 .../hudi/test_hudi_incremental.groovy         |  13 +-
 .../hudi/test_hudi_schema_evolution.groovy    |  13 +
 .../hudi/test_hudi_snapshot.groovy            |  11 +-
 .../hudi/test_hudi_timetravel.groovy          |   7 +-
 7 files changed, 416 insertions(+), 8 deletions(-)

diff --git a/regression-test/data/external_table_p2/hudi/test_hudi_incremental.out b/regression-test/data/external_table_p2/hudi/test_hudi_incremental.out
index b1bdad85013bfce..852aebe48961b5c 100644
--- a/regression-test/data/external_table_p2/hudi/test_hudi_incremental.out
+++ b/regression-test/data/external_table_p2/hudi/test_hudi_incremental.out
@@ -347,3 +347,351 @@
 -- !incremental_9_10 --
 1000
 
+-- !incremental_1_end --
+9000
+
+-- !incremental_earliest_1 --
+1000
+
+-- !incremental_2_end --
+8000
+
+-- !incremental_earliest_2 --
+2000
+
+-- !incremental_1_2 --
+1000
+
+-- !incremental_3_end --
+7000
+
+-- !incremental_earliest_3 --
+3000
+
+-- !incremental_2_3 --
+1000
+
+-- !incremental_4_end --
+6000
+
+-- !incremental_earliest_4 --
+4000
+
+-- !incremental_3_4 --
+1000
+
+-- !incremental_5_end --
+5000
+
+-- !incremental_earliest_5 --
+5000
+
+-- !incremental_4_5 --
+1000
+
+-- !incremental_6_end --
+4000
+
+-- !incremental_earliest_6 --
+6000
+
+-- !incremental_5_6 --
+1000
+
+-- !incremental_7_end --
+3000
+
+-- !incremental_earliest_7 --
+7000
+
+-- !incremental_6_7 --
+1000
+
+-- !incremental_8_end --
+2000
+
+-- !incremental_earliest_8 --
+8000
+
+-- !incremental_7_8 --
+1000
+
+-- !incremental_9_end --
+1000
+
+-- !incremental_earliest_9 --
+9000
+
+-- !incremental_8_9 --
+1000
+
+-- !incremental_10_end --
+0
+
+-- !incremental_earliest_10 --
+10000
+
+-- !incremental_9_10 --
+1000
+
+-- !incremental_1_end --
+9000
+
+-- !incremental_earliest_1 --
+1000
+
+-- !incremental_2_end --
+8000
+
+-- !incremental_earliest_2 --
+2000
+
+-- !incremental_1_2 --
+1000
+
+-- !incremental_3_end --
+7000
+
+-- !incremental_earliest_3 --
+3000
+
+-- !incremental_2_3 --
+1000
+
+-- !incremental_4_end --
+6000
+
+-- !incremental_earliest_4 --
+4000
+
+-- !incremental_3_4 --
+1000
+
+-- !incremental_5_end --
+5000
+
+-- !incremental_earliest_5 --
+5000
+
+-- !incremental_4_5 --
+1000
+
+-- !incremental_6_end --
+4000
+
+-- !incremental_earliest_6 --
+6000
+
+-- !incremental_5_6 --
+1000
+
+-- !incremental_7_end --
+3000
+
+-- !incremental_earliest_7 --
+7000
+
+-- !incremental_6_7 --
+1000
+
+-- !incremental_8_end --
+2000
+
+-- !incremental_earliest_8 --
+8000
+
+-- !incremental_7_8 --
+1000
+
+-- !incremental_9_end --
+1000
+
+-- !incremental_earliest_9 --
+9000
+
+-- !incremental_8_9 --
+1000
+
+-- !incremental_10_end --
+0
+
+-- !incremental_earliest_10 --
+10000
+
+-- !incremental_9_10 --
+1000
+
+-- !incremental_1_end --
+9000
+
+-- !incremental_earliest_1 --
+1000
+
+-- !incremental_2_end --
+8000
+
+-- !incremental_earliest_2 --
+2000
+
+-- !incremental_1_2 --
+1000
+
+-- !incremental_3_end --
+7000
+
+-- !incremental_earliest_3 --
+3000
+
+-- !incremental_2_3 --
+1000
+
+-- !incremental_4_end --
+6000
+
+-- !incremental_earliest_4 --
+4000
+
+-- !incremental_3_4 --
+1000
+
+-- !incremental_5_end --
+5000
+
+-- !incremental_earliest_5 --
+5000
+
+-- !incremental_4_5 --
+1000
+
+-- !incremental_6_end --
+4000
+
+-- !incremental_earliest_6 --
+6000
+
+-- !incremental_5_6 --
+1000
+
+-- !incremental_7_end --
+3000
+
+-- !incremental_earliest_7 --
+7000
+
+-- !incremental_6_7 --
+1000
+
+-- !incremental_8_end --
+2000
+
+-- !incremental_earliest_8 --
+8000
+
+-- !incremental_7_8 --
+1000
+
+-- !incremental_9_end --
+1000
+
+-- !incremental_earliest_9 --
+9000
+
+-- !incremental_8_9 --
+1000
+
+-- !incremental_10_end --
+0
+
+-- !incremental_earliest_10 --
+10000
+
+-- !incremental_9_10 --
+1000
+
+-- !incremental_1_end --
+9000
+
+-- !incremental_earliest_1 --
+1000
+
+-- !incremental_2_end --
+8000
+
+-- !incremental_earliest_2 --
+2000
+
+-- !incremental_1_2 --
+1000
+
+-- !incremental_3_end --
+7000
+
+-- !incremental_earliest_3 --
+3000
+
+-- !incremental_2_3 --
+1000
+
+-- !incremental_4_end --
+6000
+
+-- !incremental_earliest_4 --
+4000
+
+-- !incremental_3_4 --
+1000
+
+-- !incremental_5_end --
+5000
+
+-- !incremental_earliest_5 --
+5000
+
+-- !incremental_4_5 --
+1000
+
+-- !incremental_6_end --
+4000
+
+-- !incremental_earliest_6 --
+6000
+
+-- !incremental_5_6 --
+1000
+
+-- !incremental_7_end --
+3000
+
+-- !incremental_earliest_7 --
+7000
+
+-- !incremental_6_7 --
+1000
+
+-- !incremental_8_end --
+2000
+
+-- !incremental_earliest_8 --
+8000
+
+-- !incremental_7_8 --
+1000
+
+-- !incremental_9_end --
+1000
+
+-- !incremental_earliest_9 --
+9000
+
+-- !incremental_8_9 --
+1000
+
+-- !incremental_10_end --
+0
+
+-- !incremental_earliest_10 --
+10000
+
+-- !incremental_9_10 --
+1000
+
diff --git a/regression-test/data/external_table_p2/hudi/test_hudi_schema_evolution.out b/regression-test/data/external_table_p2/hudi/test_hudi_schema_evolution.out
index 12dd0cf086d3f04..da7273d4c14ef95 100644
--- a/regression-test/data/external_table_p2/hudi/test_hudi_schema_evolution.out
+++ b/regression-test/data/external_table_p2/hudi/test_hudi_schema_evolution.out
@@ -31,3 +31,35 @@
 20241118012149007	20241118012149007_0_4	5		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	5	Eva	{"age":31.5, "address":"Chengdu"}
 20241118012149007	20241118012149007_0_5	6		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	6	Frank	{"age":29.2, "address":"Wuhan"}
 
+-- !adding_simple_columns_table --
+20241118012126237	20241118012126237_0_1	1		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	1	Alice	\N
+20241118012126237	20241118012126237_0_0	2		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	2	Bob	\N
+20241118012126237	20241118012126237_0_2	3		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	3	Cathy	\N
+20241118012132306	20241118012132306_0_3	4		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	4	David	25
+20241118012132306	20241118012132306_0_4	5		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	5	Eva	30
+20241118012132306	20241118012132306_0_5	6		5166112a-90d8-4ba8-8646-337fbeb2a375-0_0-35-121_20241118012132306.parquet	6	Frank	28
+
+-- !altering_simple_columns_table --
+20241118012136512	20241118012136512_0_0	1		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	1	Alice	25.0
+20241118012136512	20241118012136512_0_2	2		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	2	Bob	30.0
+20241118012136512	20241118012136512_0_1	3		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	3	Cathy	28.0
+20241118012138287	20241118012138287_0_3	4		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	4	David	26.0
+20241118012138287	20241118012138287_0_4	5		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	5	Eva	31.5
+20241118012138287	20241118012138287_0_5	6		203f0f43-ae9d-4c17-8d5d-834f0dbc62c9-0_0-78-246_20241118012138287.parquet	6	Frank	29.2
+
+-- !adding_complex_columns_table --
+20241118012144831	20241118012144831_0_1	1		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	1	Alice	{"age":25, "address":"Guangzhou", "email":null}
+20241118012144831	20241118012144831_0_0	2		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	2	Bob	{"age":30, "address":"Shanghai", "email":null}
+20241118012144831	20241118012144831_0_2	3		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	3	Cathy	{"age":28, "address":"Beijing", "email":null}
+20241118012146150	20241118012146150_0_3	4		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	4	David	{"age":25, "address":"Shenzhen", "email":"david@example.com"}
+20241118012146150	20241118012146150_0_4	5		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	5	Eva	{"age":30, "address":"Chengdu", "email":"eva@example.com"}
+20241118012146150	20241118012146150_0_5	6		3c038df9-a652-4878-9b8a-221ae443448e-0_0-165-497_20241118012146150.parquet	6	Frank	{"age":28, "address":"Wuhan", "email":"frank@example.com"}
+
+-- !altering_complex_columns_table --
+20241118012147879	20241118012147879_0_0	1		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	1	Alice	{"age":25, "address":"Guangzhou"}
+20241118012147879	20241118012147879_0_2	2		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	2	Bob	{"age":30, "address":"Shanghai"}
+20241118012147879	20241118012147879_0_1	3		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	3	Cathy	{"age":28, "address":"Beijing"}
+20241118012149007	20241118012149007_0_3	4		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	4	David	{"age":26, "address":"Shenzhen"}
+20241118012149007	20241118012149007_0_4	5		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	5	Eva	{"age":31.5, "address":"Chengdu"}
+20241118012149007	20241118012149007_0_5	6		185d101f-a484-45ce-b236-03ccd33c521b-0_0-208-622_20241118012149007.parquet	6	Frank	{"age":29.2, "address":"Wuhan"}
+
diff --git a/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out b/regression-test/data/external_table_p2/hudi/test_hudi_snapshot.out
index efad67ffbfa8c407fa42d0dd28f569f492bd1d12..41f34255f40a5249cc790acd1c805f7917621a7b 100644
GIT binary patch
delta 37933
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

delta 18799
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
L2XUtw+=~AT!H+qS

diff --git a/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy b/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
index 8cc1d2a852b8c4b..338d299170a90fe 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_incremental.groovy
@@ -60,7 +60,6 @@ suite("test_hudi_incremental", "p2,external,hudi,external_remote,external_remote
         "20241114152009764",
         "20241114152011901",
     ]
-    test_hudi_incremental_querys("user_activity_log_cow_non_partition", timestamps_cow_non_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_cow_partition order by _hoodie_commit_time;"
     def timestamps_cow_partition = [
@@ -75,7 +74,6 @@ suite("test_hudi_incremental", "p2,external,hudi,external_remote,external_remote
         "20241114152147114",
         "20241114152156417",
     ]
-    test_hudi_incremental_querys("user_activity_log_cow_partition", timestamps_cow_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_mor_non_partition order by _hoodie_commit_time;"
     def timestamps_mor_non_partition = [
@@ -90,7 +88,6 @@ suite("test_hudi_incremental", "p2,external,hudi,external_remote,external_remote
         "20241114152028770",
         "20241114152030746",
     ]
-    test_hudi_incremental_querys("user_activity_log_mor_non_partition", timestamps_mor_non_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_mor_partition order by _hoodie_commit_time;"
     def timestamps_mor_partition = [
@@ -105,6 +102,16 @@ suite("test_hudi_incremental", "p2,external,hudi,external_remote,external_remote
         "20241114152323587",
         "20241114152334111",
     ]
+
+    sql """set force_jni_scanner=true;"""
+    test_hudi_incremental_querys("user_activity_log_cow_non_partition", timestamps_cow_non_partition)
+    test_hudi_incremental_querys("user_activity_log_cow_partition", timestamps_cow_partition)
+    test_hudi_incremental_querys("user_activity_log_mor_non_partition", timestamps_mor_non_partition)
+    test_hudi_incremental_querys("user_activity_log_mor_partition", timestamps_mor_partition)
+    sql """set force_jni_scanner=false;"""
+    test_hudi_incremental_querys("user_activity_log_cow_non_partition", timestamps_cow_non_partition)
+    test_hudi_incremental_querys("user_activity_log_cow_partition", timestamps_cow_partition)
+    test_hudi_incremental_querys("user_activity_log_mor_non_partition", timestamps_mor_non_partition)
     test_hudi_incremental_querys("user_activity_log_mor_partition", timestamps_mor_partition)
 
     sql """drop catalog if exists ${catalog_name};"""
diff --git a/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy b/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
index b247aaf492400d4..0bd74655d0717bc 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_schema_evolution.groovy
@@ -34,6 +34,19 @@ suite("test_hudi_schema_evolution", "p2,external,hudi,external_remote,external_r
     sql """ use regression_hudi;""" 
     sql """ set enable_fallback_to_original_planner=false """
 
+    sql """set force_jni_scanner = true;"""
+
+    qt_adding_simple_columns_table """ select * from adding_simple_columns_table order by id """
+    qt_altering_simple_columns_table """ select * from altering_simple_columns_table order by id """
+    // qt_deleting_simple_columns_table """ select * from deleting_simple_columns_table order by id """
+    // qt_renaming_simple_columns_table """ select * from renaming_simple_columns_table order by id """
+
+    qt_adding_complex_columns_table """ select * from adding_complex_columns_table order by id """
+    qt_altering_complex_columns_table """ select * from altering_complex_columns_table order by id """
+    // qt_deleting_complex_columns_table """ select * from deleting_complex_columns_table order by id """
+    // qt_renaming_complex_columns_table """ select * from renaming_complex_columns_table order by id """
+
+    sql """set force_jni_scanner = false;"""
     qt_adding_simple_columns_table """ select * from adding_simple_columns_table order by id """
     qt_altering_simple_columns_table """ select * from altering_simple_columns_table order by id """
     // qt_deleting_simple_columns_table """ select * from deleting_simple_columns_table order by id """
diff --git a/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy b/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
index 53c09e6d5a90312..d52a3d2930fa725 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_snapshot.groovy
@@ -64,7 +64,7 @@ suite("test_hudi_snapshot", "p2,external,hudi,external_remote,external_remote_hu
         qt_q09 """SELECT * FROM ${table_name} WHERE struct_element(struct_element(address, 'coordinates'), 'latitude') BETWEEN 0 AND 100 AND struct_element(struct_element(address, 'coordinates'), 'longitude') BETWEEN 0 AND 100 ORDER BY event_time LIMIT 5;"""
 
         // Query records with ratings above a specific value and limit output
-        qt_q10 """SELECT * FROM ${table_name} WHERE rating > 4.5 ORDER BY rating DESC LIMIT 5;"""
+        qt_q10 """SELECT * FROM ${table_name} WHERE rating > 4.5 ORDER BY event_time DESC LIMIT 5;"""
 
         // Query all users' signup dates and limit output
         qt_q11 """SELECT user_id, signup_date FROM ${table_name} ORDER BY signup_date DESC LIMIT 10;"""
@@ -79,9 +79,16 @@ suite("test_hudi_snapshot", "p2,external,hudi,external_remote,external_remote_hu
         qt_q14 """SELECT * FROM ${table_name} WHERE signup_date = '2024-01-15' ORDER BY user_id LIMIT 5;"""
 
         // Query the total count of purchases for each user and limit output
-        qt_q15 """SELECT user_id, array_size(purchases) AS purchase_count FROM ${table_name} ORDER BY purchase_count DESC LIMIT 5;"""
+        qt_q15 """SELECT user_id, array_size(purchases) AS purchase_count FROM ${table_name} ORDER BY user_id LIMIT 5;"""
     }
 
+    sql """set force_jni_scanner=true;"""
+    test_hudi_snapshot_querys("user_activity_log_cow_non_partition")
+    test_hudi_snapshot_querys("user_activity_log_cow_partition")
+    test_hudi_snapshot_querys("user_activity_log_mor_non_partition")
+    test_hudi_snapshot_querys("user_activity_log_mor_partition")
+
+    sql """set force_jni_scanner=false;"""
     test_hudi_snapshot_querys("user_activity_log_cow_non_partition")
     test_hudi_snapshot_querys("user_activity_log_cow_partition")
     test_hudi_snapshot_querys("user_activity_log_mor_non_partition")
diff --git a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
index 4d458dc4381dcf7..111b3d528a42e13 100644
--- a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
+++ b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy
@@ -54,7 +54,6 @@ suite("test_hudi_timetravel", "p2,external,hudi,external_remote,external_remote_
         "20241114152009764",
         "20241114152011901",
     ]
-    test_hudi_timetravel_querys("user_activity_log_cow_non_partition", timestamps_cow_non_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_cow_partition order by _hoodie_commit_time;"
     def timestamps_cow_partition = [
@@ -69,7 +68,6 @@ suite("test_hudi_timetravel", "p2,external,hudi,external_remote,external_remote_
         "20241114152147114",
         "20241114152156417",
     ]
-    test_hudi_timetravel_querys("user_activity_log_cow_partition", timestamps_cow_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_mor_non_partition order by _hoodie_commit_time;"
     def timestamps_mor_non_partition = [
@@ -84,7 +82,6 @@ suite("test_hudi_timetravel", "p2,external,hudi,external_remote,external_remote_
         "20241114152028770",
         "20241114152030746",
     ]
-    test_hudi_timetravel_querys("user_activity_log_mor_non_partition", timestamps_mor_non_partition)
 
     // spark-sql "select distinct _hoodie_commit_time from user_activity_log_mor_partition order by _hoodie_commit_time;"
     def timestamps_mor_partition = [
@@ -99,6 +96,10 @@ suite("test_hudi_timetravel", "p2,external,hudi,external_remote,external_remote_
         "20241114152323587",
         "20241114152334111",
     ]
+
+    test_hudi_timetravel_querys("user_activity_log_cow_non_partition", timestamps_cow_non_partition)
+    test_hudi_timetravel_querys("user_activity_log_cow_partition", timestamps_cow_partition)
+    test_hudi_timetravel_querys("user_activity_log_mor_non_partition", timestamps_mor_non_partition)
     test_hudi_timetravel_querys("user_activity_log_mor_partition", timestamps_mor_partition)
 
     sql """drop catalog if exists ${catalog_name};"""