Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PhabricatorVersion245726248 #11142

Closed
wants to merge 2 commits into from
Closed

PhabricatorVersion245726248 #11142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0403db4
Add tests for array_min/array_max with TimestampWithTimezone (#11141)
Oct 7, 2024
8f06c64
Add tests for array_sort with TimestampWithTImezone (#11142)
Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions velox/functions/prestosql/tests/ArrayMaxTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <optional>
#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
#include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"

using namespace facebook::velox;
using namespace facebook::velox::test;
Expand Down Expand Up @@ -143,6 +144,66 @@ TEST_F(ArrayMaxTest, longVarcharNoNulls) {
testArrayMax(input, expected);
}

TEST_F(ArrayMaxTest, timestampWithTimezone) {
auto testArrayMax = [this](
const std::vector<std::optional<int64_t>>& inputArray,
std::optional<int64_t> expectedValue) {
// Test with primitive types.
auto input = makeRowVector({makeArrayVector(
{0}, makeNullableFlatVector(inputArray, TIMESTAMP_WITH_TIME_ZONE()))});
VectorPtr expected = makeNullableFlatVector<int64_t>(
{expectedValue}, TIMESTAMP_WITH_TIME_ZONE());

auto result = evaluate<BaseVector>("array_max(C0)", input);
assertEqualVectors(expected, result);

// array_max does not support nulls inside complex types. To exclude these
// we exclude tests where the expected result is null. However, the result
// can also be null when the input is empty, so we add an exception for that
// case.
if (expectedValue.has_value() || inputArray.empty()) {
// Test wrapped in complex type.
input = makeRowVector({makeArrayVector(
{0},
makeRowVector({makeNullableFlatVector(
inputArray, TIMESTAMP_WITH_TIME_ZONE())}))});
expected = makeRowVector(
{expected}, [&](vector_size_t) { return inputArray.empty(); });

result = evaluate<BaseVector>("array_max(C0)", input);
assertEqualVectors(expected, result);
}
};

testArrayMax(
{pack(-1, 0), pack(0, 1), pack(1, 2), pack(2, 3), pack(3, 4), pack(4, 5)},
pack(4, 5));
testArrayMax(
{pack(4, 0),
pack(3, 1),
pack(2, 2),
pack(1, 3),
pack(0, 4),
pack(-1, 5),
pack(-2, 6)},
pack(4, 0));
testArrayMax(
{pack(-5, 3), pack(-4, 2), pack(-3, 1), pack(-2, 0), pack(-1, 4)},
pack(-1, 4));
testArrayMax(
{pack(101, 4), pack(102, 0), pack(103, 1), pack(104, 2), pack(105, 3)},
pack(105, 3));
testArrayMax({}, std::nullopt);
testArrayMax(
{pack(101, 4), pack(102, 0), pack(103, 1), pack(104, 2), std::nullopt},
std::nullopt);
testArrayMax(
{std::nullopt, pack(-1, 4), pack(-2, 5), pack(-3, 1), pack(-4, 0)},
std::nullopt);
testArrayMax({std::nullopt}, std::nullopt);
testArrayMax({pack(1, 0), pack(1, 1), pack(1, 2)}, pack(1, 0));
}

// Test documented example.
TEST_F(ArrayMaxTest, docs) {
{
Expand Down
61 changes: 61 additions & 0 deletions velox/functions/prestosql/tests/ArrayMinTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <optional>
#include "velox/common/base/tests/GTestUtils.h"
#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
#include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"

using namespace facebook::velox;
using namespace facebook::velox::test;
Expand Down Expand Up @@ -284,3 +285,63 @@ TEST_F(ArrayMinTest, complexTypeElements) {
});
assertEqualVectors(expected, result);
}

TEST_F(ArrayMinTest, timestampWithTimezone) {
auto testArrayMin = [this](
const std::vector<std::optional<int64_t>>& inputArray,
std::optional<int64_t> expectedValue) {
// Test with primitive types.
auto input = makeRowVector({makeArrayVector(
{0}, makeNullableFlatVector(inputArray, TIMESTAMP_WITH_TIME_ZONE()))});
VectorPtr expected = makeNullableFlatVector<int64_t>(
{expectedValue}, TIMESTAMP_WITH_TIME_ZONE());

auto result = evaluate<BaseVector>("array_min(C0)", input);
assertEqualVectors(expected, result);

// array_min does not support nulls inside complex types. To exclude these
// we exclude tests where the expected result is null. However, the result
// can also be null when the input is empty, so we add an exception for that
// case.
if (expectedValue.has_value() || inputArray.empty()) {
// Test wrapped in complex type.
input = makeRowVector({makeArrayVector(
{0},
makeRowVector({makeNullableFlatVector(
inputArray, TIMESTAMP_WITH_TIME_ZONE())}))});
expected = makeRowVector(
{expected}, [&](vector_size_t) { return inputArray.empty(); });

result = evaluate<BaseVector>("array_min(C0)", input);
assertEqualVectors(expected, result);
}
};

testArrayMin(
{pack(-1, 0), pack(0, 1), pack(1, 2), pack(2, 3), pack(3, 4), pack(4, 5)},
pack(-1, 0));
testArrayMin(
{pack(4, 0),
pack(3, 1),
pack(2, 2),
pack(1, 3),
pack(0, 4),
pack(-1, 5),
pack(-2, 6)},
pack(-2, 6));
testArrayMin(
{pack(-5, 3), pack(-4, 2), pack(-3, 1), pack(-2, 0), pack(-1, 4)},
pack(-5, 3));
testArrayMin(
{pack(101, 4), pack(102, 0), pack(103, 1), pack(104, 2), pack(105, 3)},
pack(101, 4));
testArrayMin({}, std::nullopt);
testArrayMin(
{pack(101, 4), pack(102, 0), pack(103, 1), pack(104, 2), std::nullopt},
std::nullopt);
testArrayMin(
{std::nullopt, pack(-1, 4), pack(-2, 5), pack(-3, 1), pack(-4, 0)},
std::nullopt);
testArrayMin({std::nullopt}, std::nullopt);
testArrayMin({pack(1, 0), pack(1, 1), pack(1, 2)}, pack(1, 0));
}
146 changes: 146 additions & 0 deletions velox/functions/prestosql/tests/ArraySortTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
* limitations under the License.
*/
#include "velox/common/base/tests/GTestUtils.h"
#include "velox/functions/Macros.h"
#include "velox/functions/Registerer.h"
#include "velox/functions/prestosql/tests/utils/FunctionBaseTest.h"
#include "velox/functions/prestosql/types/TimestampWithTimeZoneType.h"

#include <fmt/format.h>
#include <cstdint>
Expand Down Expand Up @@ -722,6 +725,149 @@ TEST_F(ArraySortTest, failOnRowNullCompare) {
}
}

TEST_F(ArraySortTest, timestampWithTimezone) {
auto testArraySort =
[this](
const std::vector<std::optional<int64_t>>& inputArray,
const std::vector<std::optional<int64_t>>& expectedAscArray,
const std::vector<std::optional<int64_t>>& expectedDescArray) {
const auto input = makeRowVector({makeArrayVector(
{0},
makeNullableFlatVector<int64_t>(
inputArray, TIMESTAMP_WITH_TIME_ZONE()))});
const auto expectedAsc = makeArrayVector(
{0},
makeNullableFlatVector<int64_t>(
expectedAscArray, TIMESTAMP_WITH_TIME_ZONE()));
const auto expectedDesc = makeArrayVector(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Would Array<Row> also work (similar to the test case added in array_max/min)? If yes, then apart from adding this case here we can also test the array_sort with lambda here like array_sort(c0, x -> x.c0)

{0},
makeNullableFlatVector<int64_t>(
expectedDescArray, TIMESTAMP_WITH_TIME_ZONE()));

auto resultAsc = evaluate("array_sort(c0)", input);
assertEqualVectors(expectedAsc, resultAsc);

auto resultDesc = evaluate("array_sort_desc(c0)", input);
assertEqualVectors(expectedDesc, resultDesc);
};

testArraySort(
{pack(2, 0), pack(1, 1), pack(0, 2)},
{pack(0, 2), pack(1, 1), pack(2, 0)},
{pack(2, 0), pack(1, 1), pack(0, 2)});
testArraySort(
{pack(0, 0), pack(1, 1), pack(2, 2)},
{pack(0, 0), pack(1, 1), pack(2, 2)},
{pack(2, 2), pack(1, 1), pack(0, 0)});
testArraySort(
{pack(0, 0), pack(0, 1), pack(0, 2)},
{pack(0, 0), pack(0, 1), pack(0, 2)},
{pack(0, 0), pack(0, 1), pack(0, 2)});
testArraySort(
{pack(1, 0), pack(0, 1), pack(2, 2)},
{pack(0, 1), pack(1, 0), pack(2, 2)},
{pack(2, 2), pack(1, 0), pack(0, 1)});
testArraySort(
{std::nullopt, pack(1, 0), pack(0, 1), pack(2, 2)},
{pack(0, 1), pack(1, 0), pack(2, 2), std::nullopt},
{pack(2, 2), pack(1, 0), pack(0, 1), std::nullopt});
testArraySort(
{std::nullopt, std::nullopt, pack(1, 2), pack(0, 1), pack(2, 0)},
{pack(0, 1), pack(1, 2), pack(2, 0), std::nullopt, std::nullopt},
{pack(2, 0), pack(1, 2), pack(0, 1), std::nullopt, std::nullopt});
testArraySort(
{std::nullopt, pack(1, 1), pack(0, 2), std::nullopt, pack(2, 0)},
{pack(0, 2), pack(1, 1), pack(2, 0), std::nullopt, std::nullopt},
{pack(2, 0), pack(1, 1), pack(0, 2), std::nullopt, std::nullopt});
testArraySort(
{pack(1, 1), std::nullopt, pack(0, 0), pack(2, 2), std::nullopt},
{pack(0, 0), pack(1, 1), pack(2, 2), std::nullopt, std::nullopt},
{pack(2, 2), pack(1, 1), pack(0, 0), std::nullopt, std::nullopt});
testArraySort(
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt},
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt},
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt});
}

template <typename T>
struct TimeZoneFunction {
VELOX_DEFINE_FUNCTION_TYPES(T);

FOLLY_ALWAYS_INLINE void call(
int64_t& result,
const arg_type<TimestampWithTimezone>& ts) {
result = unpackZoneKeyId(*ts);
}
};

TEST_F(ArraySortTest, timestampWithTimezoneWithLambda) {
registerFunction<TimeZoneFunction, int64_t, TimestampWithTimezone>(
{"timezone"});

auto testArraySort =
[this](
const std::vector<std::optional<int64_t>>& inputArray,
const std::vector<std::optional<int64_t>>& expectedAscArray,
const std::vector<std::optional<int64_t>>& expectedDescArray) {
const auto input = makeRowVector({makeArrayVector(
{0},
makeNullableFlatVector<int64_t>(
inputArray, TIMESTAMP_WITH_TIME_ZONE()))});
const auto expectedAsc = makeArrayVector(
{0},
makeNullableFlatVector<int64_t>(
expectedAscArray, TIMESTAMP_WITH_TIME_ZONE()));
const auto expectedDesc = makeArrayVector(
{0},
makeNullableFlatVector<int64_t>(
expectedDescArray, TIMESTAMP_WITH_TIME_ZONE()));

auto resultAsc = evaluate("array_sort(c0, x -> timezone(x))", input);
assertEqualVectors(expectedAsc, resultAsc);

auto resultDesc =
evaluate("array_sort_desc(c0, x -> timezone(x))", input);
assertEqualVectors(expectedDesc, resultDesc);
};

testArraySort(
{pack(2, 0), pack(1, 1), pack(0, 2)},
{pack(2, 0), pack(1, 1), pack(0, 2)},
{pack(0, 2), pack(1, 1), pack(2, 0)});
testArraySort(
{pack(0, 0), pack(1, 1), pack(2, 2)},
{pack(0, 0), pack(1, 1), pack(2, 2)},
{pack(2, 2), pack(1, 1), pack(0, 0)});
testArraySort(
{pack(0, 0), pack(0, 1), pack(0, 2)},
{pack(0, 0), pack(0, 1), pack(0, 2)},
{pack(0, 2), pack(0, 1), pack(0, 0)});
testArraySort(
{pack(1, 0), pack(0, 1), pack(2, 2)},
{pack(1, 0), pack(0, 1), pack(2, 2)},
{pack(2, 2), pack(0, 1), pack(1, 0)});
testArraySort(
{std::nullopt, pack(1, 0), pack(0, 1), pack(2, 2)},
{pack(1, 0), pack(0, 1), pack(2, 2), std::nullopt},
{pack(2, 2), pack(0, 1), pack(1, 0), std::nullopt});
testArraySort(
{std::nullopt, std::nullopt, pack(1, 2), pack(0, 1), pack(2, 0)},
{pack(2, 0), pack(0, 1), pack(1, 2), std::nullopt, std::nullopt},
{pack(1, 2), pack(0, 1), pack(2, 0), std::nullopt, std::nullopt});
testArraySort(
{std::nullopt, pack(1, 1), pack(0, 2), std::nullopt, pack(2, 0)},
{pack(2, 0), pack(1, 1), pack(0, 2), std::nullopt, std::nullopt},
{pack(0, 2), pack(1, 1), pack(2, 0), std::nullopt, std::nullopt});
testArraySort(
{pack(1, 1), std::nullopt, pack(0, 0), pack(2, 2), std::nullopt},
{pack(0, 0), pack(1, 1), pack(2, 2), std::nullopt, std::nullopt},
{pack(2, 2), pack(1, 1), pack(0, 0), std::nullopt, std::nullopt});
testArraySort(
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt},
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt},
{std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt});
}

TEST_F(ArraySortTest, floatingPointExtremes) {
testFloatingPoint<float>();
testFloatingPoint<double>();
Expand Down
Loading