This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-2.0-var
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 1c0eb700056d9642a8984ec95be869ab1671c7b2
Author: eldenmoon <15605149...@163.com>
AuthorDate: Fri Sep 15 14:02:58 2023 +0800
[chore] (compile) fix compile
---
be/src/olap/rowset/segment_v2/segment_iterator.cpp | 8 ++++----
be/src/olap/types.cpp | 4 ++--
.../src/main/java/org/apache/doris/analysis/DescriptorTable.java | 9 ---------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
index f0ff43e96f..6cb29ba3b6 100644
--- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp
+++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -1054,8 +1054,8 @@ Status SegmentIterator::_init_return_column_iterators() {
// int32_t unique_id = _opts.tablet_schema->column(cid).unique_id();
if (_column_iterators.count(cid) < 1) {
- RETURN_IF_ERROR(_segment->new_column_iterator(
- _opts.tablet_schema->column(cid), &_column_iterators[cid],
&_opts));
+
RETURN_IF_ERROR(_segment->new_column_iterator(_opts.tablet_schema->column(cid),
+
&_column_iterators[cid], &_opts));
ColumnIteratorOptions iter_opts;
iter_opts.stats = _opts.stats;
iter_opts.use_page_cache = _opts.use_page_cache;
@@ -2048,7 +2048,7 @@ Status
SegmentIterator::_next_batch_internal(vectorized::Block* block) {
// shrink char_type suffix zero data
block->shrink_char_type_column_suffix_zero(_char_type_idx);
-//#ifndef NDEBUG
+ //#ifndef NDEBUG
size_t rows = block->rows();
for (const auto& entry : *block) {
if (entry.column->size() != rows) {
@@ -2056,7 +2056,7 @@ Status
SegmentIterator::_next_batch_internal(vectorized::Block* block) {
entry.column->size(), rows);
}
}
-// #endif
+ // #endif
VLOG_DEBUG << "dump block: " << block->dump_data();
// #ifndef NDEBUG
// size_t rows = block->rows();
diff --git a/be/src/olap/types.cpp b/be/src/olap/types.cpp
index c2b1c36df5..bfa907144f 100644
--- a/be/src/olap/types.cpp
+++ b/be/src/olap/types.cpp
@@ -97,8 +97,8 @@ const TypeInfo* get_scalar_type_info(FieldType field_type) {
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_DECIMAL128I>(),
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_JSONB>(),
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_VARIANT>(),
- nullptr,
- get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_AGG_STATE>()};
+ get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_AGG_STATE>(),
+ nullptr};
return field_type_array[int(field_type)];
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java
index de58ed5df0..42c69bba6e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescriptorTable.java
@@ -69,15 +69,7 @@ public class DescriptorTable {
return d;
}
- public static void printStackTrace() {
- StackTraceElement[] stackTrace =
Thread.currentThread().getStackTrace();
- for (StackTraceElement element : stackTrace) {
- System.out.println(element.toString());
- }
- }
-
public SlotDescriptor addSlotDescriptor(TupleDescriptor d) {
- printStackTrace();
SlotDescriptor result = new
SlotDescriptor(slotIdGenerator.getNextId(), d);
d.addSlot(result);
slotDescs.put(result.getId(), result);
@@ -88,7 +80,6 @@ public class DescriptorTable {
* Used by new optimizer.
*/
public SlotDescriptor addSlotDescriptor(TupleDescriptor d, int id) {
- printStackTrace();
SlotDescriptor result = new SlotDescriptor(new SlotId(id), d);
d.addSlot(result);
slotDescs.put(result.getId(), result);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
