Merge f18dcd5 into d0fa983

Author: igormunkin

ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp

@@ -722,7 +722,7 @@ using TBaseComputation = TStatefulWideFlowCodegeneratorNode<TWideFromBlocksWrapp
         NUdf::TUnboxedValuePod Get(const THolderFactory& holderFactory, size_t idx) const {
             TBlockItem item;
             const auto& datum = TArrowBlock::From(Values_[idx]).GetDatum();
-            Y_DEBUG_ABORT_UNLESS(ValuesDescr_[idx] == datum.descr());
+            ARROW_DEBUG_CHECK_DATUM_TYPES(ValuesDescr_[idx], datum.descr());
             if (datum.is_scalar()) {
                 item = Readers_[idx]->GetScalarItem(*datum.scalar());
             } else {

ydb/library/yql/minikql/computation/mkql_block_impl.cpp

@@ -207,7 +207,7 @@ NUdf::TUnboxedValuePod TBlockFuncNode::DoCalculate(TComputationContext& ctx) con
     std::vector<arrow::Datum> argDatums;
     for (ui32 i = 0; i < ArgsNodes.size(); ++i) {
         argDatums.emplace_back(TArrowBlock::From(ArgsNodes[i]->GetValue(ctx)).GetDatum());
-        Y_DEBUG_ABORT_UNLESS(ArgsValuesDescr[i] == argDatums.back().descr());
+        ARROW_DEBUG_CHECK_DATUM_TYPES(ArgsValuesDescr[i], argDatums.back().descr());
     }
 
     if (ScalarOutput) {

ydb/library/yql/public/udf/arrow/defs.h

@@ -25,3 +25,8 @@ do {
     }()
 
 #define ARROW_RESULT(op)       ARROW_RESULT_S(op, "Bad status")
+
+#define ARROW_DEBUG_CHECK_DATUM_TYPES(expected, got) do {                              \
+    Y_DEBUG_ABORT_UNLESS((expected) == (got), "Bad datum type: %s expected, %s got",   \
+                         (expected).ToString().c_str(), (got).ToString().c_str());     \
+} while(false)