Skip to content

Can read date32 as PostgreSQL date from arrow #1046

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
merged 1 commit into from
Jan 16, 2024
Merged

Can read date32 as PostgreSQL date from arrow #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ydb/library/yql/parser/pg_wrapper/arrow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ TColumnConverter BuildPgColumnConverter(const std::shared_ptr<arrow::DataType>&
return [](const std::shared_ptr<arrow::Array>& value) {
return PgConvertFixed<ui16>(value, [](auto value){ return MakePgDateFromUint16(value); });
};
} else if (originalType->Equals(arrow::date32())) {
return [](const std::shared_ptr<arrow::Array>& value) {
return PgConvertFixed<i32>(value, [](auto value){ return MakePgDateFromUint16(value); });
};
} else {
return {};
}
Expand Down
2 changes: 2 additions & 0 deletions ydb/library/yql/parser/pg_wrapper/arrow_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <arrow/array.h>
#include <arrow/array/builder_binary.h>
#include <ydb/library/yql/parser/pg_wrapper/interface/arrow.h>

extern "C" {
#include "utils/numeric.h"
Expand All @@ -10,6 +11,7 @@ extern "C" {
namespace NYql {

Numeric PgFloatToNumeric(double item, ui64 scale, int digits);
TColumnConverter BuildPgColumnConverter(const std::shared_ptr<arrow::DataType>& originalType, NKikimr::NMiniKQL::TPgType* targetType);

template<typename T>
std::shared_ptr<arrow::Array> PgConvertNumeric(const std::shared_ptr<arrow::Array>& value) {
Expand Down
42 changes: 42 additions & 0 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 @@ -106,6 +106,48 @@ Y_UNIT_TEST(PgConvertNumericInt) {
}
}

Y_UNIT_TEST(PgConvertDate32Date) {
TArenaMemoryContext arena;

arrow::Date32Builder builder;
builder.Append(10227);
builder.AppendNull();
builder.Append(11323);
builder.Append(10227);
builder.Append(10958);
builder.Append(11688);

std::shared_ptr<arrow::Array> array;
builder.Finish(&array);

NKikimr::NMiniKQL::TScopedAlloc alloc(__LOCATION__);
NKikimr::NMiniKQL::TTypeEnvironment typeEnv(alloc);
auto* targetType = NKikimr::NMiniKQL::TPgType::Create(DATEOID, typeEnv);

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]
);
}
}
}

} // Y_UNIT_TEST_SUITE(TArrowUtilsTests)

} // namespace NYql
Expand Down