Merge d3fc4ec into ef84e11

ydb/library/yql/parser/pg_wrapper/interface/utils.h

@@ -15,10 +15,6 @@ bool ParsePgIntervalModifier(const TString& str, i32& ret);
 std::unique_ptr<NUdf::IPgBuilder> CreatePgBuilder();
 bool HasPgKernel(ui32 procOid);
 
+ui64 HexEncode(const char *src, size_t len, char *dst);
 } // NYql
 
-extern "C" {
-    // copied from postgres/src/include/utils/builtins.h
-    ui64 hex_encode(const char *src, size_t len, char *dst);
-}
-

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

@@ -23,6 +23,7 @@ extern "C" {
 
 #undef Min
 #undef Max
+#undef Abs
 #undef bind
 #undef open
 #undef FATAL

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

@@ -0,0 +1,14 @@
+#include <ydb/library/yql/parser/pg_wrapper/interface/interface.h>
+#include <ydb/library/yql/parser/pg_wrapper/pg_compat.h>
+
+extern "C" {
+#include <utils/builtins.h>
+}
+
+
+namespace NYql {
+    ui64 HexEncode(const char *src, size_t len, char *dst) {
+        return ::hex_encode(src, len, dst);
+    }
+}
+

ydb/library/yql/parser/pg_wrapper/ya.make

@@ -37,6 +37,7 @@ SRCS(
     config.cpp
     cost_mocks.cpp
     syscache.cpp
+    pg_utils_wrappers.cpp
 )
 
 IF (ARCH_X86_64)

ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp

@@ -496,13 +496,12 @@ TString GetPostgresServerVersionStr() {
     return "pg_sql_dummy";
 }
 
-} // namespace NKikimr::NPg
-
-ui64 hex_encode(const char *src, size_t len, char *dst) {
+ui64 HexEncode(const char *src, size_t len, char *dst) {
     Y_UNUSED(src);
     Y_UNUSED(len);
     Y_UNUSED(dst);
 
-    return 0;
+    throw yexception() << "HexEncode in pg_dummy does nothing";
 }
 
+} // namespace NKikimr::NPg

ydb/library/yql/tools/pgrun/pgrun.cpp

@@ -825,7 +825,7 @@ TString GetCellData(const NYT::TNode& cell, const TColumn& column) {
                     result.resize(expectedSize);
                     result[0] = '\\';
                     result[1] = 'x';
-                    const auto cnt = hex_encode(rawValue.data(), rawValue.size(), result.begin() + 2);
+                    const auto cnt = HexEncode(rawValue.data(), rawValue.size(), result.begin() + 2);
 
                     Y_ASSERT(cnt + 2 == expectedSize);