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

yihua pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new d2f703b1f72 [HUDI-8926] Fix precombine field value to be in the same 
type in TestMergeModeEventTimeOrdering (#12719)
d2f703b1f72 is described below

commit d2f703b1f72f3e655879d5281672a8e29c3c2009
Author: Y Ethan Guo <[email protected]>
AuthorDate: Mon Jan 27 18:27:24 2025 -0800

    [HUDI-8926] Fix precombine field value to be in the same type in 
TestMergeModeEventTimeOrdering (#12719)
---
 .../hudi/dml/TestMergeModeEventTimeOrdering.scala  | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git 
a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeModeEventTimeOrdering.scala
 
b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeModeEventTimeOrdering.scala
index aa3c111040e..f284c24b258 100644
--- 
a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeModeEventTimeOrdering.scala
+++ 
b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/dml/TestMergeModeEventTimeOrdering.scala
@@ -201,13 +201,13 @@ class TestMergeModeEventTimeOrdering extends 
HoodieSparkSqlTestBase {
           spark.sql(
             s"""
                | insert into $tableName
-               | select 0 as id, 'A0' as name, 0.0 as price, 100 as ts union 
all
-               | select 1, 'A', 10.0, 100 union all
-               | select 2, 'B', 20.0, 100 union all
-               | select 3, 'C', 30.0, 100 union all
-               | select 4, 'D', 40.0, 100 union all
-               | select 5, 'E', 50.0, 100 union all
-               | select 6, 'F', 60.0, 100
+               | select 0 as id, 'A0' as name, 0.0 as price, 100L as ts union 
all
+               | select 1, 'A', 10.0, 100L union all
+               | select 2, 'B', 20.0, 100L union all
+               | select 3, 'C', 30.0, 100L union all
+               | select 4, 'D', 40.0, 100L union all
+               | select 5, 'E', 50.0, 100L union all
+               | select 6, 'F', 60.0, 100L
              """.stripMargin)
 
           // Merge operation - delete with arbitrary ts value (lower, equal 
and higher). Lower ts won't take effect.
@@ -215,9 +215,9 @@ class TestMergeModeEventTimeOrdering extends 
HoodieSparkSqlTestBase {
             s"""
                | merge into $tableName t
                | using (
-               |   select 0 as id, 'B2' as name, 25.0 as price, 100 as ts 
union all
-               |   select 1 as id, 'B2' as name, 25.0 as price, 101 as ts 
union all
-               |   select 2 as id, 'B2' as name, 25.0 as price, 99 as ts
+               |   select 0 as id, 'B2' as name, 25.0 as price, 100L as ts 
union all
+               |   select 1 as id, 'B2' as name, 25.0 as price, 101L as ts 
union all
+               |   select 2 as id, 'B2' as name, 25.0 as price, 99L as ts
                | ) s
                | on t.id = s.id
                | when matched then delete
@@ -228,9 +228,9 @@ class TestMergeModeEventTimeOrdering extends 
HoodieSparkSqlTestBase {
             s"""
                | merge into $tableName t
                | using (
-               |   select 4 as id, 'D2' as name, 45.0 as price, 101 as ts 
union all
-               |   select 5, 'E2', 55.0, 99 as ts union all
-               |   select 6, 'F2', 65.0, 100 as ts
+               |   select 4 as id, 'D2' as name, 45.0 as price, 101L as ts 
union all
+               |   select 5, 'E2', 55.0, 99L as ts union all
+               |   select 6, 'F2', 65.0, 100L as ts
                | ) s
                | on t.id = s.id
                | when matched then update set *

Reply via email to