diff options
| author | vvvv <vvvv@yandex-team.ru> | 2022-02-18 15:51:22 +0300 |
|---|---|---|
| committer | vvvv <vvvv@yandex-team.ru> | 2022-02-18 15:51:22 +0300 |
| commit | eb15faa9ae95ee81f45268f14fcee30f4494da92 (patch) | |
| tree | fe12e44fd80be573f23c232540bad769a22ecbe8 | |
| parent | 8014e5b36dc12f9f0a483f684abb0a19dd2cb306 (diff) | |
| download | ydb-eb15faa9ae95ee81f45268f14fcee30f4494da92.tar.gz | |
YQL-13710 more patches
ref:711485d98a6ac39af3cb8d5c48cbb8d45044ab60
4 files changed, 9 insertions, 5 deletions
diff --git a/ydb/library/yql/parser/pg_query_wrapper/copy_src.py b/ydb/library/yql/parser/pg_query_wrapper/copy_src.py index 3a86e33bd36..58df98a1367 100644 --- a/ydb/library/yql/parser/pg_query_wrapper/copy_src.py +++ b/ydb/library/yql/parser/pg_query_wrapper/copy_src.py @@ -162,12 +162,17 @@ def get_vars(): s=subprocess.check_output("objdump ../../../../../contrib/libs/postgresql/libpostgres.a -tw",shell=True).decode("utf-8") for a in s.replace("\t"," ").split("\n"): for b in a.split(" "): - if b.startswith(".bss."): all_vars.add(b[5:]) - elif b.startswith(".data."): all_vars.add(b[6:]) + sym=None + if b.startswith(".bss."): sym=b[5:] + elif b.startswith(".data."): sym=b[6:] + if sym is not None: + all_vars.add(sym.replace("yql_","")) + all_vars.remove("Dummy_trace") all_vars.remove("backslash_quote") all_vars.remove("sentinel") # rbtree.c + all_vars.remove("nullSemAction") all_vars.remove("gistBufferingOptValues") all_vars.remove("boolRelOpts") diff --git a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/common/jsonapi.c b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/common/jsonapi.c index 222196fb2db..dfc14335f06 100644 --- a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/common/jsonapi.c +++ b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/common/jsonapi.c @@ -64,7 +64,7 @@ static JsonParseErrorType report_parse_error(JsonParseContext ctx, JsonLexContex static char *extract_token(JsonLexContext *lex); /* the null action object used for pure validation */ -__thread JsonSemAction nullSemAction = +JsonSemAction nullSemAction = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL diff --git a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/common/jsonapi.h b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/common/jsonapi.h index 2333d3be37c..bcfd57cc53c 100644 --- a/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/common/jsonapi.h +++ b/ydb/library/yql/parser/pg_query_wrapper/postgresql/src/include/common/jsonapi.h @@ -128,7 +128,7 @@ extern JsonParseErrorType pg_parse_json(JsonLexContext *lex, JsonSemAction *sem); /* the null action object used for pure validation */ -extern __thread JsonSemAction nullSemAction; +extern JsonSemAction nullSemAction; /* * json_count_array_elements performs a fast secondary parse to determine the diff --git a/ydb/library/yql/parser/pg_query_wrapper/vars.txt b/ydb/library/yql/parser/pg_query_wrapper/vars.txt index ea9e9e47469..1dd390df738 100644 --- a/ydb/library/yql/parser/pg_query_wrapper/vars.txt +++ b/ydb/library/yql/parser/pg_query_wrapper/vars.txt @@ -1044,7 +1044,6 @@ nfile nogc notifyInterruptPending noverify_checksums -nullSemAction numAllocatedDescs numExternalFDs numSems |