diff --git a/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make b/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make index a78011fbafaf..b050069fbc9f 100644 --- a/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make +++ b/ydb/library/yql/parser/proto_ast/gen/jsonpath/ya.make @@ -7,6 +7,7 @@ IF (CPP_PROTO) SET(ANTLR_PACKAGE_NAME NJsonPathGenerated) SET(PROTOBUF_HEADER_PATH ${MODDIR}) + SET(PROTOBUF_SUFFIX_PATH .pb.h) SET(LEXER_PARSER_NAMESPACE NALP) diff --git a/ydb/library/yql/parser/proto_ast/gen/multiproto.py b/ydb/library/yql/parser/proto_ast/gen/multiproto.py new file mode 100644 index 000000000000..75251fad9d0b --- /dev/null +++ b/ydb/library/yql/parser/proto_ast/gen/multiproto.py @@ -0,0 +1,110 @@ +import os +import sys + +NSPLIT=10 + +def main(argv): + input_dir="." + output_dir="." + name=sys.argv[1] + if len(argv)>2: + input_dir=argv[2] + if len(argv)>3: + output_dir=argv[3] + print("name:",name) + print("input_dir:",input_dir) + print("output_dir:",output_dir) + + in_h=os.path.join(input_dir,name + ".pb.h") + in_cpp=os.path.join(input_dir,name + ".pb.cc") + out_h=os.path.join(output_dir,name + ".pb.main.h") + out_cpp_template=os.path.join(output_dir,name + ".pb.I") + + with open(out_h,"w") as out_file: + with open(in_h,"r") as in_file: + for line in in_file: + line = line.replace("inline void RegisterArenaDtor","void RegisterArenaDtor") + out_file.write(line) + + for i in range(0,2 + NSPLIT): + with open(out_cpp_template.replace("I","code" + str(i) + ".cc" if i -#include \<@PROTOBUF_HEADER_PATH@/.pb.h> +#include \<@PROTOBUF_HEADER_PATH@/@PROTOBUF_SUFFIX_PATH@> #include "Lexer.h" diff --git a/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in b/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in index 06fb6a697da2..c232db86dc95 100644 --- a/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in +++ b/ydb/library/yql/parser/proto_ast/org/antlr/codegen/templates/protobuf/protobuf.stg.in @@ -43,7 +43,6 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions, syntax = "proto3"; option cc_enable_arenas = true; -option optimize_for = CODE_SIZE; package @ANTLR_PACKAGE_NAME@; diff --git a/ydb/library/yql/sql/v0/sql.cpp b/ydb/library/yql/sql/v0/sql.cpp index a8234d06ce01..ca8444a8a63b 100644 --- a/ydb/library/yql/sql/v0/sql.cpp +++ b/ydb/library/yql/sql/v0/sql.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ydb/library/yql/sql/v0/ya.make b/ydb/library/yql/sql/v0/ya.make index 334083a6c906..8211d93348d6 100644 --- a/ydb/library/yql/sql/v0/ya.make +++ b/ydb/library/yql/sql/v0/ya.make @@ -12,6 +12,7 @@ PEERDIR( ydb/library/yql/parser/proto_ast ydb/library/yql/parser/proto_ast/collect_issues ydb/library/yql/parser/proto_ast/gen/v0 + ydb/library/yql/parser/proto_ast/gen/v0_proto_split ) SRCS( diff --git a/ydb/library/yql/sql/v1/context.h b/ydb/library/yql/sql/v1/context.h index 2fea56385184..0ab493a62a1f 100644 --- a/ydb/library/yql/sql/v1/context.h +++ b/ydb/library/yql/sql/v1/context.h @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/ydb/library/yql/sql/v1/format/sql_format.cpp b/ydb/library/yql/sql/v1/format/sql_format.cpp index 9294fd1f67f4..b000932819a4 100644 --- a/ydb/library/yql/sql/v1/format/sql_format.cpp +++ b/ydb/library/yql/sql/v1/format/sql_format.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/ydb/library/yql/sql/v1/lexer/ya.make b/ydb/library/yql/sql/v1/lexer/ya.make index 75abcae1f055..01a200311c3b 100644 --- a/ydb/library/yql/sql/v1/lexer/ya.make +++ b/ydb/library/yql/sql/v1/lexer/ya.make @@ -5,7 +5,7 @@ PEERDIR( ydb/library/yql/parser/proto_ast ydb/library/yql/parser/proto_ast/gen/v1 ydb/library/yql/parser/proto_ast/gen/v1_ansi - ydb/library/yql/parser/proto_ast/gen/v1_proto + ydb/library/yql/parser/proto_ast/gen/v1_proto_split ) SRCS( diff --git a/ydb/library/yql/sql/v1/proto_parser/proto_parser.cpp b/ydb/library/yql/sql/v1/proto_parser/proto_parser.cpp index a26da0c62e09..04334f50b960 100644 --- a/ydb/library/yql/sql/v1/proto_parser/proto_parser.cpp +++ b/ydb/library/yql/sql/v1/proto_parser/proto_parser.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #if defined(_tsan_enabled_) #include diff --git a/ydb/library/yql/sql/v1/proto_parser/ya.make b/ydb/library/yql/sql/v1/proto_parser/ya.make index d0667167e0f5..5c16e92fa0cd 100644 --- a/ydb/library/yql/sql/v1/proto_parser/ya.make +++ b/ydb/library/yql/sql/v1/proto_parser/ya.make @@ -7,7 +7,7 @@ PEERDIR( ydb/library/yql/parser/proto_ast/collect_issues ydb/library/yql/parser/proto_ast/gen/v1 ydb/library/yql/parser/proto_ast/gen/v1_ansi - ydb/library/yql/parser/proto_ast/gen/v1_proto + ydb/library/yql/parser/proto_ast/gen/v1_proto_split ) SRCS( diff --git a/ydb/library/yql/sql/v1/sql_query.h b/ydb/library/yql/sql/v1/sql_query.h index 7f383a3ec051..982f9c8c317d 100644 --- a/ydb/library/yql/sql/v1/sql_query.h +++ b/ydb/library/yql/sql/v1/sql_query.h @@ -2,7 +2,7 @@ #include "sql_translation.h" -#include +#include #include namespace NSQLTranslationV1 { diff --git a/ydb/library/yql/sql/v1/sql_select.h b/ydb/library/yql/sql/v1/sql_select.h index 945722501da9..8d7d25d9b806 100644 --- a/ydb/library/yql/sql/v1/sql_select.h +++ b/ydb/library/yql/sql/v1/sql_select.h @@ -1,7 +1,7 @@ #pragma once #include "sql_translation.h" -#include +#include namespace NSQLTranslationV1 { diff --git a/ydb/library/yql/sql/v1/sql_translation.h b/ydb/library/yql/sql/v1/sql_translation.h index bcf0b8feba50..6d23faa04bf8 100644 --- a/ydb/library/yql/sql/v1/sql_translation.h +++ b/ydb/library/yql/sql/v1/sql_translation.h @@ -1,6 +1,6 @@ #pragma once #include "context.h" -#include +#include #include namespace NSQLTranslationV1 { diff --git a/ydb/library/yql/sql/v1/sql_values.h b/ydb/library/yql/sql/v1/sql_values.h index aaae53490f63..32834657e963 100644 --- a/ydb/library/yql/sql/v1/sql_values.h +++ b/ydb/library/yql/sql/v1/sql_values.h @@ -1,7 +1,7 @@ #pragma once #include "sql_translation.h" -#include +#include namespace NSQLTranslationV1 { diff --git a/ydb/library/yql/sql/v1/ya.make b/ydb/library/yql/sql/v1/ya.make index c6d812c707c3..3d86e879d40d 100644 --- a/ydb/library/yql/sql/v1/ya.make +++ b/ydb/library/yql/sql/v1/ya.make @@ -17,7 +17,7 @@ PEERDIR( ydb/library/yql/parser/proto_ast/collect_issues ydb/library/yql/parser/proto_ast/gen/v1 ydb/library/yql/parser/proto_ast/gen/v1_ansi - ydb/library/yql/parser/proto_ast/gen/v1_proto + ydb/library/yql/parser/proto_ast/gen/v1_proto_split ydb/library/yql/parser/pg_catalog ydb/library/yql/sql/v1/lexer ydb/library/yql/sql/v1/proto_parser