github-actions[bot] commented on code in PR #25250: URL: https://github.com/apache/doris/pull/25250#discussion_r1359102785
########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; Review Comment: warning: 789 is a magic number; consider replacing it with a named constant [readability-magic-numbers] ```cpp int64_t txn_id = 789; ^ ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { Review Comment: warning: nested namespaces can be concatenated [modernize-concat-nested-namespaces] ```suggestion namespace doris::vectorized { ``` be/test/vec/exec/vwal_scanner_test.cpp:265: ```diff - } // namespace vectorized - } // namespace doris + } // namespace doris ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { + TDescriptorTable t_desc_table; + + // table descriptors + TTableDescriptor t_table_desc; + + t_table_desc.id = 0; + t_table_desc.tableType = TTableType::OLAP_TABLE; + t_table_desc.numCols = 0; + t_table_desc.numClusteringCols = 0; + t_desc_table.tableDescriptors.push_back(t_table_desc); + t_desc_table.__isset.tableDescriptors = true; + + int next_slot_id = 1; + // TSlotDescriptor + // int offset = 1; + // int i = 0; + // c1 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::INT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 0; + slot_desc.byteOffset = 0; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c1"; + slot_desc.slotIdx = 1; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // c2 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::BIGINT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 1; + slot_desc.byteOffset = 4; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c2"; + slot_desc.slotIdx = 2; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // k3 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::VARCHAR); + scalar_type.__set_len(10); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 2; + slot_desc.byteOffset = 8; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c3"; + slot_desc.slotIdx = 3; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + + t_desc_table.__isset.slotDescriptors = true; + { + // TTupleDescriptor dest + TTupleDescriptor t_tuple_desc; + t_tuple_desc.id = 0; + t_tuple_desc.byteSize = 12; + t_tuple_desc.numNullBytes = 0; + t_tuple_desc.tableId = 0; + t_tuple_desc.__isset.tableId = true; + t_desc_table.tupleDescriptors.push_back(t_tuple_desc); + } + + static_cast<void>(DescriptorTbl::create(&_obj_pool, t_desc_table, &_desc_tbl)); + + _runtime_state.set_desc_tbl(_desc_tbl); +} + +void VWalScannerTest::init() { + init_desc_table(); + static_cast<void>(io::global_local_filesystem()->create_directory( + wal_dir + "/" + std::to_string(db_id) + "/" + std::to_string(tb_id))); + std::string src = "./be/test/exec/test_data/wal_scanner/wal"; + std::string dst = wal_dir + "/" + std::to_string(db_id) + "/" + std::to_string(tb_id) + "/" + + std::to_string(txn_id) + "_" + label; + std::filesystem::copy(src, dst); + + // Node Id + _tnode.node_id = 0; + _tnode.node_type = TPlanNodeType::FILE_SCAN_NODE; + _tnode.num_children = 0; + _tnode.limit = -1; + _tnode.row_tuples.push_back(0); + _tnode.nullable_tuples.push_back(false); + _tnode.file_scan_node.tuple_id = 0; + _tnode.__isset.file_scan_node = true; + + _env = ExecEnv::GetInstance(); + _env->_wal_manager = WalManager::create_shared(_env, wal_dir); + static_cast<void>(_env->_wal_manager->add_wal_path(db_id, tb_id, txn_id, label)); +} + +TEST_F(VWalScannerTest, normal) { Review Comment: warning: all parameters should be named in a function [readability-named-parameter] ```suggestion TEST_F(VWalScannerTest /*unused*/, normal /*unused*/) { ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { + TDescriptorTable t_desc_table; + + // table descriptors + TTableDescriptor t_table_desc; + + t_table_desc.id = 0; + t_table_desc.tableType = TTableType::OLAP_TABLE; + t_table_desc.numCols = 0; + t_table_desc.numClusteringCols = 0; + t_desc_table.tableDescriptors.push_back(t_table_desc); + t_desc_table.__isset.tableDescriptors = true; + + int next_slot_id = 1; + // TSlotDescriptor + // int offset = 1; + // int i = 0; + // c1 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::INT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 0; + slot_desc.byteOffset = 0; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c1"; + slot_desc.slotIdx = 1; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // c2 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::BIGINT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 1; + slot_desc.byteOffset = 4; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c2"; + slot_desc.slotIdx = 2; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // k3 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::VARCHAR); + scalar_type.__set_len(10); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 2; + slot_desc.byteOffset = 8; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c3"; + slot_desc.slotIdx = 3; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + + t_desc_table.__isset.slotDescriptors = true; + { + // TTupleDescriptor dest + TTupleDescriptor t_tuple_desc; + t_tuple_desc.id = 0; + t_tuple_desc.byteSize = 12; + t_tuple_desc.numNullBytes = 0; + t_tuple_desc.tableId = 0; + t_tuple_desc.__isset.tableId = true; + t_desc_table.tupleDescriptors.push_back(t_tuple_desc); + } + + static_cast<void>(DescriptorTbl::create(&_obj_pool, t_desc_table, &_desc_tbl)); + + _runtime_state.set_desc_tbl(_desc_tbl); +} + +void VWalScannerTest::init() { + init_desc_table(); + static_cast<void>(io::global_local_filesystem()->create_directory( + wal_dir + "/" + std::to_string(db_id) + "/" + std::to_string(tb_id))); + std::string src = "./be/test/exec/test_data/wal_scanner/wal"; + std::string dst = wal_dir + "/" + std::to_string(db_id) + "/" + std::to_string(tb_id) + "/" + + std::to_string(txn_id) + "_" + label; + std::filesystem::copy(src, dst); + + // Node Id + _tnode.node_id = 0; + _tnode.node_type = TPlanNodeType::FILE_SCAN_NODE; + _tnode.num_children = 0; + _tnode.limit = -1; + _tnode.row_tuples.push_back(0); + _tnode.nullable_tuples.push_back(false); + _tnode.file_scan_node.tuple_id = 0; + _tnode.__isset.file_scan_node = true; + + _env = ExecEnv::GetInstance(); + _env->_wal_manager = WalManager::create_shared(_env, wal_dir); + static_cast<void>(_env->_wal_manager->add_wal_path(db_id, tb_id, txn_id, label)); +} + +TEST_F(VWalScannerTest, normal) { + // config::group_commit_replay_wal_dir = wal_dir; + NewFileScanNode scan_node(&_obj_pool, _tnode, *_desc_tbl); + scan_node._output_tuple_desc = _runtime_state.desc_tbl().get_tuple_descriptor(_dst_tuple_id); + static_cast<void>(scan_node.init(_tnode, &_runtime_state)); + auto status = scan_node.prepare(&_runtime_state); + EXPECT_TRUE(status.ok()); + + std::vector<TFileRangeDesc> ranges; + TFileRangeDesc range_desc; + { + range_desc.start_offset = 0; + range_desc.size = 1000; Review Comment: warning: 1000 is a magic number; consider replacing it with a named constant [readability-magic-numbers] ```cpp range_desc.size = 1000; ^ ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { + TDescriptorTable t_desc_table; + + // table descriptors + TTableDescriptor t_table_desc; + + t_table_desc.id = 0; + t_table_desc.tableType = TTableType::OLAP_TABLE; + t_table_desc.numCols = 0; + t_table_desc.numClusteringCols = 0; + t_desc_table.tableDescriptors.push_back(t_table_desc); + t_desc_table.__isset.tableDescriptors = true; + + int next_slot_id = 1; + // TSlotDescriptor + // int offset = 1; + // int i = 0; + // c1 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::INT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 0; + slot_desc.byteOffset = 0; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c1"; + slot_desc.slotIdx = 1; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // c2 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::BIGINT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 1; + slot_desc.byteOffset = 4; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c2"; + slot_desc.slotIdx = 2; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // k3 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::VARCHAR); + scalar_type.__set_len(10); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 2; + slot_desc.byteOffset = 8; Review Comment: warning: 8 is a magic number; consider replacing it with a named constant [readability-magic-numbers] ```cpp slot_desc.byteOffset = 8; ^ ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { + TDescriptorTable t_desc_table; + + // table descriptors + TTableDescriptor t_table_desc; + + t_table_desc.id = 0; + t_table_desc.tableType = TTableType::OLAP_TABLE; + t_table_desc.numCols = 0; + t_table_desc.numClusteringCols = 0; + t_desc_table.tableDescriptors.push_back(t_table_desc); + t_desc_table.__isset.tableDescriptors = true; + + int next_slot_id = 1; + // TSlotDescriptor + // int offset = 1; + // int i = 0; + // c1 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::INT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 0; + slot_desc.byteOffset = 0; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c1"; + slot_desc.slotIdx = 1; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // c2 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::BIGINT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 1; + slot_desc.byteOffset = 4; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c2"; + slot_desc.slotIdx = 2; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // k3 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::VARCHAR); + scalar_type.__set_len(10); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 2; + slot_desc.byteOffset = 8; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c3"; + slot_desc.slotIdx = 3; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + + t_desc_table.__isset.slotDescriptors = true; + { + // TTupleDescriptor dest + TTupleDescriptor t_tuple_desc; + t_tuple_desc.id = 0; + t_tuple_desc.byteSize = 12; Review Comment: warning: 12 is a magic number; consider replacing it with a named constant [readability-magic-numbers] ```cpp t_tuple_desc.byteSize = 12; ^ ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { Review Comment: warning: method 'init_desc_table' can be made static [readability-convert-member-functions-to-static] be/test/vec/exec/vwal_scanner_test.cpp:55: ```diff - void init_desc_table(); + static void init_desc_table(); ``` ########## be/test/vec/exec/vwal_scanner_test.cpp: ########## @@ -0,0 +1,267 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +#include <gtest/gtest.h> + +#include <string> +#include <vector> + +#include "common/object_pool.h" +#include "gen_cpp/Descriptors_types.h" +#include "gen_cpp/PlanNodes_types.h" +#include "olap/wal_manager.h" +#include "runtime/descriptors.h" +#include "runtime/memory/mem_tracker.h" +#include "runtime/runtime_state.h" +#include "runtime/user_function_cache.h" +#include "vec/exec/scan/new_file_scan_node.h" +#include "vec/exec/scan/vfile_scanner.h" + +namespace doris { + +namespace vectorized { +class VWalScannerTest : public testing::Test { +public: + VWalScannerTest() : _runtime_state(TQueryGlobals()) { + init(); + _profile = _runtime_state.runtime_profile(); + _runtime_state.init_mem_trackers(); + static_cast<void>(_runtime_state.init(unique_id, query_options, query_globals, _env)); + _runtime_state.set_query_ctx(query_ctx); + } + void init(); + + void TearDown() override { + static_cast<void>(io::global_local_filesystem()->delete_directory(wal_dir)); + SAFE_STOP(_env->_wal_manager); + } + +protected: + virtual void SetUp() override {} + +private: + void init_desc_table(); + + ExecEnv* _env = nullptr; + std::string wal_dir = "./wal_test"; + int64_t db_id = 1; + int64_t tb_id = 2; + int64_t txn_id = 789; + std::string label = "test"; + + TupleId _dst_tuple_id = 0; + RuntimeState _runtime_state; + RuntimeProfile* _profile; + ObjectPool _obj_pool; + DescriptorTbl* _desc_tbl; + std::vector<TNetworkAddress> _addresses; + ScannerCounter _counter; + std::vector<TExpr> _pre_filter; + TPlanNode _tnode; + TUniqueId unique_id; + TQueryOptions query_options; + TQueryGlobals query_globals; + QueryContext* query_ctx = nullptr; +}; + +void VWalScannerTest::init_desc_table() { + TDescriptorTable t_desc_table; + + // table descriptors + TTableDescriptor t_table_desc; + + t_table_desc.id = 0; + t_table_desc.tableType = TTableType::OLAP_TABLE; + t_table_desc.numCols = 0; + t_table_desc.numClusteringCols = 0; + t_desc_table.tableDescriptors.push_back(t_table_desc); + t_desc_table.__isset.tableDescriptors = true; + + int next_slot_id = 1; + // TSlotDescriptor + // int offset = 1; + // int i = 0; + // c1 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::INT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 0; + slot_desc.byteOffset = 0; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c1"; + slot_desc.slotIdx = 1; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // c2 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::BIGINT); + node.__set_scalar_type(scalar_type); + type.types.push_back(node); + } + slot_desc.slotType = type; + slot_desc.columnPos = 1; + slot_desc.byteOffset = 4; + slot_desc.nullIndicatorByte = 0; + slot_desc.nullIndicatorBit = -1; + slot_desc.colName = "c2"; + slot_desc.slotIdx = 2; + slot_desc.isMaterialized = true; + + t_desc_table.slotDescriptors.push_back(slot_desc); + } + // k3 + { + TSlotDescriptor slot_desc; + + slot_desc.id = next_slot_id++; + slot_desc.parent = 0; + TTypeDesc type; + { + TTypeNode node; + node.__set_type(TTypeNodeType::SCALAR); + TScalarType scalar_type; + scalar_type.__set_type(TPrimitiveType::VARCHAR); + scalar_type.__set_len(10); Review Comment: warning: 10 is a magic number; consider replacing it with a named constant [readability-magic-numbers] ```cpp scalar_type.__set_len(10); ^ ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org
