diff --git a/be/src/common/config.h b/be/src/common/config.h index 1b6786b7d92411..58a87397372fc5 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -246,8 +246,6 @@ CONF_mInt32(snapshot_expire_time_sec, "172800"); // It is only a recommended value. When the disk space is insufficient, // the file storage period under trash dose not have to comply with this parameter. CONF_mInt32(trash_file_expire_time_sec, "259200"); -// check row nums for BE/CE and schema change. true is open, false is closed. -CONF_mBool(row_nums_check, "true"); // minimum file descriptor number // modify them upon necessity CONF_Int32(min_file_descriptor_number, "60000"); @@ -267,8 +265,6 @@ CONF_Bool(disable_storage_page_cache, "false"); // whether to disable row cache feature in storage CONF_Bool(disable_storage_row_cache, "true"); -CONF_Bool(enable_storage_vectorization, "true"); - CONF_Bool(enable_low_cardinality_optimize, "true"); // be policy @@ -276,10 +272,6 @@ CONF_Bool(enable_low_cardinality_optimize, "true"); CONF_mBool(enable_compaction_checksum, "false"); // whether disable automatic compaction task CONF_mBool(disable_auto_compaction, "false"); -// whether enable vectorized compaction -CONF_Bool(enable_vectorized_compaction, "true"); -// whether enable vectorized schema change/material-view/rollup task. -CONF_Bool(enable_vectorized_alter_table, "true"); // whether enable vertical compaction CONF_mBool(enable_vertical_compaction, "true"); // whether enable ordered data compaction diff --git a/be/src/olap/column_mapping.h b/be/src/olap/column_mapping.h index a3ad7721d1ff3b..da77a9bfb84ecc 100644 --- a/be/src/olap/column_mapping.h +++ b/be/src/olap/column_mapping.h @@ -35,8 +35,6 @@ struct ColumnMapping { int32_t ref_column; // normally for default value. stores values for filters WrapperField* default_value; - // materialize view transform function used in schema change - std::string materialized_function; std::shared_ptr expr; const TabletColumn* new_column; }; diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp index b405e33815b663..fc01d9b9e9d156 100644 --- a/be/src/olap/compaction.cpp +++ b/be/src/olap/compaction.cpp @@ -241,9 +241,6 @@ bool Compaction::handle_ordered_data_compaction() { Status Compaction::do_compaction_impl(int64_t permits) { OlapStopWatch watch; - auto use_vectorized_compaction = config::enable_vectorized_compaction; - string merge_type = use_vectorized_compaction ? "v" : ""; - if (handle_ordered_data_compaction()) { RETURN_NOT_OK(modify_rowsets()); TRACE("modify rowsets finished"); @@ -255,7 +252,7 @@ Status Compaction::do_compaction_impl(int64_t permits) { _tablet->set_last_base_compaction_success_time(now); } auto cumu_policy = _tablet->cumulative_compaction_policy(); - LOG(INFO) << "succeed to do ordered data " << merge_type << compaction_name() + LOG(INFO) << "succeed to do ordered data " << compaction_name() << ". tablet=" << _tablet->full_name() << ", output_version=" << _output_version << ", disk=" << _tablet->data_dir()->path() << ", segments=" << _input_num_segments << ", input_row_num=" << _input_row_num @@ -267,7 +264,7 @@ Status Compaction::do_compaction_impl(int64_t permits) { } build_basic_info(); - LOG(INFO) << "start " << merge_type << compaction_name() << ". tablet=" << _tablet->full_name() + LOG(INFO) << "start " << compaction_name() << ". tablet=" << _tablet->full_name() << ", output_version=" << _output_version << ", permits: " << permits; bool vertical_compaction = should_vertical_compaction(); RETURN_NOT_OK(construct_input_rowset_readers()); @@ -286,21 +283,17 @@ Status Compaction::do_compaction_impl(int64_t permits) { } Status res; - if (use_vectorized_compaction) { - if (vertical_compaction) { - res = Merger::vertical_merge_rowsets(_tablet, compaction_type(), _cur_tablet_schema, - _input_rs_readers, _output_rs_writer.get(), - get_avg_segment_rows(), &stats); - } else { - res = Merger::vmerge_rowsets(_tablet, compaction_type(), _cur_tablet_schema, - _input_rs_readers, _output_rs_writer.get(), &stats); - } + if (vertical_compaction) { + res = Merger::vertical_merge_rowsets(_tablet, compaction_type(), _cur_tablet_schema, + _input_rs_readers, _output_rs_writer.get(), + get_avg_segment_rows(), &stats); } else { - LOG(FATAL) << "Only support vectorized compaction"; + res = Merger::vmerge_rowsets(_tablet, compaction_type(), _cur_tablet_schema, + _input_rs_readers, _output_rs_writer.get(), &stats); } if (!res.ok()) { - LOG(WARNING) << "fail to do " << merge_type << compaction_name() << ". res=" << res + LOG(WARNING) << "fail to do " << compaction_name() << ". res=" << res << ", tablet=" << _tablet->full_name() << ", output_version=" << _output_version; return res; @@ -351,9 +344,8 @@ Status Compaction::do_compaction_impl(int64_t permits) { auto cumu_policy = _tablet->cumulative_compaction_policy(); DCHECK(cumu_policy); - LOG(INFO) << "succeed to do " << merge_type << compaction_name() - << " is_vertical=" << vertical_compaction << ". tablet=" << _tablet->full_name() - << ", output_version=" << _output_version + LOG(INFO) << "succeed to do " << compaction_name() << " is_vertical=" << vertical_compaction + << ". tablet=" << _tablet->full_name() << ", output_version=" << _output_version << ", current_max_version=" << current_max_version << ", disk=" << _tablet->data_dir()->path() << ", segments=" << _input_num_segments << ", input_row_num=" << _input_row_num diff --git a/be/src/olap/olap_server.cpp b/be/src/olap/olap_server.cpp index e621e893f89140..97cdbcf437d925 100644 --- a/be/src/olap/olap_server.cpp +++ b/be/src/olap/olap_server.cpp @@ -83,7 +83,7 @@ Status StorageEngine::start_bg_threads() { .set_min_threads(config::max_cumu_compaction_threads) .set_max_threads(config::max_cumu_compaction_threads) .build(&_cumu_compaction_thread_pool); - if (config::enable_segcompaction && config::enable_storage_vectorization) { + if (config::enable_segcompaction) { ThreadPoolBuilder("SegCompactionTaskThreadPool") .set_min_threads(config::seg_compaction_max_threads) .set_max_threads(config::seg_compaction_max_threads) diff --git a/be/src/olap/push_handler.h b/be/src/olap/push_handler.h index ae6c67431d2e50..b852e68bb25201 100644 --- a/be/src/olap/push_handler.h +++ b/be/src/olap/push_handler.h @@ -39,8 +39,6 @@ class RowCursor; class PushHandler { public: - using SchemaMapping = std::vector; - PushHandler() = default; ~PushHandler() = default; @@ -62,7 +60,6 @@ class PushHandler { Status _do_streaming_ingestion(TabletSharedPtr tablet, const TPushReq& request, PushType push_type, std::vector* tablet_info_vec); -private: // mainly tablet_id, version and delta file path TPushReq _request; diff --git a/be/src/olap/rowset/beta_rowset_reader.cpp b/be/src/olap/rowset/beta_rowset_reader.cpp index e57bda9fea4e7e..2ed1891892445b 100644 --- a/be/src/olap/rowset/beta_rowset_reader.cpp +++ b/be/src/olap/rowset/beta_rowset_reader.cpp @@ -250,19 +250,15 @@ Status BetaRowsetReader::next_block(vectorized::Block* block) { Status BetaRowsetReader::next_block_view(vectorized::BlockView* block_view) { SCOPED_RAW_TIMER(&_stats->block_fetch_ns); - if (config::enable_storage_vectorization && _context->is_vec) { - do { - auto s = _iterator->next_block_view(block_view); - if (!s.ok()) { - if (!s.is()) { - LOG(WARNING) << "failed to read next block view: " << s.to_string(); - } - return s; + do { + auto s = _iterator->next_block_view(block_view); + if (!s.ok()) { + if (!s.is()) { + LOG(WARNING) << "failed to read next block view: " << s.to_string(); } - } while (block_view->empty()); - } else { - return Status::NotSupported("block view only support enable_storage_vectorization"); - } + return s; + } + } while (block_view->empty()); return Status::OK(); } diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp b/be/src/olap/rowset/beta_rowset_writer.cpp index 684d42a1f829ef..4105181501b4c1 100644 --- a/be/src/olap/rowset/beta_rowset_writer.cpp +++ b/be/src/olap/rowset/beta_rowset_writer.cpp @@ -294,8 +294,8 @@ bool BetaRowsetWriter::_check_and_set_is_doing_segcompaction() { Status BetaRowsetWriter::_segcompaction_if_necessary() { Status status = Status::OK(); - if (!config::enable_segcompaction || !config::enable_storage_vectorization || - _context.tablet_schema->is_dynamic_schema() || !_check_and_set_is_doing_segcompaction()) { + if (!config::enable_segcompaction || _context.tablet_schema->is_dynamic_schema() || + !_check_and_set_is_doing_segcompaction()) { return status; } if (_segcompaction_status.load() != OK) { @@ -326,7 +326,7 @@ Status BetaRowsetWriter::_segcompaction_if_necessary() { Status BetaRowsetWriter::_segcompaction_ramaining_if_necessary() { Status status = Status::OK(); DCHECK_EQ(_is_doing_segcompaction, false); - if (!config::enable_segcompaction || !config::enable_storage_vectorization) { + if (!config::enable_segcompaction) { return Status::OK(); } if (_segcompaction_status.load() != OK) { diff --git a/be/src/olap/rowset/rowset_reader_context.h b/be/src/olap/rowset/rowset_reader_context.h index e342a5a82459bb..0fce2cde122c27 100644 --- a/be/src/olap/rowset/rowset_reader_context.h +++ b/be/src/olap/rowset/rowset_reader_context.h @@ -67,7 +67,6 @@ struct RowsetReaderContext { bool use_page_cache = false; int sequence_id_idx = -1; int batch_size = 1024; - bool is_vec = false; bool is_unique = false; //record row num merged in generic iterator uint64_t* merged_rows = nullptr; diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp index d9d0a34e6f667a..f15cb502742f1d 100644 --- a/be/src/olap/schema_change.cpp +++ b/be/src/olap/schema_change.cpp @@ -197,11 +197,9 @@ class MultiBlockMerger { RowRefComparator _cmp; }; -RowBlockChanger::RowBlockChanger(TabletSchemaSPtr tablet_schema, - const DeleteHandler* delete_handler, DescriptorTbl desc_tbl) +RowBlockChanger::RowBlockChanger(TabletSchemaSPtr tablet_schema, DescriptorTbl desc_tbl) : _desc_tbl(desc_tbl) { _schema_mapping.resize(tablet_schema->num_columns()); - _delete_handler = delete_handler; } RowBlockChanger::~RowBlockChanger() { @@ -259,7 +257,7 @@ Status RowBlockChanger::change_block(vectorized::Block* ref_block, int result_column_id = -1; RETURN_IF_ERROR(ctx->execute(ref_block, &result_column_id)); - DCHECK(ref_block->get_by_position(result_column_id).column->size() == row_size) + CHECK(ref_block->get_by_position(result_column_id).column->size() == row_size) << new_block->get_by_position(idx).name << " size invalid" << ", expect=" << row_size << ", real=" << ref_block->get_by_position(result_column_id).column->size(); @@ -288,7 +286,7 @@ Status RowBlockChanger::change_block(vectorized::Block* ref_block, // not nullable to nullable if (new_col_nullable) { auto* new_nullable_col = assert_cast( - std::move(*new_col.column).mutate().get()); + new_col.column->assume_mutable().get()); new_nullable_col->swap_nested_column(ref_col.column); new_nullable_col->get_null_map_data().resize_fill(new_nullable_col->size()); @@ -299,7 +297,7 @@ Status RowBlockChanger::change_block(vectorized::Block* ref_block, // the cast expr of schema change is `CastExpr(CAST String to Nullable(Int32))`, // so need to handle nullable to not nullable here auto* ref_nullable_col = assert_cast( - std::move(*ref_col.column).mutate().get()); + ref_col.column->assume_mutable().get()); ref_nullable_col->swap_nested_column(new_col.column); } @@ -582,9 +580,7 @@ Status VSchemaChangeWithSorting::_external_sorting(vector& src_ SchemaChangeForInvertedIndex::SchemaChangeForInvertedIndex( const std::vector& alter_inverted_indexs, const TabletSchemaSPtr& tablet_schema) - : SchemaChange(), - _alter_inverted_indexs(alter_inverted_indexs), - _tablet_schema(tablet_schema) { + : _alter_inverted_indexs(alter_inverted_indexs), _tablet_schema(tablet_schema) { _olap_data_convertor = std::make_unique(); } @@ -676,7 +672,7 @@ Status SchemaChangeForInvertedIndex::process(RowsetReaderSharedPtr rowset_reader std::shared_ptr block = std::make_shared(_tablet_schema->create_block(return_columns)); - do { + while (true) { res = iter->next_batch(block.get()); if (!res.ok()) { if (res.is()) { @@ -693,7 +689,7 @@ Status SchemaChangeForInvertedIndex::process(RowsetReaderSharedPtr rowset_reader return res; } block->clear_column_data(); - } while (true); + } // finish write inverted index, flush data to compound file for (auto& writer_sign : inverted_index_writer_signs) { @@ -724,10 +720,11 @@ Status SchemaChangeForInvertedIndex::_add_nullable( auto next_run_step = [&]() { size_t step = 1; for (auto i = offset + 1; i < num_rows; ++i) { - if (null_map[offset] == null_map[i]) + if (null_map[offset] == null_map[i]) { step++; - else + } else { break; + } } return step; }; @@ -877,8 +874,6 @@ Status SchemaChangeHandler::process_alter_inverted_index(const TAlterInvertedInd std::shared_mutex SchemaChangeHandler::_mutex; std::unordered_set SchemaChangeHandler::_tablet_ids_in_converting; -std::set SchemaChangeHandler::_supported_functions = {"hll_hash", "to_bitmap", - "to_bitmap_with_check"}; // In the past schema change and rollup will create new tablet and will wait for txns starting before the task to finished // It will cost a lot of time to wait and the task is very difficult to understand. @@ -1055,7 +1050,6 @@ Status SchemaChangeHandler::_do_process_alter_tablet_v2(const TAlterTabletReqV2& reader_context.sequence_id_idx = reader_context.tablet_schema->sequence_col_idx(); reader_context.is_unique = base_tablet->keys_type() == UNIQUE_KEYS; reader_context.batch_size = ALTER_TABLE_BATCH_SIZE; - reader_context.is_vec = config::enable_vectorized_alter_table; reader_context.delete_bitmap = &base_tablet->tablet_meta()->delete_bitmap(); reader_context.version = Version(0, end_version); for (auto& rs_reader : rs_readers) { @@ -1105,16 +1099,6 @@ Status SchemaChangeHandler::_do_process_alter_tablet_v2(const TAlterTabletReqV2& } if (item.__isset.mv_expr) { - if (item.mv_expr.nodes[0].node_type == TExprNodeType::FUNCTION_CALL) { - mv_param.mv_expr = item.mv_expr.nodes[0].fn.name.function_name; - if (!config::enable_vectorized_alter_table && - !_supported_functions.count(mv_param.mv_expr)) { - return Status::NotSupported("Unknow materialized view expr " + - mv_param.mv_expr); - } - } else if (item.mv_expr.nodes[0].node_type == TExprNodeType::CASE_EXPR) { - mv_param.mv_expr = "count_field"; - } mv_param.expr = std::make_shared(item.mv_expr); } sc_params.materialized_params_map.insert( @@ -1362,7 +1346,6 @@ Status SchemaChangeHandler::_get_rowset_readers(TabletSharedPtr tablet, reader_context.sequence_id_idx = reader_context.tablet_schema->sequence_col_idx(); reader_context.is_unique = tablet->keys_type() == UNIQUE_KEYS; reader_context.batch_size = ALTER_TABLE_BATCH_SIZE; - reader_context.is_vec = config::enable_vectorized_alter_table; reader_context.delete_bitmap = &tablet->tablet_meta()->delete_bitmap(); reader_context.version = Version(0, end_version); @@ -1532,8 +1515,7 @@ Status SchemaChangeHandler::_convert_historical_rowsets(const SchemaChangeParams // Add filter information in change, and filter column information will be set in _parse_request // And filter some data every time the row block changes - RowBlockChanger rb_changer(sc_params.new_tablet->tablet_schema(), sc_params.delete_handler, - *sc_params.desc_tbl); + RowBlockChanger rb_changer(sc_params.new_tablet->tablet_schema(), *sc_params.desc_tbl); bool sc_sorting = false; bool sc_directly = false; @@ -1671,7 +1653,6 @@ Status SchemaChangeHandler::_parse_request(const SchemaChangeParams& sc_params, if (materialized_function_map.find(column_name) != materialized_function_map.end()) { auto mvParam = materialized_function_map.find(column_name)->second; - column_mapping->materialized_function = mvParam.mv_expr; column_mapping->expr = mvParam.expr; int32_t column_index = base_tablet_schema->field_index(mvParam.origin_column_name); if (column_index >= 0) { diff --git a/be/src/olap/schema_change.h b/be/src/olap/schema_change.h index ae2915dfc3b3be..3f7fe91602f7d1 100644 --- a/be/src/olap/schema_change.h +++ b/be/src/olap/schema_change.h @@ -36,8 +36,7 @@ class InvertedIndexColumnWriter; class RowBlockChanger { public: - RowBlockChanger(TabletSchemaSPtr tablet_schema, const DeleteHandler* delete_handler, - DescriptorTbl desc_tbl); + RowBlockChanger(TabletSchemaSPtr tablet_schema, DescriptorTbl desc_tbl); ~RowBlockChanger(); @@ -52,12 +51,7 @@ class RowBlockChanger { // @brief column-mapping specification of new schema SchemaMapping _schema_mapping; - // delete handler for filtering data which use specified in DELETE_DATA - const DeleteHandler* _delete_handler = nullptr; - DescriptorTbl _desc_tbl; - - DISALLOW_COPY_AND_ASSIGN(RowBlockChanger); }; class SchemaChange { @@ -85,7 +79,7 @@ class SchemaChange { _add_filtered_rows(rowset_reader->filtered_rows()); // Check row num changes - if (config::row_nums_check && !_check_row_nums(rowset_reader, *rowset_writer)) { + if (!_check_row_nums(rowset_reader, *rowset_writer)) { return Status::Error(); } @@ -181,11 +175,11 @@ class SchemaChangeForInvertedIndex : public SchemaChange { public: explicit SchemaChangeForInvertedIndex(const std::vector& alter_inverted_indexs, const TabletSchemaSPtr& tablet_schema); - virtual ~SchemaChangeForInvertedIndex(); + ~SchemaChangeForInvertedIndex() override; - virtual Status process(RowsetReaderSharedPtr rowset_reader, RowsetWriter* rowset_writer, - TabletSharedPtr new_tablet, TabletSharedPtr base_tablet, - TabletSchemaSPtr base_tablet_schema) override; + Status process(RowsetReaderSharedPtr rowset_reader, RowsetWriter* rowset_writer, + TabletSharedPtr new_tablet, TabletSharedPtr base_tablet, + TabletSchemaSPtr base_tablet_schema) override; private: DISALLOW_COPY_AND_ASSIGN(SchemaChangeForInvertedIndex); @@ -197,7 +191,6 @@ class SchemaChangeForInvertedIndex : public SchemaChange { const std::pair& index_writer_sign, Field* field, const uint8_t* null_map, const uint8_t** ptr, size_t num_rows); -private: std::vector _alter_inverted_indexs; TabletSchemaSPtr _tablet_schema; @@ -240,7 +233,6 @@ class SchemaChangeHandler { struct AlterMaterializedViewParam { std::string column_name; std::string origin_column_name; - std::string mv_expr; std::shared_ptr expr; }; diff --git a/be/src/vec/functions/match.cpp b/be/src/vec/functions/match.cpp index 6ba4a4a80e40b8..2b90f44f6b7686 100644 --- a/be/src/vec/functions/match.cpp +++ b/be/src/vec/functions/match.cpp @@ -45,11 +45,6 @@ class FunctionMatchBase : public IFunction { auto match_pred_column_name = BeConsts::BLOCK_TEMP_COLUMN_PREFIX + column_name + "_match_" + match_query_str; if (!block.has(match_pred_column_name)) { - if (!config::enable_storage_vectorization) { - return Status::Cancelled( - "please check whether turn on the configuration " - "'enable_storage_vectorization'"); - } if (!config::enable_index_apply_preds_except_leafnode_of_andnode) { return Status::Cancelled( "please check whether turn on the configuration " diff --git a/be/src/vec/olap/block_reader.cpp b/be/src/vec/olap/block_reader.cpp index 5b95ac9335526f..6db2d3cebed55b 100644 --- a/be/src/vec/olap/block_reader.cpp +++ b/be/src/vec/olap/block_reader.cpp @@ -73,7 +73,6 @@ Status BlockReader::_init_collect_iter(const ReaderParams& read_params) { _vcollect_iter.init(this, _is_rowsets_overlapping, read_params.read_orderby_key, read_params.read_orderby_key_reverse); - _reader_context.is_vec = true; _reader_context.push_down_agg_type_opt = read_params.push_down_agg_type_opt; std::vector valid_rs_readers; for (auto& rs_reader : read_params.rs_readers) { diff --git a/be/src/vec/olap/vcollect_iterator.cpp b/be/src/vec/olap/vcollect_iterator.cpp index 72691834858566..5c9ef48965baca 100644 --- a/be/src/vec/olap/vcollect_iterator.cpp +++ b/be/src/vec/olap/vcollect_iterator.cpp @@ -406,8 +406,7 @@ VCollectIterator::Level0Iterator::Level0Iterator(RowsetReaderSharedPtr rs_reader } Status VCollectIterator::Level0Iterator::init(bool get_data_by_ref) { - _get_data_by_ref = get_data_by_ref && _rs_reader->support_return_data_by_ref() && - config::enable_storage_vectorization; + _get_data_by_ref = get_data_by_ref && _rs_reader->support_return_data_by_ref(); if (!_get_data_by_ref) { _block = std::make_shared(_schema.create_block( _reader->_return_columns, _reader->_tablet_columns_convert_to_null_set)); @@ -428,8 +427,7 @@ Status VCollectIterator::Level0Iterator::init(bool get_data_by_ref) { // } // so first child load first row and other child row_pos = -1 Status VCollectIterator::Level0Iterator::init_for_union(bool is_first_child, bool get_data_by_ref) { - _get_data_by_ref = get_data_by_ref && _rs_reader->support_return_data_by_ref() && - config::enable_storage_vectorization; + _get_data_by_ref = get_data_by_ref && _rs_reader->support_return_data_by_ref(); if (!_get_data_by_ref) { _block = std::make_shared(_schema.create_block( _reader->_return_columns, _reader->_tablet_columns_convert_to_null_set)); diff --git a/be/src/vec/olap/vertical_block_reader.cpp b/be/src/vec/olap/vertical_block_reader.cpp index 7333460866d864..7195ed3381ff82 100644 --- a/be/src/vec/olap/vertical_block_reader.cpp +++ b/be/src/vec/olap/vertical_block_reader.cpp @@ -48,7 +48,6 @@ Status VerticalBlockReader::_get_segment_iterators(const ReaderParams& read_para << ", version:" << read_params.version; return res; } - _reader_context.is_vec = true; _reader_context.is_vertical_compaction = true; for (auto& rs_reader : read_params.rs_readers) { // segment iterator will be inited here diff --git a/be/test/olap/rowid_conversion_test.cpp b/be/test/olap/rowid_conversion_test.cpp index b97930102c65c3..175bdec94bee45 100644 --- a/be/test/olap/rowid_conversion_test.cpp +++ b/be/test/olap/rowid_conversion_test.cpp @@ -352,7 +352,6 @@ class TestRowIdConversion : public testing::TestWithParam return_columns = {0, 1}; reader_context.return_columns = &return_columns; - reader_context.is_vec = true; RowsetReaderSharedPtr output_rs_reader; create_and_init_rowset_reader(out_rowset.get(), reader_context, &output_rs_reader); diff --git a/be/test/olap/segcompaction_test.cpp b/be/test/olap/segcompaction_test.cpp index a0cda5bc93a977..4b8e67bca47003 100644 --- a/be/test/olap/segcompaction_test.cpp +++ b/be/test/olap/segcompaction_test.cpp @@ -59,7 +59,6 @@ class SegCompactionTest : public testing::Test { void SetUp() { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; config::tablet_map_shard_size = 1; config::txn_map_shard_size = 1; config::txn_shard_size = 1; @@ -225,7 +224,6 @@ class SegCompactionTest : public testing::Test { TEST_F(SegCompactionTest, SegCompactionThenRead) { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; Status s; TabletSchemaSPtr tablet_schema = std::make_shared(); create_tablet_schema(tablet_schema, DUP_KEYS); @@ -337,7 +335,6 @@ TEST_F(SegCompactionTest, SegCompactionThenRead) { TEST_F(SegCompactionTest, SegCompactionInterleaveWithBig_ooooOOoOooooooooO) { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; Status s; TabletSchemaSPtr tablet_schema = std::make_shared(); create_tablet_schema(tablet_schema, DUP_KEYS); @@ -482,7 +479,6 @@ TEST_F(SegCompactionTest, SegCompactionInterleaveWithBig_ooooOOoOooooooooO) { TEST_F(SegCompactionTest, SegCompactionInterleaveWithBig_OoOoO) { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; Status s; TabletSchemaSPtr tablet_schema = std::make_shared(); create_tablet_schema(tablet_schema, DUP_KEYS); @@ -606,7 +602,6 @@ TEST_F(SegCompactionTest, SegCompactionInterleaveWithBig_OoOoO) { TEST_F(SegCompactionTest, SegCompactionThenReadUniqueTableSmall) { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; Status s; TabletSchemaSPtr tablet_schema = std::make_shared(); create_tablet_schema(tablet_schema, UNIQUE_KEYS); @@ -841,7 +836,6 @@ TEST_F(SegCompactionTest, SegCompactionThenReadUniqueTableSmall) { TEST_F(SegCompactionTest, SegCompactionThenReadAggTableSmall) { config::enable_segcompaction = true; - config::enable_storage_vectorization = true; Status s; TabletSchemaSPtr tablet_schema = std::make_shared(); create_tablet_schema(tablet_schema, AGG_KEYS); diff --git a/docs/en/docs/admin-manual/config/be-config.md b/docs/en/docs/admin-manual/config/be-config.md index 8b466c749139a9..14485ee214f2f3 100644 --- a/docs/en/docs/admin-manual/config/be-config.md +++ b/docs/en/docs/admin-manual/config/be-config.md @@ -445,12 +445,6 @@ There are two ways to configure BE configuration items: - Generally it needs to be turned off. When you want to manually operate the compaction task in the debugging or test environment, you can turn on the configuration. * Default value: false -#### `enable_vectorized_compaction` - -* Type: bool -* Description: Whether to enable vectorized compaction -* Default value: true - #### `enable_vertical_compaction` * Type: bool @@ -1399,11 +1393,6 @@ Indicates how many tablets failed to load in the data directory. At the same tim * Description: Cgroups assigned to doris * Default value: empty -#### `row_nums_check` - -* Description: Check row nums for BE/CE and schema change -* Default value: true - #### `priority_queue_remaining_tasks_increased_frequency` * Description: the increased frequency of priority for remaining tasks in BlockingPriorityQueue diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md b/docs/zh-CN/docs/admin-manual/config/be-config.md index aca0f71e3219c6..e6ef651b7d9b90 100644 --- a/docs/zh-CN/docs/admin-manual/config/be-config.md +++ b/docs/zh-CN/docs/admin-manual/config/be-config.md @@ -459,12 +459,6 @@ BE 重启后该配置将失效。如果想持久化修改结果，使用如下 - 一般需要为关闭状态，当调试或测试环境中想要手动操作compaction任务时，可以对该配置进行开启 * 默认值：false -#### `enable_vectorized_compaction` - -* 类型：bool -* 描述：是否开启向量化compaction -* 默认值：true - #### `enable_vertical_compaction` * 类型: bool @@ -1417,11 +1411,6 @@ load tablets from header failed, failed tablets size: xxx, path=xxx * 描述: 分配给doris的cgroups * 默认值: 空 -#### `row_nums_check` - -* 描述: 检查 BE/CE 和schema更改的行号。 -* 默认值: true - #### `priority_queue_remaining_tasks_increased_frequency` * 描述: BlockingPriorityQueue中剩余任务的优先级频率增加