This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 60b5c29eaa6 [fix](compile) fix compile errors (#52554)
60b5c29eaa6 is described below
commit 60b5c29eaa628ce790561cf10d30e2b814f80540
Author: shuke <[email protected]>
AuthorDate: Tue Jul 1 10:27:55 2025 +0800
[fix](compile) fix compile errors (#52554)
fix two compile errors
---
be/src/olap/rowset/segment_v2/variant/variant_column_reader.cpp | 3 +--
be/src/vec/columns/column_object.cpp | 9 ++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/variant/variant_column_reader.cpp
b/be/src/olap/rowset/segment_v2/variant/variant_column_reader.cpp
index ab5f6f480c0..39cb67d9dbc 100644
--- a/be/src/olap/rowset/segment_v2/variant/variant_column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/variant/variant_column_reader.cpp
@@ -232,8 +232,7 @@ Status
VariantColumnReader::_new_iterator_with_flat_leaves(ColumnIterator** iter
}
if (relative_path.empty()) {
// root path, use VariantRootColumnIterator
- *iterator = *iterator =
- new VariantRootColumnIterator(new
FileColumnIterator(node->data.reader.get()));
+ *iterator = new VariantRootColumnIterator(new
FileColumnIterator(node->data.reader.get()));
return Status::OK();
}
VLOG_DEBUG << "new iterator: " << target_col.path_info_ptr()->get_path();
diff --git a/be/src/vec/columns/column_object.cpp
b/be/src/vec/columns/column_object.cpp
index 22b28d74a7c..fedb15ded8b 100644
--- a/be/src/vec/columns/column_object.cpp
+++ b/be/src/vec/columns/column_object.cpp
@@ -974,7 +974,7 @@ const char* parse_binary_from_sparse_column(TypeIndex type,
const char* data, Fi
for (size_t i = 0; i < size; ++i) {
Field nested_field;
const auto nested_type =
- static_cast<const TypeIndex>(*reinterpret_cast<const
uint8_t*>(data++));
+ static_cast<TypeIndex>(*reinterpret_cast<const
uint8_t*>(data++));
data = parse_binary_from_sparse_column(nested_type, data,
nested_field, info_res);
array[i] = std::move(nested_field);
}
@@ -993,7 +993,7 @@ std::pair<Field, FieldInfo>
ColumnObject::deserialize_from_sparse_column(const C
const auto& data_ref = value->get_data_at(row);
const char* data = data_ref.data;
DCHECK(data_ref.size > 1);
- const TypeIndex type = static_cast<const
TypeIndex>(*reinterpret_cast<const uint8_t*>(data++));
+ const TypeIndex type = static_cast<TypeIndex>(*reinterpret_cast<const
uint8_t*>(data++));
Field res;
FieldInfo info_res = {
.scalar_type_id = type,
@@ -2330,11 +2330,14 @@ size_t
ColumnObject::find_path_lower_bound_in_sparse_data(StringRef path,
// Simple random access iterator over values in ColumnString in specified
range.
class Iterator {
public:
- using difference_type = size_t;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+ using difference_type = std::ptrdiff_t;
using value_type = StringRef;
using iterator_category = std::random_access_iterator_tag;
using pointer = StringRef*;
using reference = StringRef&;
+#pragma GCC diagnostic pop
Iterator() = delete;
Iterator(const ColumnString* data_, size_t index_) : data(data_),
index(index_) {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
