Skip to content

Commit

Permalink
[Chore](asan) change asan_suppr from interceptor_via_lib to intercept…
Browse files Browse the repository at this point in the history
…or_via_fun (apache#19636)

change asan_suppr from interceptor_via_lib to interceptor_via_fun
  • Loading branch information
BiteTheDDDDt authored May 16, 2023
1 parent ddcf7ec commit b927f8c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
24 changes: 12 additions & 12 deletions be/src/vec/exec/vaggregation_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,9 @@ struct AggregateDataContainer {
Iterator end() { return Iterator(this, _total_count); }

void init_once() {
if (_inited) return;
if (_inited) {
return;
}
_inited = true;
iterator = begin();
}
Expand All @@ -810,7 +812,6 @@ struct AggregateDataContainer {
_value_containers.emplace_back(_current_agg_data);
}

private:
static constexpr uint32_t SUB_CONTAINER_CAPACITY = 8192;
Arena _arena_pool;
std::vector<char*> _key_containers;
Expand Down Expand Up @@ -868,19 +869,19 @@ class AggregationNode final : public ::doris::ExecNode {
using Sizes = std::vector<size_t>;

AggregationNode(ObjectPool* pool, const TPlanNode& tnode, const DescriptorTbl& descs);
~AggregationNode();
virtual Status init(const TPlanNode& tnode, RuntimeState* state = nullptr) override;
~AggregationNode() override;
Status init(const TPlanNode& tnode, RuntimeState* state = nullptr) override;
Status prepare_profile(RuntimeState* state);
virtual Status prepare(RuntimeState* state) override;
virtual Status open(RuntimeState* state) override;
virtual Status alloc_resource(RuntimeState* state) override;
virtual Status get_next(RuntimeState* state, Block* block, bool* eos) override;
virtual Status close(RuntimeState* state) override;
virtual void release_resource(RuntimeState* state) override;
Status prepare(RuntimeState* state) override;
Status open(RuntimeState* state) override;
Status alloc_resource(RuntimeState* state) override;
Status get_next(RuntimeState* state, Block* block, bool* eos) override;
Status close(RuntimeState* state) override;
void release_resource(RuntimeState* state) override;
Status pull(doris::RuntimeState* state, vectorized::Block* output_block, bool* eos) override;
Status sink(doris::RuntimeState* state, vectorized::Block* input_block, bool eos) override;
Status do_pre_agg(vectorized::Block* input_block, vectorized::Block* output_block);
bool is_streaming_preagg() { return _is_streaming_preagg; }
bool is_streaming_preagg() const { return _is_streaming_preagg; }

private:
friend class pipeline::AggSinkOperator;
Expand Down Expand Up @@ -961,7 +962,6 @@ class AggregationNode final : public ::doris::ExecNode {
std::vector<AggregateDataPtr> _values;
std::unique_ptr<AggregateDataContainer> _aggregate_data_container;

private:
void _release_self_resource(RuntimeState* state);
/// Return true if we should keep expanding hash tables in the preagg. If false,
/// the preagg should pass through any rows it can't fit in its tables.
Expand Down
5 changes: 4 additions & 1 deletion conf/asan_suppr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
# specific language governing permissions and limitations
# under the License.

interceptor_via_lib:apache::thrift
interceptor_via_fun:doris::FrontendServiceClient::recv_finishTask
interceptor_via_fun:doris::FrontendServiceClient::recv_streamLoadPut
interceptor_via_fun:doris::FrontendService_report_pargs::write
interceptor_via_fun:doris::FrontendServiceClient::recv_loadTxnPreCommit

0 comments on commit b927f8c

Please sign in to comment.