From 968dd688aaf53f4d0ab896d146aa7841f84740de Mon Sep 17 00:00:00 2001 From: houyongfei Date: Mon, 24 Mar 2025 15:56:38 +0800 Subject: [PATCH] fix ut error --- .../spark/sql/execution/ColumnarJoinExecSuite.scala | 12 ++++++------ .../spark/sql/execution/ColumnarJoinExecSuite.scala | 12 ++++++------ .../spark/sql/execution/ColumnarJoinExecSuite.scala | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark32-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark32-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala index 469aa53c8..bae17c010 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark32-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark32-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala @@ -352,7 +352,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("", "Hello", null, 1.0, null, null, null, null), Row(" yeah ", "yeah", 10, 8.0, null, null, null, null), Row(" add", "World", 8, 3.0, null, null, null, null) - ), false) + ), true) } test("ColumnarBroadcastHashJoin is not rolled back with not_equal filter expr") { @@ -599,7 +599,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } test("SortMergeJoin and project funsion test for duplicate column") { @@ -613,7 +613,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678, 3), Row("Adams", 24562, 1), Row("Adams", 22456, 1) - ), false) + ), true) } test("SortMergeJoin and project funsion test for reorder columns") { @@ -627,7 +627,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44678, "Carter", 3), Row(24562, "Adams", 1), Row(22456, "Adams", 1) - ), false) + ), true) } test("SortMergeJoin and project are not funsed test") { @@ -641,7 +641,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44679, "Carter"), Row(24563, "Adams"), Row(22457, "Adams") - ), false) + ), true) } test("SortMergeJoin and project funsion test for alias") { @@ -655,6 +655,6 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } } \ No newline at end of file diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala index 469aa53c8..bae17c010 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala @@ -352,7 +352,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("", "Hello", null, 1.0, null, null, null, null), Row(" yeah ", "yeah", 10, 8.0, null, null, null, null), Row(" add", "World", 8, 3.0, null, null, null, null) - ), false) + ), true) } test("ColumnarBroadcastHashJoin is not rolled back with not_equal filter expr") { @@ -599,7 +599,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } test("SortMergeJoin and project funsion test for duplicate column") { @@ -613,7 +613,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678, 3), Row("Adams", 24562, 1), Row("Adams", 22456, 1) - ), false) + ), true) } test("SortMergeJoin and project funsion test for reorder columns") { @@ -627,7 +627,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44678, "Carter", 3), Row(24562, "Adams", 1), Row(22456, "Adams", 1) - ), false) + ), true) } test("SortMergeJoin and project are not funsed test") { @@ -641,7 +641,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44679, "Carter"), Row(24563, "Adams"), Row(22457, "Adams") - ), false) + ), true) } test("SortMergeJoin and project funsion test for alias") { @@ -655,6 +655,6 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } } \ No newline at end of file diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala index 39637065f..eefb088ee 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/execution/ColumnarJoinExecSuite.scala @@ -641,7 +641,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } test("SortMergeJoin and project funsion test for duplicate column") { @@ -655,7 +655,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678, 3), Row("Adams", 24562, 1), Row("Adams", 22456, 1) - ), false) + ), true) } test("SortMergeJoin and project funsion test for reorder columns") { @@ -669,7 +669,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44678, "Carter", 3), Row(24562, "Adams", 1), Row(22456, "Adams", 1) - ), false) + ), true) } test("SortMergeJoin and project are not funsed test") { @@ -683,7 +683,7 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row(44679, "Carter"), Row(24563, "Adams"), Row(22457, "Adams") - ), false) + ), true) } test("SortMergeJoin and project funsion test for alias") { @@ -697,6 +697,6 @@ class ColumnarJoinExecSuite extends ColumnarSparkPlanTest { Row("Carter", 44678), Row("Adams", 24562), Row("Adams", 22456) - ), false) + ), true) } } \ No newline at end of file -- Gitee