Skip to content

Commit

Permalink
[chore](minor) Remove some useless file and refactor a illogical name…
Browse files Browse the repository at this point in the history
… of Column interface (apache#44214)

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

1. `insert_many_data` -> `insert_data_repeatly`
2. remove installation of docs build
3. remove a weird useless regression realData file(may carried up by
mistake before)
  • Loading branch information
zclllyybb authored Nov 19, 2024
1 parent cfc84c5 commit 787347b
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 76 deletions.
12 changes: 6 additions & 6 deletions be/src/olap/rowset/segment_v2/column_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ Status ColumnReader::next_batch_of_zone_map(size_t* n, vectorized::MutableColumn
} else {
if (is_string) {
auto sv = (StringRef*)min_value->cell_ptr();
dst->insert_many_data(sv->data, sv->size, size);
dst->insert_data_repeatedly(sv->data, sv->size, size);
} else {
// TODO: the work may cause performance problem, opt latter
for (int i = 0; i < size; ++i) {
Expand Down Expand Up @@ -1508,7 +1508,7 @@ void DefaultValueColumnIterator::insert_default_data(const TypeInfo* type_info,
value.cast_to_date();

int64 = binary_cast<VecDateTimeValue, vectorized::Int64>(value);
dst->insert_many_data(data_ptr, data_len, n);
dst->insert_data_repeatedly(data_ptr, data_len, n);
break;
}
case FieldType::OLAP_FIELD_TYPE_DATETIME: {
Expand All @@ -1526,7 +1526,7 @@ void DefaultValueColumnIterator::insert_default_data(const TypeInfo* type_info,
value.to_datetime();

int64 = binary_cast<VecDateTimeValue, vectorized::Int64>(value);
dst->insert_many_data(data_ptr, data_len, n);
dst->insert_data_repeatedly(data_ptr, data_len, n);
break;
}
case FieldType::OLAP_FIELD_TYPE_DECIMAL: {
Expand All @@ -1538,7 +1538,7 @@ void DefaultValueColumnIterator::insert_default_data(const TypeInfo* type_info,
sizeof(FieldTypeTraits<FieldType::OLAP_FIELD_TYPE_DECIMAL>::CppType)); //decimal12_t
decimal12_t* d = (decimal12_t*)mem_value;
int128 = DecimalV2Value(d->integer, d->fraction).value();
dst->insert_many_data(data_ptr, data_len, n);
dst->insert_data_repeatedly(data_ptr, data_len, n);
break;
}
case FieldType::OLAP_FIELD_TYPE_STRING:
Expand All @@ -1548,7 +1548,7 @@ void DefaultValueColumnIterator::insert_default_data(const TypeInfo* type_info,
case FieldType::OLAP_FIELD_TYPE_AGG_STATE: {
char* data_ptr = ((Slice*)mem_value)->data;
size_t data_len = ((Slice*)mem_value)->size;
dst->insert_many_data(data_ptr, data_len, n);
dst->insert_data_repeatedly(data_ptr, data_len, n);
break;
}
case FieldType::OLAP_FIELD_TYPE_ARRAY: {
Expand All @@ -1566,7 +1566,7 @@ void DefaultValueColumnIterator::insert_default_data(const TypeInfo* type_info,
default: {
char* data_ptr = (char*)mem_value;
size_t data_len = type_size;
dst->insert_many_data(data_ptr, data_len, n);
dst->insert_data_repeatedly(data_ptr, data_len, n);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/columns/column.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class IColumn : public COW<IColumn> {
"Method insert_many_raw_data is not supported for " + get_name());
}

void insert_many_data(const char* pos, size_t length, size_t data_num) {
void insert_data_repeatedly(const char* pos, size_t length, size_t data_num) {
for (size_t i = 0; i < data_num; ++i) {
insert_data(pos, length);
}
Expand Down
4 changes: 2 additions & 2 deletions be/src/vec/exprs/table_function/vexplode_json_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ struct ParsedDataStringBase : public ParsedData<std::string> {
void insert_many_same_value_from_parsed_data(MutableColumnPtr& column, int64_t cur_offset,
int length) override {
assert_cast<ColumnString*>(column.get())
->insert_many_data(_data_string_ref[cur_offset].data,
_data_string_ref[cur_offset].size, length);
->insert_data_repeatedly(_data_string_ref[cur_offset].data,
_data_string_ref[cur_offset].size, length);
}

void reset() override {
Expand Down
3 changes: 2 additions & 1 deletion be/src/vec/exprs/table_function/vexplode_split.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ void VExplodeSplitTableFunction::get_same_many_values(MutableColumnPtr& column,
if (current_empty()) {
column->insert_many_defaults(length);
} else {
column->insert_many_data(_backup[_cur_offset].data, _backup[_cur_offset].size, length);
column->insert_data_repeatedly(_backup[_cur_offset].data, _backup[_cur_offset].size,
length);
}
}

Expand Down
3 changes: 2 additions & 1 deletion be/src/vec/functions/function_string.h
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,8 @@ class FunctionStringElt : public IFunction {
null_map = ColumnUInt8::create(input_rows_count, is_null);
res->insert_many_defaults(input_rows_count);
} else {
res->insert_many_data(target_data.data, target_data.size, input_rows_count);
res->insert_data_repeatedly(target_data.data, target_data.size,
input_rows_count);
}
} else if (auto target_nullable_column =
check_and_get_column<ColumnNullable>(*target_column)) {
Expand Down
11 changes: 0 additions & 11 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,6 @@ fi

# Assesmble FE modules
FE_MODULES=''
# TODO: docs are temporarily removed, so this var is always OFF
# Fix it later
BUILD_DOCS='OFF'
modules=("")
if [[ "${BUILD_FE}" -eq 1 ]]; then
modules+=("fe-common")
Expand Down Expand Up @@ -648,14 +645,6 @@ if [[ "${BUILD_CLOUD}" -eq 1 ]]; then
echo "Build cloud done"
fi

if [[ "${BUILD_DOCS}" = "ON" ]]; then
# Build docs, should be built before Frontend
echo "Build docs"
cd "${DORIS_HOME}/docs"
./build_help_zip.sh
cd "${DORIS_HOME}"
fi

function build_ui() {
NPM='npm'
if ! ${NPM} --version; then
Expand Down
41 changes: 0 additions & 41 deletions docs/build_help_zip.sh

This file was deleted.

This file was deleted.

0 comments on commit 787347b

Please sign in to comment.