Merge branch 'main' into wip_ts

apache · Apr 24, 2023 · 6875a21 · 6875a21
2 parents 9b4f120 + b712b53
commit 6875a21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -215,6 +215,8 @@ void WholeStageResultIterator::setConfToQueryContext(const std::shared_ptr<velox
   }
   // To align with Spark's behavior, set casting to int to be truncating.
   configs[velox::core::QueryConfig::kCastIntByTruncate] = std::to_string(true);
+  // To align with Spark's behavior, allow decimal in casting string to int.
+  configs[velox::core::QueryConfig::kCastIntAllowDecimal] = std::to_string(true);
 
   // Spill configs
   configs[velox::core::QueryConfig::kSpillEnabled] = getConfigValue(kSpillEnabled, "true");

diff --git a/gluten-core/src/main/scala/io/glutenproject/extension/columnar/TransformHintRule.scala b/gluten-core/src/main/scala/io/glutenproject/extension/columnar/TransformHintRule.scala
@@ -224,7 +224,7 @@ case class FallbackEmptySchemaRelation() extends Rule[SparkPlan] {
           // Some backends are not eligible to offload plan with zero-column input.
           // If any child have empty output, mark the plan and that child as UNSUPPORTED.
           logWarning(s"May fallback ${p.getClass.toString} and its children because" +
-            s"at least one of its children has empty output.")
+            s" at least one of its children has empty output.")
           TransformHints.tagNotTransformable(p)
           p.children.foreach(child =>
             if (child.output.isEmpty) TransformHints.tagNotTransformable(child))