aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2023-08-25 23:03:00 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2023-08-25 23:17:35 +0300
commitfcd88645dec99a9d5bcac7869e9561e651fd9a29 (patch)
tree9e8dfdafc7f2071b3b147cbc202646d07958dad1
parentfa45097cd8d5b9a64fb8ccb3bc4f55d4a7086b72 (diff)
downloadydb-fcd88645dec99a9d5bcac7869e9561e651fd9a29.tar.gz
Update contrib/libs/libpq to 15.3
-rw-r--r--contrib/libs/libpq/src/include/port/win32.h14
-rw-r--r--ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/cflags.inc16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt16
-rw-r--r--ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt16
10 files changed, 156 insertions, 2 deletions
diff --git a/contrib/libs/libpq/src/include/port/win32.h b/contrib/libs/libpq/src/include/port/win32.h
index e31861fc249..115708f2ea2 100644
--- a/contrib/libs/libpq/src/include/port/win32.h
+++ b/contrib/libs/libpq/src/include/port/win32.h
@@ -46,16 +46,26 @@
* defines for dynamic linking on Win32 platform
*/
+/*
+ * Variables declared in the core backend and referenced by loadable
+ * modules need to be marked "dllimport" in the core build, but
+ * "dllexport" when the declaration is read in a loadable module.
+ * No special markings should be used when compiling frontend code.
+ */
+#ifndef FRONTEND
#ifdef BUILDING_DLL
#define PGDLLIMPORT __declspec (dllexport)
#else
#define PGDLLIMPORT __declspec (dllimport)
#endif
+#endif
+/*
+ * Under MSVC, functions exported by a loadable module must be marked
+ * "dllexport". Other compilers don't need that.
+ */
#ifdef _MSC_VER
#define PGDLLEXPORT __declspec (dllexport)
-#else
-#define PGDLLEXPORT
#endif
/*
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
index 2eada65f3a7..39c06f2973e 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.darwin-x86_64.txt
@@ -93,6 +93,22 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
index e045b6b8287..c43bf16968c 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-aarch64.txt
@@ -91,6 +91,22 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
index abe5d7a8fa5..14bfc610189 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.linux-x86_64.txt
@@ -93,6 +93,22 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
index c8fe7003422..b64ba12501e 100644
--- a/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/CMakeLists.windows-x86_64.txt
@@ -105,6 +105,22 @@ target_compile_options(yql-parser-pg_wrapper PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/cflags.inc b/ydb/library/yql/parser/pg_wrapper/cflags.inc
index c796c601dd3..50f20e47096 100644
--- a/ydb/library/yql/parser/pg_wrapper/cflags.inc
+++ b/ydb/library/yql/parser/pg_wrapper/cflags.inc
@@ -97,4 +97,20 @@ CFLAGS(
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
)
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
index fcc636c10df..418f9715b0e 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.darwin-x86_64.txt
@@ -87,6 +87,22 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
index 3043dbcedc0..54610fdb601 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-aarch64.txt
@@ -87,6 +87,22 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
index b6d87ed5944..9b4398b00bc 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.linux-x86_64.txt
@@ -87,6 +87,22 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)
diff --git a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
index c66f106eecb..32bd09afb7f 100644
--- a/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/parser/pg_wrapper/ut/CMakeLists.windows-x86_64.txt
@@ -99,6 +99,22 @@ target_compile_options(ydb-library-yql-parser-pg_wrapper-ut PRIVATE
-Dscram_ServerKey=yql_scram_ServerKey
-Dscram_build_secret=yql_scram_build_secret
-Dpg_is_ascii=yql_pg_is_ascii
+ -DmakeJsonLexContextCstringLen=yql_makeJsonLexContextCstringLen
+ -DIsValidJsonNumber=yql_IsValidJsonNumber
+ -Djson_lex=yql_json_lex
+ -Dpg_parse_json=yql_pg_parse_json
+ -Djson_count_array_elements=yql_json_count_array_elements
+ -DnullSemAction=yql_nullSemAction
+ -Dpg_cryptohash_free=yql_pg_cryptohash_free
+ -Dpg_cryptohash_final=yql_pg_cryptohash_final
+ -Dpg_cryptohash_update=yql_pg_cryptohash_update
+ -Dpg_cryptohash_init=yql_pg_cryptohash_init
+ -Dpg_cryptohash_create=yql_pg_cryptohash_create
+ -Dpg_hmac_free=yql_pg_hmac_free
+ -Dpg_hmac_final=yql_pg_hmac_final
+ -Dpg_hmac_update=yql_pg_hmac_update
+ -Dpg_hmac_init=yql_pg_hmac_init
+ -Dpg_hmac_create=yql_pg_hmac_create
-DUSE_CURRENT_UDF_ABI_VERSION
$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>
)