Skip to content

Commit 5484db5

Browse files
HappenLeeHappenLee
committed
fix test failed
1 parent f32bb79 commit 5484db5

File tree

4 files changed

+42
-17
lines changed

4 files changed

+42
-17
lines changed

‎be/src/runtime/exec_env_init.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,9 @@ void ExecEnv::destroy() {
727727
_load_stream_map_pool.reset();
728728
SAFE_STOP(_write_cooldown_meta_executors);
729729

730+
// _id_manager must be destoried before tablet schema cache
731+
SAFE_DELETE(_id_manager);
732+
730733
// StorageEngine must be destoried before _cache_manager destory
731734
SAFE_STOP(_storage_engine);
732735
_storage_engine.reset();
@@ -809,9 +812,6 @@ void ExecEnv::destroy() {
809812
SAFE_DELETE(_cache_manager);
810813
_file_cache_open_fd_cache.reset(nullptr);
811814

812-
// _id_manager must be destoried after staroge engine
813-
SAFE_DELETE(_id_manager);
814-
815815
// _heartbeat_flags must be destoried after staroge engine
816816
SAFE_DELETE(_heartbeat_flags);
817817

‎be/test/olap/id_manager_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ TEST(IdFileMapTest, ConcurrentAddAndGet) {
8888
rowset_id.init(2);
8989

9090
for (int i = 0; i < 10; ++i) {
91-
threads.emplace_back([&]() {
91+
threads.emplace_back([i, &id_file_map, &tablet_id, &rowset_id]() {
9292
for (int j = 0; j < 100; ++j) {
9393
uint32_t segment_id = i * 1000 + j;
9494

‎be/test/vec/exec/format/parquet/parquet_read_lines.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ static void read_parquet_lines(std::vector<std::string> numeric_types,
159159
static_cast<void>(p_reader->set_fill_columns(partition_columns, missing_columns));
160160
BlockUPtr block = Block::create_unique();
161161
for (const auto& slot_desc : tuple_desc->slots()) {
162-
auto data_type =
163-
vectorized::DataTypeFactory::instance().create_data_type(slot_desc->type(), true);
162+
auto data_type = slot_desc->type();
164163
MutableColumnPtr data_column = data_type->create_column();
165164
block->insert(
166165
ColumnWithTypeAndName(std::move(data_column), data_type, slot_desc->col_name()));

‎be/test/vec/exec/orc/orc_read_lines.cpp

+37-11
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,42 @@ static void read_orc_line(int64_t line, std::string block_dump) {
6666
"col6", "col7", "col8", "col9"};
6767
ObjectPool object_pool;
6868
DescriptorTblBuilder builder(&object_pool);
69-
builder.declare_tuple() << std::make_tuple(TYPE_BIGINT, "col1")
70-
<< std::make_tuple(TYPE_BOOLEAN, "col2")
71-
<< std::make_tuple(TYPE_STRING, "col3")
72-
<< std::make_tuple(TYPE_DATEV2, "col4")
73-
<< std::make_tuple(TYPE_DOUBLE, "col5")
74-
<< std::make_tuple(TYPE_FLOAT, "col6")
75-
<< std::make_tuple(TYPE_INT, "col7")
76-
<< std::make_tuple(TYPE_SMALLINT, "col8")
77-
<< std::make_tuple(TYPE_STRING, "col9");
69+
builder.declare_tuple() << std::make_tuple<vectorized::DataTypePtr, std::string>(
70+
vectorized::DataTypeFactory::instance().create_data_type(
71+
TypeIndex::Int64, true),
72+
"col1")
73+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
74+
vectorized::DataTypeFactory::instance().create_data_type(
75+
TypeIndex::UInt8, true),
76+
"col2")
77+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
78+
vectorized::DataTypeFactory::instance().create_data_type(
79+
TypeIndex::String, true),
80+
"col3")
81+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
82+
vectorized::DataTypeFactory::instance().create_data_type(
83+
TypeIndex::DateV2, true),
84+
"col4")
85+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
86+
vectorized::DataTypeFactory::instance().create_data_type(
87+
TypeIndex::Float64, true),
88+
"col5")
89+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
90+
vectorized::DataTypeFactory::instance().create_data_type(
91+
TypeIndex::Float32, true),
92+
"col6")
93+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
94+
vectorized::DataTypeFactory::instance().create_data_type(
95+
TypeIndex::Int32, true),
96+
"col7")
97+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
98+
vectorized::DataTypeFactory::instance().create_data_type(
99+
TypeIndex::Int16, true),
100+
"col8")
101+
<< std::make_tuple<vectorized::DataTypePtr, std::string>(
102+
vectorized::DataTypeFactory::instance().create_data_type(
103+
TypeIndex::String, true),
104+
"col9");
78105
DescriptorTbl* desc_tbl = builder.build();
79106
auto* tuple_desc = const_cast<TupleDescriptor*>(desc_tbl->get_tuple_descriptor(0));
80107
RowDescriptor row_desc(tuple_desc, false);
@@ -113,8 +140,7 @@ static void read_orc_line(int64_t line, std::string block_dump) {
113140
static_cast<void>(reader->set_fill_columns(partition_columns, missing_columns));
114141
BlockUPtr block = Block::create_unique();
115142
for (const auto& slot_desc : tuple_desc->slots()) {
116-
auto data_type =
117-
vectorized::DataTypeFactory::instance().create_data_type(slot_desc->type(), true);
143+
auto data_type = slot_desc->type();
118144
MutableColumnPtr data_column = data_type->create_column();
119145
block->insert(
120146
ColumnWithTypeAndName(std::move(data_column), data_type, slot_desc->col_name()));

0 commit comments

Comments
 (0)