Merge bc58e72 into 3204f33

Author: kinash-varvara

ydb/library/yql/parser/pg_wrapper/arrow.cpp

@@ -183,14 +183,17 @@ std::shared_ptr<arrow::Array> PgDecimal128ConvertNumeric(const std::shared_ptr<a
     size_t length = data->length;
     arrow::BinaryBuilder builder;
 
+    bool error;
+    Numeric high_bits_mul = numeric_mul_opt_error(int64_to_numeric(int64_t(1) << 62), int64_to_numeric(4), &error);
+
     auto input = data->GetValues<arrow::Decimal128>(1);
     for (size_t i = 0; i < length; ++i) {
         if (value->IsNull(i)) {
             ARROW_OK(builder.AppendNull());
             continue;
         }
 
-        Numeric v = PgDecimal128ToNumeric(input[i].high_bits(), input[i].low_bits(), precision, scale);
+        Numeric v = PgDecimal128ToNumeric(input[i], precision, scale, high_bits_mul);
 
         auto datum = NumericGetDatum(v);
         auto ptr = (char*)datum;
@@ -204,8 +207,28 @@ std::shared_ptr<arrow::Array> PgDecimal128ConvertNumeric(const std::shared_ptr<a
     return ret;
 }
 
-Numeric PgDecimal128ToNumeric(int64_t high_bits, uint64_t low_bits, int32_t precision, int32_t scale) {
-    Numeric res = int64_div_fast_to_numeric(low_bits, scale);
+Numeric PgDecimal128ToNumeric(arrow::Decimal128 value, int32_t precision, int32_t scale, Numeric& high_bits_mul) {
+    uint64_t low_bits = value.low_bits();
+    int64 high_bits = value.high_bits();
+    std::cout << high_bits << '\n';
+    std::cout << low_bits << '\n';
+
+    bool error;
+    Numeric res;
+
+    if (!(high_bits == 0 || high_bits == -1)) {
+        if (low_bits > INT64_MAX){
+            high_bits += 1;
+        }
+        Numeric high_bits_res = numeric_mul_opt_error(int64_div_fast_to_numeric(high_bits, scale), high_bits_mul, &error);
+        Numeric low_bits_res  = int64_div_fast_to_numeric(int64_t(low_bits), scale);
+
+        res = numeric_add_opt_error(high_bits_res,  low_bits_res, &error);  
+    }
+    else {
+        res = int64_div_fast_to_numeric(low_bits, scale);
+    }
+ 
     return res;
 }
 

ydb/library/yql/parser/pg_wrapper/arrow_impl.h

@@ -11,7 +11,7 @@ extern "C" {
 namespace NYql {
 
 Numeric PgFloatToNumeric(double item, ui64 scale, int digits);
-Numeric PgDecimal128ToNumeric(int64_t high_bits, uint64_t low_bits, int32_t precision, int32_t scale);
+Numeric PgDecimal128ToNumeric(arrow::Decimal128 val, int32_t precision, int32_t scale, Numeric& high_bits_mul);
 TColumnConverter BuildPgColumnConverter(const std::shared_ptr<arrow::DataType>& originalType, NKikimr::NMiniKQL::TPgType* targetType);
 
 template<typename T>

ydb/library/yql/parser/pg_wrapper/ut/arrow_ut.cpp

@@ -185,6 +185,56 @@ Y_UNIT_TEST(PgConvertNumericDecimal128Scale5) {
     checkResult<false>(expected, result, &reader, numeric_out);
 }
 
+Y_UNIT_TEST(PgConvertNumericDecimal128BigScale3) {
+    TArenaMemoryContext arena;
+
+    int32_t precision = 20;
+    int32_t scale = 3;
+    std::shared_ptr<arrow::DataType> type(new arrow::Decimal128Type(precision, scale));
+    arrow::Decimal128Builder builder(type);
+
+    const char* expected[] = {
+        "36893488147419103.245", "-36893488147419103.245", nullptr
+    };
+
+    ARROW_OK(builder.Append(arrow::Decimal128::FromString("36893488147419103.245").ValueOrDie()));
+    ARROW_OK(builder.Append(arrow::Decimal128::FromString("-36893488147419103.245").ValueOrDie()));
+    ARROW_OK(builder.AppendNull());
+
+    std::shared_ptr<arrow::Array> array;
+    ARROW_OK(builder.Finish(&array));
+
+    auto result = PgDecimal128ConvertNumeric(array, precision, scale);
+
+    NYql::NUdf::TStringBlockReader<arrow::BinaryType, true> reader;
+    checkResult<false>(expected, result, &reader, numeric_out);
+}
+
+/*Y_UNIT_TEST(PgConvertNumericDecimal128BigScale6) {
+    TArenaMemoryContext arena;
+
+    int32_t precision = 24;
+    int32_t scale = 5;
+    std::shared_ptr<arrow::DataType> type(new arrow::Decimal128Type(precision, scale));
+    arrow::Decimal128Builder builder(type);
+
+    const char* expected[] = {
+        "3623458934881474191.03245", "-3623458934881474191.03245", nullptr
+    };
+
+    ARROW_OK(builder.Append(arrow::Decimal128::FromString("3623458934881474191.03245").ValueOrDie()));
+    ARROW_OK(builder.Append(arrow::Decimal128::FromString("-3623458934881474191.03245").ValueOrDie()));
+    ARROW_OK(builder.AppendNull());
+
+    std::shared_ptr<arrow::Array> array;
+    ARROW_OK(builder.Finish(&array));
+
+    auto result = PgDecimal128ConvertNumeric(array, precision, scale);
+
+    NYql::NUdf::TStringBlockReader<arrow::BinaryType, true> reader;
+    checkResult<false>(expected, result, &reader, numeric_out);
+}*/
+
 Y_UNIT_TEST(PgConvertNumericInt) {
     TArenaMemoryContext arena;