@@ -103,7 +103,8 @@ cc_library(
103103 strip_include_prefix = 'build_service' ,
104104 deps = [
105105 ':bs_basic' , ':bs_task_target' , ':proto_cc_proto' ,
106- '//aios/autil:range_util' , '//aios/network/http_arpc'
106+ '//aios/autil:base64' , '//aios/autil:range_util' ,
107+ '//aios/network/http_arpc'
107108 ],
108109 alwayslink = True
109110)
@@ -281,14 +282,6 @@ cc_test(
281282 data = glob (['testdata/**' ]),
282283 deps = [':bs_io' , ':bs_testbase' ]
283284)
284- cc_library (
285- name = 'bs_plugin_config' ,
286- hdrs = ['build_service/plugin/ModuleInfo.h' ],
287- include_prefix = 'build_service' ,
288- strip_include_prefix = 'build_service' ,
289- visibility = ['//visibility:public' ],
290- deps = ['//aios/storage/indexlib/indexlib:indexlib_plugin_config' ]
291- )
292285cc_library (
293286 name = 'bs_config' ,
294287 srcs = glob (['build_service/config/*.cpp' ],
@@ -297,19 +290,20 @@ cc_library(
297290 'build_service/config/HashMode.cpp' ,
298291 'build_service/config/CLIOptionNames.cpp'
299292 ]),
300- hdrs = glob (['build_service/config/*.h' ],
293+ hdrs = glob (['build_service/config/*.h' , 'build_service/plugin/ModuleInfo.h' ],
301294 exclude = ['build_service/config/TaskTarget.h' ]),
302295 include_prefix = 'build_service' ,
303296 strip_include_prefix = 'build_service' ,
304297 visibility = ['//visibility:public' ],
305298 deps = [
306- ':bs_hashmode' , ':bs_plugin_config ' , ':bs_proto ' , ':bs_task_target ' ,
307- ':bs_util' , ' //aios/filesystem/fslib:fslib-framework' ,
299+ ':bs_hashmode' , ':bs_proto ' , ':bs_task_target ' , ':bs_util ' ,
300+ '//aios/filesystem/fslib:fslib-framework' ,
308301 '//aios/storage/indexlib/config:options' ,
309302 '//aios/storage/indexlib/config:schema' ,
310303 '//aios/storage/indexlib/framework:tablet_factory' ,
311304 '//aios/storage/indexlib/framework:tablet_schema_loader' ,
312- '//aios/storage/indexlib/indexlib/config'
305+ '//aios/storage/indexlib/indexlib/config' ,
306+ '//aios/storage/indexlib/legacy/config:module_info'
313307 ],
314308 alwayslink = True
315309)
@@ -324,7 +318,10 @@ cc_library(
324318)
325319cc_test (
326320 name = 'bs_config_test' ,
327- srcs = glob (['build_service/config/test/*.cpp' ]),
321+ srcs = glob (['build_service/config/test/*.cpp' ],
322+ exclude = [
323+ 'build_service/config/test/FakeRealtimeSchemaListKeeper.cpp'
324+ ]),
328325 copts = ['-fno-access-control' ],
329326 data = glob (['testdata/**' ]),
330327 deps = [
@@ -358,7 +355,7 @@ cc_library(
358355 '//aios/plugins/havenask_plugins/bs_reader_plugins:__subpackages__'
359356 ],
360357 deps = [
361- ':bs_config' , ':bs_proto' ,
358+ ':bs_config' , ':bs_proto' , '//aios/autil:resource_container' ,
362359 '//aios/storage/indexlib/framework/index_task:task_execute' ,
363360 '//aios/storage/indexlib/indexlib' ,
364361 '//aios/storage/indexlib/table/normal_table/index_task:document_reclaim' ,
@@ -468,7 +465,7 @@ cc_library(
468465cc_test (
469466 name = 'bs_document_test' ,
470467 srcs = glob (['build_service/document/test/*.cpp' ]),
471- copts = [],
468+ copts = ['-fno-access-control' ],
472469 data = glob (['testdata/**' ]),
473470 deps = [':bs_document' , ':bs_document_test_helper' , ':bs_testbase' ]
474471)
@@ -532,12 +529,21 @@ cc_library(
532529 strip_include_prefix = 'build_service' ,
533530 deps = [':bs_testbase' , ':bs_worker' ]
534531)
532+ cc_library (
533+ name = 'bs_config_test_helper' ,
534+ srcs = glob (['build_service/config/test/Fake*.cpp' ]),
535+ hdrs = glob (['build_service/config/test/Fake*.h' ]),
536+ include_prefix = 'build_service' ,
537+ strip_include_prefix = 'build_service' ,
538+ deps = [':bs_common_test_helper' ]
539+ )
535540cc_library (
536541 name = 'bs_admin_test_helper' ,
537542 srcs = glob ([
538543 'build_service/admin/test/Mock*.cpp' ,
539544 'build_service/admin/test/Fake*.cpp' ,
540545 'build_service/admin/test/GenerationTaskStateMachine.cpp' ,
546+ 'build_service/admin/test/BuilderV2Node.cpp' ,
541547 'build_service/admin/test/SoReplaceGenerationTask.cpp'
542548 ]),
543549 hdrs = (
@@ -547,15 +553,16 @@ cc_library(
547553 ]) + [
548554 'build_service/admin/test/FileUtilForTest.h' ,
549555 'build_service/admin/test/GenerationTaskStateMachine.h' ,
556+ 'build_service/admin/test/BuilderV2Node.h' ,
550557 'build_service/admin/test/SoReplaceGenerationTask.h' ,
551558 'build_service/admin/test/FakeZkState.cpp'
552559 ]
553560 ),
554561 include_prefix = 'build_service' ,
555562 strip_include_prefix = 'build_service' ,
556563 deps = [
557- ':bs_admin' , ':bs_common_test_helper' , ':bs_proto_test_helper ' ,
558- ':bs_testbase' , ':bs_worker'
564+ ':bs_admin' , ':bs_common_test_helper' , ':bs_config_test_helper ' ,
565+ ':bs_proto_test_helper' , ': bs_testbase' , ':bs_worker'
559566 ]
560567)
561568cc_library (
@@ -592,6 +599,34 @@ cc_library(
592599 ] + ['//aios/future_lite/future_lite/executors:simple_async_io_executor' ]),
593600 alwayslink = True
594601)
602+ cc_library (
603+ name = 'bs_builder_test_helper' ,
604+ srcs = [
605+ 'build_service/builder/test/FakeThread.cpp' ,
606+ 'build_service/builder/test/IndexBuilderCreator.cpp'
607+ ],
608+ hdrs = glob (['build_service/builder/test/*.h' ]),
609+ copts = [],
610+ include_prefix = 'build_service' ,
611+ strip_include_prefix = 'build_service' ,
612+ deps = [':bs_builder' , ':bs_testbase' ]
613+ )
614+ cc_test (
615+ name = 'bs_builder_test' ,
616+ srcs = glob (['build_service/builder/test/*Test.cpp' ],
617+ exclude = ['build_service/builder/test/BuilderRangeTest.cpp' ]),
618+ copts = ['-fno-access-control' ],
619+ data = glob (['testdata/**' ]),
620+ shard_count = 5 ,
621+ deps = [
622+ ':bs_builder' , ':bs_builder_test_helper' , ':bs_document_test_helper' ,
623+ ':bs_testbase' ,
624+ '//aios/storage/indexlib/document/test:KVDocumentBatchMaker' ,
625+ '//aios/storage/indexlib/framework/mock:tablet' ,
626+ '//aios/storage/indexlib/indexlib:indexlib_testlib' ,
627+ '//aios/storage/indexlib/indexlib/test:document'
628+ ]
629+ )
595630cc_library (
596631 name = 'bs_workflow' ,
597632 srcs = glob (['build_service/workflow/*.cpp' ]),
@@ -675,9 +710,9 @@ cc_library(
675710 strip_include_prefix = 'build_service' ,
676711 visibility = ['//visibility:public' ],
677712 deps = [
678- ':bs_basic' , ':bs_common' , ':bs_config' , ':bs_merge' , ':bs_task_base ' ,
679- ':bs_util ' , '//aios/autil:env_util ' , '//aios/future_lite ' ,
680- '//aios/storage/indexlib/config:options' ,
713+ ':bs_basic' , ':bs_common' , ':bs_config' , ':bs_general_task ' ,
714+ ':bs_merge ' , ':bs_task_base ' , ':bs_util' , ' //aios/autil:env_util ' ,
715+ '//aios/future_lite' , '//aios/ storage/indexlib/config:options' ,
681716 '//aios/storage/indexlib/config:schema' ,
682717 '//aios/storage/indexlib/framework:tablet' ,
683718 '//aios/storage/indexlib/framework:version_cleaner' ,
@@ -713,6 +748,14 @@ cc_library(
713748 visibility = ['//visibility:public' ],
714749 deps = [':bs_processor' ]
715750)
751+ cc_library (
752+ name = 'mock_raw_document_rewriter' ,
753+ hdrs = ['build_service/workflow/test/MockRawDocumentRewriter.h' ],
754+ include_prefix = 'build_service' ,
755+ strip_include_prefix = 'build_service' ,
756+ visibility = ['//visibility:public' ],
757+ deps = [':bs_workflow' ]
758+ )
716759cc_library (
717760 name = 'mock_builder_v2' ,
718761 hdrs = ['build_service/builder/test/MockBuilderV2.h' ],
@@ -763,6 +806,7 @@ cc_library(
763806cc_binary (
764807 name = 'bs_admin_worker' ,
765808 srcs = glob (['build_service/admin/AdminWorker.cpp' ]),
809+ tags = ['fuse-keep-symbol' , 'manual' , 'no-remote-exec' ],
766810 visibility = ['//visibility:public' ],
767811 deps = [
768812 ':bs_admin' , '//aios/worker_framework:worker_base_main' , '@gperftools'
@@ -771,6 +815,7 @@ cc_binary(
771815cc_binary (
772816 name = 'build_service_worker' ,
773817 srcs = ['@com_google_protobuf//:protobuf' ],
818+ tags = ['fuse-keep-symbol' , 'manual' , 'no-remote-exec' ],
774819 visibility = ['//visibility:public' ],
775820 deps = [
776821 ':bs_worker' , '//aios/network/gig:multi_call' ,
0 commit comments