fix

StarRocks · Sep 9, 2021 · b56d88c · b56d88c
1 parent 86c906d
commit b56d88c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/be/src/column/array_column.h b/be/src/column/array_column.h
@@ -221,8 +221,8 @@ class ArrayColumn final : public ColumnFactory<Column, ArrayColumn> {
 
     std::string debug_string() const override;
 
-    bool exceed_capacity_limit() const override {
-        return _elements->exceed_capacity_limit() || _offsets->exceed_capacity_limit();
+    bool reach_capacity_limit() const override {
+        return _elements->reach_capacity_limit() || _offsets->reach_capacity_limit();
     }
 
 private:

diff --git a/be/src/column/binary_column.h b/be/src/column/binary_column.h
@@ -272,7 +272,7 @@ class BinaryColumn final : public ColumnFactory<Column, BinaryColumn> {
         return ss.str();
     }
 
-    bool exceed_capacity_limit() const override {
+    bool reach_capacity_limit() const override {
         return _bytes.size() >= UINT32_MAX || _offsets.size() >= UINT32_MAX || _slices.size() >= UINT32_MAX;
     }
 

diff --git a/be/src/column/chunk.h b/be/src/column/chunk.h
@@ -234,9 +234,9 @@ class Chunk {
 
     std::string debug_row(uint32_t index) const;
 
-    bool exceed_capacity_limit() const {
+    bool reach_capacity_limit() const {
         for (const auto& column : _columns) {
-            if (column->exceed_capacity_limit()) {
+            if (column->reach_capacity_limit()) {
                 return true;
             }
         }

diff --git a/be/src/column/column.h b/be/src/column/column.h
@@ -305,7 +305,7 @@ class Column {
 
     virtual void reset_column() { _delete_state = DEL_NOT_SATISFIED; }
 
-    virtual bool exceed_capacity_limit() const = 0;
+    virtual bool reach_capacity_limit() const = 0;
 
 protected:
     DelCondSatisfied _delete_state = DEL_NOT_SATISFIED;

diff --git a/be/src/column/const_column.h b/be/src/column/const_column.h
@@ -217,7 +217,7 @@ class ConstColumn final : public ColumnFactory<Column, ConstColumn> {
         return ss.str();
     }
 
-    bool exceed_capacity_limit() const override { return _data->exceed_capacity_limit(); }
+    bool reach_capacity_limit() const override { return _data->reach_capacity_limit(); }
 
 private:
     ColumnPtr _data;

diff --git a/be/src/column/fixed_length_column_base.h b/be/src/column/fixed_length_column_base.h
@@ -183,7 +183,7 @@ class FixedLengthColumnBase : public ColumnFactory<Column, FixedLengthColumnBase
         _data.clear();
     }
 
-    bool exceed_capacity_limit() const override {
+    bool reach_capacity_limit() const override {
         return _data.size() >= UINT32_MAX;
     }
 

diff --git a/be/src/column/nullable_column.h b/be/src/column/nullable_column.h
@@ -273,8 +273,8 @@ class NullableColumn final : public ColumnFactory<Column, NullableColumn> {
         return ss.str();
     }
 
-    bool exceed_capacity_limit() const override {
-        return _data_column->exceed_capacity_limit() || _null_column->exceed_capacity_limit();
+    bool reach_capacity_limit() const override {
+        return _data_column->reach_capacity_limit() || _null_column->reach_capacity_limit();
     }
 
 private:

diff --git a/be/src/column/object_column.h b/be/src/column/object_column.h
@@ -191,7 +191,7 @@ class ObjectColumn final : public ColumnFactory<Column, ObjectColumn<T>> {
         return ss.str();
     }
 
-    bool exceed_capacity_limit() const override {
+    bool reach_capacity_limit() const override {
         return _pool.size() >= UINT32_MAX || _cache.size() >= UINT32_MAX || _slices.size() >= UINT32_MAX ||
                _buffer.size() >= UINT32_MAX;
     }

diff --git a/be/src/exec/vectorized/hash_join_node.cpp b/be/src/exec/vectorized/hash_join_node.cpp
@@ -357,7 +357,7 @@ Status HashJoinNode::_build(RuntimeState* state) {
         // which will cause the output of wrong data.
         // Currently, a defense needs to be added.
         // After a better solution is available, the BigChunk mechanism can be removed.
-        if (_ht.get_build_chunk()->exceed_capacity_limit()) {
+        if (_ht.get_build_chunk()->reach_capacity_limit()) {
             return Status::InternalError("Total size of single column exceed the limit of hash join");
         }