We make all MemTrackers shared, in order to show MemTracker real-time consumptions on the web.
As follows:
1. nearly all MemTracker raw ptr -> shared_ptr
2. Use CreateTracker() to create new MemTracker(in order to add itself to its parent)
3. RowBatch & MemPool still use raw ptrs of MemTracker, it's easy to ensure RowBatch & MemPool destructor exec
before MemTracker's destructor. So we don't change these code.
4. MemTracker can use RuntimeProfile's counter to calc consumption. So RuntimeProfile's counter need to be shared
too. We add a shared counter pool to store the shared counter, don't change other counters of RuntimeProfile.
Note that, this PR doesn't change the MemTracker tree structure. So there still have some orphan trackers, e.g. RowBlockV2's MemTracker. If you find some shared MemTrackers are little memory consumption & too time-consuming, you could make them be the orphan, then it's fine to use the raw ptr.
464 lines
17 KiB
C++
464 lines
17 KiB
C++
// 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 "olap/delta_writer.h"
|
|
|
|
#include <sys/file.h>
|
|
#include <string>
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "gen_cpp/Descriptors_types.h"
|
|
#include "gen_cpp/PaloInternalService_types.h"
|
|
#include "gen_cpp/Types_types.h"
|
|
#include "olap/field.h"
|
|
#include "olap/storage_engine.h"
|
|
#include "olap/tablet.h"
|
|
#include "olap/utils.h"
|
|
#include "runtime/tuple.h"
|
|
#include "runtime/descriptor_helper.h"
|
|
#include "runtime/exec_env.h"
|
|
#include "runtime/mem_pool.h"
|
|
#include "runtime/mem_tracker.h"
|
|
#include "util/logging.h"
|
|
#include "util/file_utils.h"
|
|
#include "olap/options.h"
|
|
#include "olap/tablet_meta_manager.h"
|
|
|
|
namespace doris {
|
|
|
|
// This is DeltaWriter unit test which used by streaming load.
|
|
// And also it should take schema change into account after streaming load.
|
|
|
|
static const uint32_t MAX_RETRY_TIMES = 10;
|
|
static const uint32_t MAX_PATH_LEN = 1024;
|
|
|
|
StorageEngine* k_engine = nullptr;
|
|
std::shared_ptr<MemTracker> k_mem_tracker = nullptr;
|
|
|
|
void set_up() {
|
|
char buffer[MAX_PATH_LEN];
|
|
getcwd(buffer, MAX_PATH_LEN);
|
|
config::storage_root_path = std::string(buffer) + "/data_test";
|
|
FileUtils::remove_all(config::storage_root_path);
|
|
FileUtils::create_dir(config::storage_root_path);
|
|
std::vector<StorePath> paths;
|
|
paths.emplace_back(config::storage_root_path, -1);
|
|
|
|
doris::EngineOptions options;
|
|
options.store_paths = paths;
|
|
Status s = doris::StorageEngine::open(options, &k_engine);
|
|
ASSERT_TRUE(s.ok()) << s.to_string();
|
|
|
|
ExecEnv* exec_env = doris::ExecEnv::GetInstance();
|
|
exec_env->set_storage_engine(k_engine);
|
|
|
|
k_mem_tracker.reset(new MemTracker(-1, "delta writer test"));
|
|
}
|
|
|
|
void tear_down() {
|
|
delete k_engine;
|
|
k_engine = nullptr;
|
|
system("rm -rf ./data_test");
|
|
FileUtils::remove_all(std::string(getenv("DORIS_HOME")) + UNUSED_PREFIX);
|
|
}
|
|
|
|
void create_tablet_request(int64_t tablet_id, int32_t schema_hash, TCreateTabletReq* request) {
|
|
request->tablet_id = tablet_id;
|
|
request->__set_version(1);
|
|
request->__set_version_hash(0);
|
|
request->tablet_schema.schema_hash = schema_hash;
|
|
request->tablet_schema.short_key_column_count = 6;
|
|
request->tablet_schema.keys_type = TKeysType::AGG_KEYS;
|
|
request->tablet_schema.storage_type = TStorageType::COLUMN;
|
|
|
|
TColumn k1;
|
|
k1.column_name = "k1";
|
|
k1.__set_is_key(true);
|
|
k1.column_type.type = TPrimitiveType::TINYINT;
|
|
request->tablet_schema.columns.push_back(k1);
|
|
|
|
TColumn k2;
|
|
k2.column_name = "k2";
|
|
k2.__set_is_key(true);
|
|
k2.column_type.type = TPrimitiveType::SMALLINT;
|
|
request->tablet_schema.columns.push_back(k2);
|
|
|
|
TColumn k3;
|
|
k3.column_name = "k3";
|
|
k3.__set_is_key(true);
|
|
k3.column_type.type = TPrimitiveType::INT;
|
|
request->tablet_schema.columns.push_back(k3);
|
|
|
|
TColumn k4;
|
|
k4.column_name = "k4";
|
|
k4.__set_is_key(true);
|
|
k4.column_type.type = TPrimitiveType::BIGINT;
|
|
request->tablet_schema.columns.push_back(k4);
|
|
|
|
TColumn k5;
|
|
k5.column_name = "k5";
|
|
k5.__set_is_key(true);
|
|
k5.column_type.type = TPrimitiveType::LARGEINT;
|
|
request->tablet_schema.columns.push_back(k5);
|
|
|
|
TColumn k6;
|
|
k6.column_name = "k6";
|
|
k6.__set_is_key(true);
|
|
k6.column_type.type = TPrimitiveType::DATE;
|
|
request->tablet_schema.columns.push_back(k6);
|
|
|
|
TColumn k7;
|
|
k7.column_name = "k7";
|
|
k7.__set_is_key(true);
|
|
k7.column_type.type = TPrimitiveType::DATETIME;
|
|
request->tablet_schema.columns.push_back(k7);
|
|
|
|
TColumn k8;
|
|
k8.column_name = "k8";
|
|
k8.__set_is_key(true);
|
|
k8.column_type.type = TPrimitiveType::CHAR;
|
|
k8.column_type.__set_len(4);
|
|
request->tablet_schema.columns.push_back(k8);
|
|
|
|
TColumn k9;
|
|
k9.column_name = "k9";
|
|
k9.__set_is_key(true);
|
|
k9.column_type.type = TPrimitiveType::VARCHAR;
|
|
k9.column_type.__set_len(65);
|
|
request->tablet_schema.columns.push_back(k9);
|
|
|
|
TColumn k10;
|
|
k10.column_name = "k10";
|
|
k10.__set_is_key(true);
|
|
k10.column_type.type = TPrimitiveType::DECIMAL;
|
|
k10.column_type.__set_precision(6);
|
|
k10.column_type.__set_scale(3);
|
|
request->tablet_schema.columns.push_back(k10);
|
|
|
|
TColumn v1;
|
|
v1.column_name = "v1";
|
|
v1.__set_is_key(false);
|
|
v1.column_type.type = TPrimitiveType::TINYINT;
|
|
v1.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v1);
|
|
|
|
TColumn v2;
|
|
v2.column_name = "v2";
|
|
v2.__set_is_key(false);
|
|
v2.column_type.type = TPrimitiveType::SMALLINT;
|
|
v2.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v2);
|
|
|
|
TColumn v3;
|
|
v3.column_name = "v3";
|
|
v3.__set_is_key(false);
|
|
v3.column_type.type = TPrimitiveType::INT;
|
|
v3.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v3);
|
|
|
|
TColumn v4;
|
|
v4.column_name = "v4";
|
|
v4.__set_is_key(false);
|
|
v4.column_type.type = TPrimitiveType::BIGINT;
|
|
v4.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v4);
|
|
|
|
TColumn v5;
|
|
v5.column_name = "v5";
|
|
v5.__set_is_key(false);
|
|
v5.column_type.type = TPrimitiveType::LARGEINT;
|
|
v5.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v5);
|
|
|
|
TColumn v6;
|
|
v6.column_name = "v6";
|
|
v6.__set_is_key(false);
|
|
v6.column_type.type = TPrimitiveType::DATE;
|
|
v6.__set_aggregation_type(TAggregationType::REPLACE);
|
|
request->tablet_schema.columns.push_back(v6);
|
|
|
|
TColumn v7;
|
|
v7.column_name = "v7";
|
|
v7.__set_is_key(false);
|
|
v7.column_type.type = TPrimitiveType::DATETIME;
|
|
v7.__set_aggregation_type(TAggregationType::REPLACE);
|
|
request->tablet_schema.columns.push_back(v7);
|
|
|
|
TColumn v8;
|
|
v8.column_name = "v8";
|
|
v8.__set_is_key(false);
|
|
v8.column_type.type = TPrimitiveType::CHAR;
|
|
v8.column_type.__set_len(4);
|
|
v8.__set_aggregation_type(TAggregationType::REPLACE);
|
|
request->tablet_schema.columns.push_back(v8);
|
|
|
|
TColumn v9;
|
|
v9.column_name = "v9";
|
|
v9.__set_is_key(false);
|
|
v9.column_type.type = TPrimitiveType::VARCHAR;
|
|
v9.column_type.__set_len(65);
|
|
v9.__set_aggregation_type(TAggregationType::REPLACE);
|
|
request->tablet_schema.columns.push_back(v9);
|
|
|
|
TColumn v10;
|
|
v10.column_name = "v10";
|
|
v10.__set_is_key(false);
|
|
v10.column_type.type = TPrimitiveType::DECIMAL;
|
|
v10.column_type.__set_precision(6);
|
|
v10.column_type.__set_scale(3);
|
|
v10.__set_aggregation_type(TAggregationType::SUM);
|
|
request->tablet_schema.columns.push_back(v10);
|
|
}
|
|
|
|
TDescriptorTable create_descriptor_tablet() {
|
|
TDescriptorTableBuilder dtb;
|
|
TTupleDescriptorBuilder tuple_builder;
|
|
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_TINYINT).column_name("k1").column_pos(0).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_SMALLINT).column_name("k2").column_pos(1).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_INT).column_name("k3").column_pos(2).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_BIGINT).column_name("k4").column_pos(3).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_LARGEINT).column_name("k5").column_pos(4).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_DATE).column_name("k6").column_pos(5).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_DATETIME).column_name("k7").column_pos(6).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().string_type(4).column_name("k8").column_pos(7).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().string_type(65).column_name("k9").column_pos(8).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().decimal_type(6, 3).column_name("k10").column_pos(9).build());
|
|
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_TINYINT).column_name("v1").column_pos(10).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_SMALLINT).column_name("v2").column_pos(11).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_INT).column_name("v3").column_pos(12).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_BIGINT).column_name("v4").column_pos(13).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_LARGEINT).column_name("v5").column_pos(14).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_DATE).column_name("v6").column_pos(15).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().type(TYPE_DATETIME).column_name("v7").column_pos(16).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().string_type(4).column_name("v8").column_pos(17).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().string_type(65).column_name("v9").column_pos(18).build());
|
|
tuple_builder.add_slot(
|
|
TSlotDescriptorBuilder().decimal_type(6, 3).column_name("v10").column_pos(19).build());
|
|
tuple_builder.build(&dtb);
|
|
|
|
return dtb.desc_tbl();
|
|
}
|
|
|
|
class TestDeltaWriter : public ::testing::Test {
|
|
public:
|
|
TestDeltaWriter() { }
|
|
~TestDeltaWriter() { }
|
|
|
|
void SetUp() {
|
|
// Create local data dir for StorageEngine.
|
|
std::cout << "setup" << std::endl;
|
|
}
|
|
|
|
void TearDown(){
|
|
// Remove all dir.
|
|
std::cout << "tear down" << std::endl;
|
|
//doris::tear_down();
|
|
//ASSERT_EQ(OLAP_SUCCESS, remove_all_dir(config::storage_root_path));
|
|
}
|
|
};
|
|
|
|
TEST_F(TestDeltaWriter, open) {
|
|
TCreateTabletReq request;
|
|
create_tablet_request(10003, 270068375, &request);
|
|
OLAPStatus res = k_engine->create_tablet(request);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
|
|
TDescriptorTable tdesc_tbl = create_descriptor_tablet();
|
|
ObjectPool obj_pool;
|
|
DescriptorTbl* desc_tbl = nullptr;
|
|
DescriptorTbl::create(&obj_pool, tdesc_tbl, &desc_tbl);
|
|
TupleDescriptor* tuple_desc = desc_tbl->get_tuple_descriptor(0);
|
|
|
|
PUniqueId load_id;
|
|
load_id.set_hi(0);
|
|
load_id.set_lo(0);
|
|
WriteRequest write_req = {10003, 270068375, WriteType::LOAD,
|
|
20001, 30001, load_id, false, tuple_desc};
|
|
DeltaWriter* delta_writer = nullptr;
|
|
DeltaWriter::open(&write_req, k_mem_tracker, &delta_writer);
|
|
ASSERT_NE(delta_writer, nullptr);
|
|
res = delta_writer->close();
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
res = delta_writer->close_wait(nullptr);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
SAFE_DELETE(delta_writer);
|
|
|
|
TDropTabletReq drop_request;
|
|
auto tablet_id = 10003;
|
|
auto schema_hash = 270068375;
|
|
res = k_engine->tablet_manager()->drop_tablet(tablet_id, schema_hash);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
}
|
|
|
|
TEST_F(TestDeltaWriter, write) {
|
|
TCreateTabletReq request;
|
|
create_tablet_request(10004, 270068376, &request);
|
|
OLAPStatus res = k_engine->create_tablet(request);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
|
|
TDescriptorTable tdesc_tbl = create_descriptor_tablet();
|
|
ObjectPool obj_pool;
|
|
DescriptorTbl* desc_tbl = nullptr;
|
|
DescriptorTbl::create(&obj_pool, tdesc_tbl, &desc_tbl);
|
|
TupleDescriptor* tuple_desc = desc_tbl->get_tuple_descriptor(0);
|
|
const std::vector<SlotDescriptor*>& slots = tuple_desc->slots();
|
|
|
|
PUniqueId load_id;
|
|
load_id.set_hi(0);
|
|
load_id.set_lo(0);
|
|
WriteRequest write_req = {10004, 270068376, WriteType::LOAD,
|
|
20002, 30002, load_id, false, tuple_desc,
|
|
&(tuple_desc->slots())};
|
|
DeltaWriter* delta_writer = nullptr;
|
|
DeltaWriter::open(&write_req, k_mem_tracker, &delta_writer);
|
|
ASSERT_NE(delta_writer, nullptr);
|
|
|
|
auto tracker = std::make_shared<MemTracker>();
|
|
MemPool pool(tracker.get());
|
|
// Tuple 1
|
|
{
|
|
Tuple* tuple = reinterpret_cast<Tuple*>(pool.allocate(tuple_desc->byte_size()));
|
|
memset(tuple, 0, tuple_desc->byte_size());
|
|
*(int8_t*)(tuple->get_slot(slots[0]->tuple_offset())) = -127;
|
|
*(int16_t*)(tuple->get_slot(slots[1]->tuple_offset())) = -32767;
|
|
*(int32_t*)(tuple->get_slot(slots[2]->tuple_offset())) = -2147483647;
|
|
*(int64_t*)(tuple->get_slot(slots[3]->tuple_offset())) = -9223372036854775807L;
|
|
|
|
int128_t large_int_value = -90000;
|
|
memcpy(tuple->get_slot(slots[4]->tuple_offset()), &large_int_value, sizeof(int128_t));
|
|
|
|
((DateTimeValue*)(tuple->get_slot(slots[5]->tuple_offset())))->from_date_str("2048-11-10", 10);
|
|
((DateTimeValue*)(tuple->get_slot(slots[6]->tuple_offset())))->from_date_str("2636-08-16 19:39:43", 19);
|
|
|
|
StringValue* char_ptr = (StringValue*)(tuple->get_slot(slots[7]->tuple_offset()));
|
|
char_ptr->ptr = (char*)pool.allocate(4);
|
|
memcpy(char_ptr->ptr, "abcd", 4);
|
|
char_ptr->len = 4;
|
|
|
|
StringValue* var_ptr = (StringValue*)(tuple->get_slot(slots[8]->tuple_offset()));
|
|
var_ptr->ptr = (char*)pool.allocate(5);
|
|
memcpy(var_ptr->ptr, "abcde", 5);
|
|
var_ptr->len = 5;
|
|
|
|
DecimalValue decimal_value(1.1);
|
|
*(DecimalValue*)(tuple->get_slot(slots[9]->tuple_offset())) = decimal_value;
|
|
|
|
*(int8_t*)(tuple->get_slot(slots[10]->tuple_offset())) = -127;
|
|
*(int16_t*)(tuple->get_slot(slots[11]->tuple_offset())) = -32767;
|
|
*(int32_t*)(tuple->get_slot(slots[12]->tuple_offset())) = -2147483647;
|
|
*(int64_t*)(tuple->get_slot(slots[13]->tuple_offset())) = -9223372036854775807L;
|
|
|
|
memcpy(tuple->get_slot(slots[14]->tuple_offset()), &large_int_value, sizeof(int128_t));
|
|
|
|
((DateTimeValue*)(tuple->get_slot(slots[15]->tuple_offset())))->from_date_str("2048-11-10", 10);
|
|
((DateTimeValue*)(tuple->get_slot(slots[16]->tuple_offset())))->from_date_str("2636-08-16 19:39:43", 19);
|
|
|
|
char_ptr = (StringValue*)(tuple->get_slot(slots[17]->tuple_offset()));
|
|
char_ptr->ptr = (char*)pool.allocate(4);
|
|
memcpy(char_ptr->ptr, "abcd", 4);
|
|
char_ptr->len = 4;
|
|
|
|
var_ptr = (StringValue*)(tuple->get_slot(slots[18]->tuple_offset()));
|
|
var_ptr->ptr = (char*)pool.allocate(5);
|
|
memcpy(var_ptr->ptr, "abcde", 5);
|
|
var_ptr->len = 5;
|
|
|
|
DecimalValue val_decimal(1.1);
|
|
*(DecimalValue*)(tuple->get_slot(slots[19]->tuple_offset())) = val_decimal;
|
|
|
|
res = delta_writer->write(tuple);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
}
|
|
|
|
res = delta_writer->close();
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
res = delta_writer->close_wait(nullptr);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
|
|
// publish version success
|
|
TabletSharedPtr tablet = k_engine->tablet_manager()->get_tablet(write_req.tablet_id, write_req.schema_hash);
|
|
std::cout << "before publish, tablet row nums:" << tablet->num_rows() << std::endl;
|
|
OlapMeta* meta = tablet->data_dir()->get_meta();
|
|
Version version;
|
|
version.first = tablet->rowset_with_max_version()->end_version() + 1;
|
|
version.second = tablet->rowset_with_max_version()->end_version() + 1;
|
|
std::cout << "start to add rowset version:" << version.first << "-" << version.second << std::endl;
|
|
VersionHash version_hash = 2;
|
|
std::map<TabletInfo, RowsetSharedPtr> tablet_related_rs;
|
|
StorageEngine::instance()->txn_manager()->get_txn_related_tablets(write_req.txn_id, write_req.partition_id, &tablet_related_rs);
|
|
for (auto& tablet_rs : tablet_related_rs) {
|
|
std::cout << "start to publish txn" << std::endl;
|
|
RowsetSharedPtr rowset = tablet_rs.second;
|
|
res = k_engine->txn_manager()->publish_txn(meta, write_req.partition_id, write_req.txn_id,
|
|
write_req.tablet_id, write_req.schema_hash, tablet_rs.first.tablet_uid,
|
|
version, version_hash);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
std::cout << "start to add inc rowset:" << rowset->rowset_id() << ", num rows:" << rowset->num_rows()
|
|
<< ", version:" << rowset->version().first << "-" << rowset->version().second
|
|
<< ", version_hash:" << rowset->version_hash()
|
|
<< std::endl;
|
|
res = tablet->add_inc_rowset(rowset);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
}
|
|
ASSERT_EQ(1, tablet->num_rows());
|
|
|
|
auto tablet_id = 10003;
|
|
auto schema_hash = 270068375;
|
|
res = k_engine->tablet_manager()->drop_tablet(tablet_id, schema_hash);
|
|
ASSERT_EQ(OLAP_SUCCESS, res);
|
|
delete delta_writer;
|
|
}
|
|
|
|
} // namespace doris
|
|
|
|
int main(int argc, char** argv) {
|
|
std::string conffile = std::string(getenv("DORIS_HOME")) + "/conf/be.conf";
|
|
if (!doris::config::init(conffile.c_str(), false)) {
|
|
fprintf(stderr, "error read config file. \n");
|
|
return -1;
|
|
}
|
|
int ret = doris::OLAP_SUCCESS;
|
|
testing::InitGoogleTest(&argc, argv);
|
|
doris::CpuInfo::init();
|
|
doris::set_up();
|
|
ret = RUN_ALL_TESTS();
|
|
doris::tear_down();
|
|
google::protobuf::ShutdownProtobufLibrary();
|
|
return ret;
|
|
}
|