update

yma11 · May 17, 2024 · 5f395a6 · 5f395a6
1 parent a0771c9
commit 5f395a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/velox/docs/functions/spark/map.rst b/velox/docs/functions/spark/map.rst
@@ -40,6 +40,8 @@ Map Functions
 
         SELECT map_from_entries(array(struct(1, 'a'), struct(2, 'null'))); -- {1 -> 'a', 2 -> 'null'}
         SELECT map_from_entries(array(struct(1, 'a'), null)); -- {null}
+        SELECT map_from_entries(array(struct(null, 'a'))); -- "map key cannot be null"
+        SELECT map_from_entries(array(struct(1, 'a'), struct(1, 'b'))); -- "Duplicate map keys (1) are not allowed"
 
 .. spark::function:: map_keys(x(K,V)) -> array(K)
 

diff --git a/velox/functions/lib/MapFromEntries.cpp b/velox/functions/lib/MapFromEntries.cpp
@@ -250,13 +250,11 @@ class MapFromEntriesFunction : public exec::VectorFunction {
     return mapVector;
   }
 
-  bool throwOnNull_;
+  const bool throwOnNull_;
 };
 } // namespace
 
-void registerMapFromEntriesFunction(
-    const std::string& name,
-    const bool throwOnNull) {
+void registerMapFromEntriesFunction(const std::string& name, bool throwOnNull) {
   exec::registerVectorFunction(
       name,
       MapFromEntriesFunction::signatures(),

diff --git a/velox/functions/lib/MapFromEntries.h b/velox/functions/lib/MapFromEntries.h
@@ -20,8 +20,7 @@
 
 namespace facebook::velox::functions {
 
-void registerMapFromEntriesFunction(
-    const std::string& name,
-    const bool throwForNull);
+// Use throwForNull to distinguish different null handling in presto and spark
+void registerMapFromEntriesFunction(const std::string& name, bool throwForNull);
 
 } // namespace facebook::velox::functions
diff --git a/velox/functions/sparksql/tests/MapFromEntriesTest.cpp b/velox/functions/sparksql/tests/MapFromEntriesTest.cpp
@@ -51,7 +51,7 @@ class MapFromEntriesTest : public SparkFunctionBaseTest {
   void verifyMapFromEntries(
       const std::vector<VectorPtr>& input,
       const VectorPtr& expected,
-      const std::string& funcArg = "c0") {
+      const std::string& funcArg) {
     const std::string expr = fmt::format("map_from_entries({})", funcArg);
     auto result = evaluate<MapVector>(expr, makeRowVector(input));
     assertEqualVectors(expected, result);