github-actions[bot] commented on code in PR #15339: URL: https://github.com/apache/doris/pull/15339#discussion_r1106604940
########## be/src/vec/exec/join/process_hash_table_probe_impl.h: ########## @@ -607,6 +607,7 @@ Status ProcessHashTableProbe<JoinOpType>::do_process_with_other_join_conjuncts( } } } +<<<<<<< HEAD Review Comment: warning: version control conflict marker in file [clang-diagnostic-error] ```cpp <<<<<<< HEAD ^ ``` ########## be/test/vec/aggregate_functions/agg_group_array_test.cpp: ########## @@ -0,0 +1,139 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#include <gtest/gtest.h> + +#include "gtest/gtest.h" +#include "vec/aggregate_functions/aggregate_function_collect.h" +#include "vec/aggregate_functions/aggregate_function_simple_factory.h" +#include "vec/common/arena.h" +#include "vec/core/field.h" +#include "vec/data_types/data_type.h" +#include "vec/data_types/data_type_date.h" +#include "vec/data_types/data_type_date_time.h" +#include "vec/data_types/data_type_decimal.h" +#include "vec/data_types/data_type_number.h" +#include "vec/data_types/data_type_string.h" + +namespace doris::vectorized { + +void register_aggregate_function_group_uniq_array(AggregateFunctionSimpleFactory& factory); + +class VAggGroupArrayTest : public testing::Test { +private: + Arena _agg_arena_pool; + +public: + void SetUp() override { + AggregateFunctionSimpleFactory factory = AggregateFunctionSimpleFactory::instance(); + register_aggregate_function_group_uniq_array(factory); + } + + void TearDown() override {} + + template <typename DataType> + void agg_group_uniq_array_add_elements(AggregateFunctionPtr agg_function, + AggregateDataPtr place, size_t input_nums) { + using FieldType = typename DataType::FieldType; + auto type = std::make_shared<DataType>(); + auto input_col = type->create_column(); + for (size_t i = 0; i < input_nums; ++i) { + if constexpr (std::is_same_v<DataType, DataTypeString>) { + auto item = std::string("item") + std::to_string(i); + input_col->insert_data(item.c_str(), item.size()); + } else { + auto item = FieldType(static_cast<uint64_t>(i)); + input_col->insert_data(reinterpret_cast<const char*>(&item), 0); + } + } + EXPECT_EQ(input_col->size(), input_nums); + + const IColumn* column[1] = {input_col.get()}; + for (int i = 0; i < input_col->size(); i++) { + agg_function->add(place, column, i, &_agg_arena_pool); + } + } + + template <typename DataType> + void test_agg_group_uniq_array(size_t input_nums = 0) { + DataTypes data_types = {(DataTypePtr)std::make_shared<DataType>()}; + LOG(INFO) << "test_agg_group_uniq_array for type" + << "(" << data_types[0]->get_name() << ")"; + + Array array; + AggregateFunctionSimpleFactory factory = AggregateFunctionSimpleFactory::instance(); + auto agg_function = factory.get("group_uniq_array", data_types, array); + EXPECT_NE(agg_function, nullptr); + + std::unique_ptr<char[]> memory(new char[agg_function->size_of_data()]); + AggregateDataPtr place = memory.get(); + agg_function->create(place); + + agg_group_uniq_array_add_elements<DataType>(agg_function, place, input_nums); + + ColumnString buf; Review Comment: warning: calling a private constructor of class 'doris::vectorized::ColumnString' [clang-diagnostic-error] ```cpp ColumnString buf; ^ ``` **be/src/vec/columns/column_string.h:76:** declared private here ```cpp ColumnString() = default; ^ ``` ########## be/src/exprs/timestamp_functions.cpp: ########## @@ -0,0 +1,1036 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// This file is copied from +// https://github.com/apache/impala/blob/branch-2.9.0/be/src/exprs/timestamp-functions.cc +// and modified by Doris + +#include "exprs/timestamp_functions.h" Review Comment: warning: 'exprs/timestamp_functions.h' file not found [clang-diagnostic-error] ```cpp #include "exprs/timestamp_functions.h" ^ ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org