Skip to content

Commit

Permalink
remove some common UTs vs Presto
Browse files Browse the repository at this point in the history
  • Loading branch information
yma11 committed Mar 16, 2024
1 parent 74034b9 commit 3fbc5ab
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 320 deletions.
2 changes: 1 addition & 1 deletion velox/docs/functions/spark/map.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Map Functions

.. spark:function:: map_from_entries(array(struct(K,V))) -> map(K,V)
Converts an array of entries (key value struct types) to a map of values. All elements in keys should not be null.
Returns a map created from the given array of entries. Keys are not allowed to be null or to contain nulls.
If null entry exists in the array, return null for this whole array.::

SELECT map_from_entries(array(struct(1, 'a'), struct(2, 'null'))); -- {1 -> 'a', 2 -> 'null'}
Expand Down
34 changes: 12 additions & 22 deletions velox/functions/lib/MapFromEntries.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static const char* kIndeterminateKeyErrorMessage =
static const char* kErrorMessageEntryNotNull = "map entry cannot be null";

/// @tparam throwForNull If true, will return null if input array is null or has
/// null entry (Spark's behavior), instead of throw execeptions(Presto's
/// null entries (Spark's behavior), instead of throwing exceptions (Presto's
/// behavior).
template <bool throwForNull>
class MapFromEntriesFunction : public exec::VectorFunction {
Expand Down Expand Up @@ -146,7 +146,6 @@ class MapFromEntriesFunction : public exec::VectorFunction {
const bool isMapEntryNull = decodedRowVector->isNullAt(offset + i);
if (isMapEntryNull) {
if constexpr (!throwForNull) {
// Spark: For nulls in the top level row vector, return null.
bits::setNull(mutableNulls, row);
resetSize(row);
break;
Expand Down Expand Up @@ -229,28 +228,19 @@ class MapFromEntriesFunction : public exec::VectorFunction {

// For Presto, need construct map vector based on input nulls for possible
// outer expression like try(). For Spark, use the updated nulls.
std::shared_ptr<MapVector> mapVector;
if constexpr (throwForNull) {
mapVector = std::make_shared<MapVector>(
context.pool(),
outputType,
inputArray->nulls(),
rows.end(),
inputArray->offsets(),
sizes,
wrappedKeys,
wrappedValues);
} else {
mapVector = std::make_shared<MapVector>(
context.pool(),
outputType,
nulls,
rows.end(),
inputArray->offsets(),
sizes,
wrappedKeys,
wrappedValues);
nulls = inputArray->nulls();
}
auto mapVector = std::make_shared<MapVector>(
context.pool(),
outputType,
nulls,
rows.end(),
inputArray->offsets(),
sizes,
wrappedKeys,
wrappedValues);

checkDuplicateKeys(mapVector, *remianingRows, context);
return mapVector;
}
Expand Down
1 change: 0 additions & 1 deletion velox/functions/prestosql/tests/MapFromEntriesTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <optional>
#include "velox/common/base/tests/GTestUtils.h"
#include "velox/functions/lib/CheckDuplicateKeys.h"
// #include "velox/functions/lib/CheckDuplicateKeys.h"
#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
#include "velox/vector/tests/TestingDictionaryArrayElementsFunction.h"

Expand Down
Loading

0 comments on commit 3fbc5ab

Please sign in to comment.