diff options
| author | Sviatlana Zuiko <sviatlana.zuiko@mongodb.com> | 2022-06-30 19:32:15 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-30 22:33:22 +0000 |
| commit | ff5ce6771bd53616ed644ee794ba69c2fe6d91c3 (patch) | |
| tree | d5d6b4ff5490b44085446dd5c0289dd2924ab656 /src/mongo/db/index/SConscript | |
| parent | 17f49ab8b16a6f45371771d8c152cfbf4ed186af (diff) | |
| download | mongo-ff5ce6771bd53616ed644ee794ba69c2fe6d91c3.tar.gz | |
Revert "SERVER-65481 Bulk shredding and loading for column store indexes"
This reverts commit cb9472afc30d32d1c18691d64899c1aa72cdc43d.
Diffstat (limited to 'src/mongo/db/index/SConscript')
| -rw-r--r-- | src/mongo/db/index/SConscript | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript index f71d78da857..9ccff04ff89 100644 --- a/src/mongo/db/index/SConscript +++ b/src/mongo/db/index/SConscript @@ -84,9 +84,9 @@ env.Library( ], ) -iamEnv = env.Clone() -iamEnv.InjectThirdParty(libraries=['snappy']) -iamEnv.Library( +serveronlyEnv = env.Clone() +serveronlyEnv.InjectThirdParty(libraries=['snappy']) +serveronlyEnv.Library( target="index_access_method", source=[ 'duplicate_key_tracker.cpp', @@ -119,22 +119,6 @@ iamEnv.Library( ], ) -iamEnv.Library( - target="column_store_index", - source=[ - 'column_cell.cpp', - "column_store_sorter.cpp", - ], - LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/sorter/sorter_idl', - '$BUILD_DIR/mongo/db/storage/encryption_hooks', - '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/s/is_mongos', - '$BUILD_DIR/third_party/shim_snappy', - ], -) - env.Library( target="index_access_methods", source=[ @@ -153,26 +137,31 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/mongo/db/concurrency/exception_util', - '$BUILD_DIR/mongo/db/curop', '$BUILD_DIR/mongo/db/fts/base_fts', '$BUILD_DIR/mongo/db/index_names', - 'column_store_index', + 'columnar_index', 'expression_params', 'key_generator', ], ) -indexTestEnv = env.Clone() -indexTestEnv.InjectThirdParty(libraries=['snappy']) -indexTestEnv.CppUnitTest( +env.Library( + target="columnar_index", + source=[ + 'column_cell.cpp', + ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/base', + ], +) + +env.CppUnitTest( target='db_index_test', source=[ '2d_key_generator_test.cpp', 'btree_key_generator_test.cpp', 'column_cell_test.cpp', 'column_key_generator_test.cpp', - 'column_store_sorter_test.cpp', 'hash_key_generator_test.cpp', 's2_key_generator_test.cpp', 's2_bucket_key_generator_test.cpp', @@ -188,7 +177,7 @@ indexTestEnv.CppUnitTest( '$BUILD_DIR/mongo/db/query/query_test_service_context', '$BUILD_DIR/mongo/db/query/sort_pattern', '$BUILD_DIR/mongo/db/record_id_helpers', - 'column_store_index', + 'columnar_index', 'expression_params', 'key_generator', ], |