From 2e0d381b6ecd5116e69435fcd2de1201ac37e556 Mon Sep 17 00:00:00 2001 From: panmingyi Date: Thu, 17 Jul 2025 16:56:20 +0800 Subject: [PATCH] rollback trim --- .../spark/expression/OmniExpressionAdaptor.scala | 3 --- .../sql/catalyst/expressions/ColumnarFuncSuite.scala | 11 ----------- .../sql/catalyst/expressions/ColumnarFuncSuite.scala | 11 ----------- .../sql/catalyst/expressions/ColumnarFuncSuite.scala | 11 ----------- 4 files changed, 36 deletions(-) diff --git a/omnioperator/omniop-spark-extension/spark-extension-core/src/main/scala/com/huawei/boostkit/spark/expression/OmniExpressionAdaptor.scala b/omnioperator/omniop-spark-extension/spark-extension-core/src/main/scala/com/huawei/boostkit/spark/expression/OmniExpressionAdaptor.scala index 3cd2fb382..139eb2048 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-core/src/main/scala/com/huawei/boostkit/spark/expression/OmniExpressionAdaptor.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-core/src/main/scala/com/huawei/boostkit/spark/expression/OmniExpressionAdaptor.scala @@ -530,9 +530,6 @@ object OmniExpressionAdaptor extends Logging { case regExpReplace: RegExpReplace => getRegExpReplaceStr(regExpReplace, exprsIndexMap) - case trim: StringTrim => - getTrimStr(trim, exprsIndexMap) - case floor: Floor => new JsonObject().put("exprType", "FUNCTION") .addOmniExpJsonType("returnType", floor.dataType) diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark33-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark33-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala index ac2315444..e28a47457 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark33-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark33-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala @@ -183,17 +183,6 @@ class ColumnarFuncSuite extends ColumnarSparkPlanTest { checkAnswer(res2, Seq(Row("你差世界"))) } - test("Test trim Function") { - spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") - val res1 = spark.sql("select trim(' hello ')") - assertOmniProjectHappened(res1) - checkAnswer(res1, Seq(Row("hello"))) - - val res2 = spark.sql("select trim(both '空' from '空稀少珍稀空')") - assertOmniProjectHappened(res2) - checkAnswer(res2, Seq(Row("稀少珍稀"))) - } - test("Test floor Function") { spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") val res1 = spark.sql("select floor(1.9)") diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala index ac2315444..e28a47457 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark34-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala @@ -183,17 +183,6 @@ class ColumnarFuncSuite extends ColumnarSparkPlanTest { checkAnswer(res2, Seq(Row("你差世界"))) } - test("Test trim Function") { - spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") - val res1 = spark.sql("select trim(' hello ')") - assertOmniProjectHappened(res1) - checkAnswer(res1, Seq(Row("hello"))) - - val res2 = spark.sql("select trim(both '空' from '空稀少珍稀空')") - assertOmniProjectHappened(res2) - checkAnswer(res2, Seq(Row("稀少珍稀"))) - } - test("Test floor Function") { spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") val res1 = spark.sql("select floor(1.9)") diff --git a/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala b/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala index ac2315444..e28a47457 100644 --- a/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala +++ b/omnioperator/omniop-spark-extension/spark-extension-ut/spark35-ut/src/test/scala/org/apache/spark/sql/catalyst/expressions/ColumnarFuncSuite.scala @@ -183,17 +183,6 @@ class ColumnarFuncSuite extends ColumnarSparkPlanTest { checkAnswer(res2, Seq(Row("你差世界"))) } - test("Test trim Function") { - spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") - val res1 = spark.sql("select trim(' hello ')") - assertOmniProjectHappened(res1) - checkAnswer(res1, Seq(Row("hello"))) - - val res2 = spark.sql("select trim(both '空' from '空稀少珍稀空')") - assertOmniProjectHappened(res2) - checkAnswer(res2, Seq(Row("稀少珍稀"))) - } - test("Test floor Function") { spark.conf.set("spark.sql.optimizer.excludedRules", "org.apache.spark.sql.catalyst.optimizer.ConstantFolding") val res1 = spark.sql("select floor(1.9)") -- Gitee