Skip to content

Improve checkResult fun in arrow_ut.cpp #1135

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

Merged
resetius merged 5 commits into from
Jan 19, 2024
Merged

Improve checkResult fun in arrow_ut.cpp #1135

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ea1447
Improve checkResult fun in arrow_ut.cpp
Jan 18, 2024
a453648
Merge branch 'ydb-platform:main' into dev
Jan 18, 2024
61b2355
improve checkResult function in arrow_ut.cpp
Jan 18, 2024
7bee2dc
Merge branch 'ydb-platform:main' into dev
Jan 18, 2024
bdd8f81
Change list of checkResult's arg in arrow_ut.cpp
Jan 18, 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
41 changes: 17 additions & 24 deletions ydb/library/yql/parser/pg_wrapper/ut/arrow_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,24 @@ extern "C" {

namespace {

void checkResult(const char ** expected, std::shared_ptr<arrow::ArrayData> data) {
template <bool IsFixedSizeReader>
void checkResult(const char ** expected, auto result, NYql::NUdf::IBlockReader* reader, auto out_fun) {
const auto& data = result->data();

NYql::NUdf::TStringBlockReader<arrow::BinaryType, true> reader;
for (int i = 0; i < data->length; i++) {
auto item = reader.GetItem(*data, i);
if (!item) {
if (result->IsNull(i)) {
UNIT_ASSERT(expected[i] == nullptr);
} else {
const char* addr = item.AsStringRef().Data() + sizeof(void*);
UNIT_ASSERT(expected[i] != nullptr);

Datum item;
if constexpr (IsFixedSizeReader) {
item = reader->GetItem(*data, i).template As<Datum>();
} else {
item = Datum(reader->GetItem(*data, i).AsStringRef().Data() + sizeof(void*));
}
UNIT_ASSERT_VALUES_EQUAL(
TString(DatumGetCString(DirectFunctionCall1(numeric_out, (Datum)addr))),
TString(DatumGetCString(DirectFunctionCall1(out_fun, item))),
expected[i]
);
}
Expand Down Expand Up @@ -70,15 +76,13 @@ Y_UNIT_TEST(PgConvertNumericDouble) {
builder.Finish(&array);

auto result = PgConvertNumeric<double>(array);
const auto& data = result->data();



const char* expected[] = {
"1.1", "31.37", nullptr, "-1.337", "0"
};

checkResult(expected, data);
NYql::NUdf::TStringBlockReader<arrow::BinaryType, true> reader;
checkResult<false>(expected, result, &reader, numeric_out);
}

Y_UNIT_TEST(PgConvertNumericInt) {
Expand All @@ -101,7 +105,8 @@ Y_UNIT_TEST(PgConvertNumericInt) {
"11", "3137", nullptr, "-1337", "0"
};

checkResult(expected, data);
NYql::NUdf::TStringBlockReader<arrow::BinaryType, true> reader;
checkResult<false>(expected, result, &reader, numeric_out);
}

Y_UNIT_TEST(PgConvertDate32Date) {
Expand All @@ -124,26 +129,14 @@ Y_UNIT_TEST(PgConvertDate32Date) {

auto converter = BuildPgColumnConverter(std::shared_ptr<arrow::DataType>(new arrow::Date32Type), targetType);
auto result = converter(array);
const auto& data = result->data();
UNIT_ASSERT_VALUES_EQUAL(result->length(), 6);

const char* expected[] = {
"1998-01-01", nullptr, "2001-01-01", "1998-01-01", "2000-01-02", "2002-01-01"
};

NUdf::TFixedSizeBlockReader<ui64, true> reader;
for (int i = 0; i < 6; i++) {
if (result->IsNull(i)) {
UNIT_ASSERT(expected[i] == nullptr);
} else {
auto item = reader.GetItem(*data, i).As<Datum>();
UNIT_ASSERT(expected[i] != nullptr);
UNIT_ASSERT_VALUES_EQUAL(
TString(DatumGetCString(DirectFunctionCall1(date_out, item))),
expected[i]
);
}
}
checkResult<true>(expected, result, &reader, date_out);
}

} // Y_UNIT_TEST_SUITE(TArrowUtilsTests)
Expand Down