This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6cb947f72b2 [refactor](unused code) delete unused method from field.h
(#25554)
6cb947f72b2 is described below
commit 6cb947f72b23a3667911717bcad0f5f560f4a562
Author: yiguolei <676222...@qq.com>
AuthorDate: Wed Oct 18 13:11:14 2023 +0800
[refactor](unused code) delete unused method from field.h (#25554)
Co-authored-by: yiguolei <yiguo...@gmail.com>
---
be/src/olap/field.h | 68 ------------------------------------
be/src/olap/row_cursor.cpp | 28 ---------------
be/src/olap/row_cursor.h | 3 --
be/test/olap/delete_handler_test.cpp | 63 ---------------------------------
4 files changed, 162 deletions(-)
diff --git a/be/src/olap/field.h b/be/src/olap/field.h
index fc9c87bfb1c..3a01876b58c 100644
--- a/be/src/olap/field.h
+++ b/be/src/olap/field.h
@@ -76,8 +76,6 @@ public:
return allocate_value(arena);
}
- virtual char* allocate_memory(char* cell_ptr, char* variable_ptr) const {
return variable_ptr; }
-
virtual size_t get_variable_len() const { return 0; }
virtual void modify_zone_map_index(char*) const {}
@@ -263,26 +261,12 @@ class MapField : public Field {
public:
MapField(const TabletColumn& column) : Field(column) {}
- // make variable_ptr memory allocate to cell_ptr as MapValue
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- return variable_ptr + _length;
- }
-
size_t get_variable_len() const override { return _length; }
};
class StructField : public Field {
public:
StructField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto struct_v = (StructValue*)cell_ptr;
- struct_v->set_values(reinterpret_cast<void**>(variable_ptr));
- variable_ptr += _length;
- for (size_t i = 0; i < get_sub_field_count(); i++) {
- variable_ptr += get_sub_field(i)->get_variable_len();
- }
- return variable_ptr;
- }
size_t get_variable_len() const override {
size_t variable_len = _length;
@@ -297,12 +281,6 @@ class ArrayField : public Field {
public:
ArrayField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto array_v = (CollectionValue*)cell_ptr;
- array_v->set_null_signs(reinterpret_cast<bool*>(variable_ptr));
- return variable_ptr + _length;
- }
-
size_t get_variable_len() const override { return _length; }
};
@@ -312,14 +290,6 @@ public:
size_t get_variable_len() const override { return _length; }
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = variable_ptr;
- slice->size = _length;
- variable_ptr += slice->size;
- return variable_ptr;
- }
-
CharField* clone() const override {
auto* local = new CharField(_desc);
Field::clone(local);
@@ -372,15 +342,6 @@ public:
size_t get_variable_len() const override { return _length -
OLAP_VARCHAR_MAX_BYTES; }
- // minus OLAP_VARCHAR_MAX_BYTES here just for being compatible with old
storage format
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = variable_ptr;
- slice->size = _length - OLAP_VARCHAR_MAX_BYTES;
- variable_ptr += slice->size;
- return variable_ptr;
- }
-
VarcharField* clone() const override {
auto* local = new VarcharField(_desc);
Field::clone(local);
@@ -430,11 +391,6 @@ class StringField : public Field {
public:
StringField(const TabletColumn& column) : Field(column) {}
- // minus OLAP_VARCHAR_MAX_BYTES here just for being compatible with old
storage format
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- return variable_ptr;
- }
-
StringField* clone() const override {
auto* local = new StringField(_desc);
Field::clone(local);
@@ -481,12 +437,6 @@ class BitmapAggField : public Field {
public:
BitmapAggField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = nullptr;
- return variable_ptr;
- }
-
BitmapAggField* clone() const override {
auto* local = new BitmapAggField(_desc);
Field::clone(local);
@@ -498,12 +448,6 @@ class QuantileStateAggField : public Field {
public:
QuantileStateAggField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = nullptr;
- return variable_ptr;
- }
-
QuantileStateAggField* clone() const override {
auto* local = new QuantileStateAggField(_desc);
Field::clone(local);
@@ -515,12 +459,6 @@ class AggStateField : public Field {
public:
AggStateField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = nullptr;
- return variable_ptr;
- }
-
AggStateField* clone() const override {
auto* local = new AggStateField(_desc);
Field::clone(local);
@@ -532,12 +470,6 @@ class HllAggField : public Field {
public:
HllAggField(const TabletColumn& column) : Field(column) {}
- char* allocate_memory(char* cell_ptr, char* variable_ptr) const override {
- auto slice = (Slice*)cell_ptr;
- slice->data = nullptr;
- return variable_ptr;
- }
-
HllAggField* clone() const override {
auto* local = new HllAggField(_desc);
Field::clone(local);
diff --git a/be/src/olap/row_cursor.cpp b/be/src/olap/row_cursor.cpp
index a79e31e0079..3bbd699ff27 100644
--- a/be/src/olap/row_cursor.cpp
+++ b/be/src/olap/row_cursor.cpp
@@ -210,34 +210,6 @@ Status RowCursor::init_scan_key(TabletSchemaSPtr schema,
const std::vector<std::
return _init_scan_key(schema, scan_keys);
}
-// TODO(yingchun): parameter 'TabletSchemaSPtr schema' is not used
-Status RowCursor::allocate_memory_for_string_type(TabletSchemaSPtr schema) {
- // allocate memory for string type(char, varchar, hll, array)
- // The memory allocated in this function is used in aggregate and copy
function
- if (_variable_len == 0 && _string_field_count == 0) {
- return Status::OK();
- }
- DCHECK(_variable_buf == nullptr) << "allocate memory twice";
- RETURN_IF_ERROR(_alloc_buf());
- // init slice of char, varchar, hll type
- char* fixed_ptr = _fixed_buf;
- char* variable_ptr = _variable_buf;
- char** long_text_ptr = _long_text_buf;
- for (auto cid : _schema->column_ids()) {
- fixed_ptr = _fixed_buf + _schema->column_offset(cid);
- if (_schema->column(cid)->type() == FieldType::OLAP_FIELD_TYPE_STRING)
{
- Slice* slice = reinterpret_cast<Slice*>(fixed_ptr + 1);
- _schema->mutable_column(cid)->set_long_text_buf(long_text_ptr);
- slice->data = *(long_text_ptr);
- slice->size = DEFAULT_TEXT_LENGTH;
- ++long_text_ptr;
- } else if (_variable_len > 0) {
- variable_ptr = column_schema(cid)->allocate_memory(fixed_ptr + 1,
variable_ptr);
- }
- }
- return Status::OK();
-}
-
Status RowCursor::build_max_key() {
for (auto cid : _schema->column_ids()) {
const Field* field = column_schema(cid);
diff --git a/be/src/olap/row_cursor.h b/be/src/olap/row_cursor.h
index 7c19e7ad55b..e9c58f1eb67 100644
--- a/be/src/olap/row_cursor.h
+++ b/be/src/olap/row_cursor.h
@@ -62,9 +62,6 @@ public:
Status init_scan_key(TabletSchemaSPtr schema, const
std::vector<std::string>& keys,
const std::shared_ptr<Schema>& shared_schema);
- //allocate memory for string type, which include char, varchar, hyperloglog
- Status allocate_memory_for_string_type(TabletSchemaSPtr schema);
-
RowCursorCell cell(uint32_t cid) const { return
RowCursorCell(nullable_cell_ptr(cid)); }
// RowCursor received a continuous buf
diff --git a/be/test/olap/delete_handler_test.cpp
b/be/test/olap/delete_handler_test.cpp
index c4b883c9948..55940cf3682 100644
--- a/be/test/olap/delete_handler_test.cpp
+++ b/be/test/olap/delete_handler_test.cpp
@@ -881,9 +881,6 @@ protected:
EXPECT_TRUE(tablet != nullptr);
_tablet_path = tablet->tablet_path();
- static_cast<void>(_data_row_cursor.init(tablet->tablet_schema()));
- static_cast<void>(
-
_data_row_cursor.allocate_memory_for_string_type(tablet->tablet_schema()));
_json_rowset_meta = R"({
"rowset_id": 540081,
"tablet_id": 15673,
@@ -949,7 +946,6 @@ protected:
}
std::string _tablet_path;
- RowCursor _data_row_cursor;
TabletSharedPtr tablet;
TCreateTabletReq _create_tablet;
DeleteHandler _delete_handler;
@@ -1090,30 +1086,6 @@ TEST_F(TestDeleteHandler, FilterDataSubconditions) {
res = _delete_handler.init(tablet->tablet_schema(),
get_delete_predicates(), 4);
EXPECT_EQ(Status::OK(), res);
- // 构造一行测试数据
- std::vector<string> data_str;
- data_str.push_back("1");
- data_str.push_back("6");
- data_str.push_back("8");
- data_str.push_back("-1");
- data_str.push_back("16");
- data_str.push_back("1.2");
- data_str.push_back("2014-01-01");
- data_str.push_back("2014-01-01 00:00:00");
- data_str.push_back("YWFH");
- data_str.push_back("1");
- data_str.push_back("YWFH==");
- data_str.push_back("1");
- OlapTuple tuple1(data_str);
- res = _data_row_cursor.from_tuple(tuple1);
- EXPECT_EQ(Status::OK(), res);
-
- // 构造一行测试数据
- data_str[1] = "4";
- OlapTuple tuple2(data_str);
- res = _data_row_cursor.from_tuple(tuple2);
- EXPECT_EQ(Status::OK(), res);
-
_delete_handler.finalize();
}
@@ -1175,23 +1147,6 @@ TEST_F(TestDeleteHandler, FilterDataConditions) {
res = _delete_handler.init(tablet->tablet_schema(),
get_delete_predicates(), 4);
EXPECT_EQ(Status::OK(), res);
- std::vector<string> data_str;
- data_str.push_back("4");
- data_str.push_back("5");
- data_str.push_back("8");
- data_str.push_back("-1");
- data_str.push_back("16");
- data_str.push_back("1.2");
- data_str.push_back("2014-01-01");
- data_str.push_back("2014-01-01 00:00:00");
- data_str.push_back("YWFH");
- data_str.push_back("1");
- data_str.push_back("YWFH==");
- data_str.push_back("1");
- OlapTuple tuple(data_str);
- res = _data_row_cursor.from_tuple(tuple);
- EXPECT_EQ(Status::OK(), res);
-
_delete_handler.finalize();
}
@@ -1238,24 +1193,6 @@ TEST_F(TestDeleteHandler, FilterDataVersion) {
res = _delete_handler.init(tablet->tablet_schema(),
get_delete_predicates(), 4);
EXPECT_EQ(Status::OK(), res);
- // 构造一行测试数据
- std::vector<string> data_str;
- data_str.push_back("1");
- data_str.push_back("6");
- data_str.push_back("8");
- data_str.push_back("-1");
- data_str.push_back("16");
- data_str.push_back("1.2");
- data_str.push_back("2014-01-01");
- data_str.push_back("2014-01-01 00:00:00");
- data_str.push_back("YWFH");
- data_str.push_back("1");
- data_str.push_back("YWFH==");
- data_str.push_back("1");
- OlapTuple tuple(data_str);
- res = _data_row_cursor.from_tuple(tuple);
- EXPECT_EQ(Status::OK(), res);
-
_delete_handler.finalize();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
