Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/StarRocks/starrocks into 08…
Browse files Browse the repository at this point in the history 
…29-logical-partition

Signed-off-by: HangyuanLiu <[email protected]>
  • Loading branch information
@HangyuanLiu
HangyuanLiu committed Nov 12, 2024
2 parents 373b031 + 9620709 commit 4befb37
Show file tree
Hide file tree
Showing 91 changed files with 3,432 additions and 680 deletions.
5 changes: 5 additions & 0 deletions be/src/column/column_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ class ColumnHelper {
return down_cast<RunTimeColumnType<Type>*>(value);
}

template <LogicalType Type>
static inline const RunTimeColumnType<Type>* cast_to_raw(const Column* value) {
return down_cast<const RunTimeColumnType<Type>*>(value);
}

/**
* Cast columnPtr to special type ColumnPtr
* Plz sure actual column type by yourself
Expand Down
10 changes: 10 additions & 0 deletions be/src/exprs/agg/aggregate_traits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ struct AggDataTypeTraits<lt, FixedLengthLTGuard<lt>> {
static void append_value(ColumnType* column, const ValueType& value) { column->append(value); }

static RefType get_row_ref(const ColumnType& column, size_t row) { return column.get_data()[row]; }
static RefType get_ref(const ValueType& value) { return value; }

static void update_max(ValueType& current, const RefType& input) { current = std::max<ValueType>(current, input); }
static void update_min(ValueType& current, const RefType& input) { current = std::min<ValueType>(current, input); }

static bool is_equal(const RefType& lhs, const RefType& rhs) { return lhs == rhs; }
};

// For pointer ref types
Expand All @@ -55,11 +58,14 @@ struct AggDataTypeTraits<lt, ObjectFamilyLTGuard<lt>> {
static void assign_value(ColumnType* column, size_t row, const ValueType& ref) { *column->get_object(row) = ref; }

static void append_value(ColumnType* column, const ValueType& value) { column->append(&value); }
static RefType get_ref(const ValueType& value) { return &value; }

static const RefType get_row_ref(const ColumnType& column, size_t row) { return column.get_object(row); }

static void update_max(ValueType& current, const RefType& input) { current = std::max<ValueType>(current, *input); }
static void update_min(ValueType& current, const RefType& input) { current = std::min<ValueType>(current, *input); }

static bool is_equal(const RefType& lhs, const RefType& rhs) { return *lhs == *rhs; }
};

template <LogicalType lt>
Expand All @@ -79,6 +85,8 @@ struct AggDataTypeTraits<lt, StringLTGuard<lt>> {

static RefType get_row_ref(const ColumnType& column, size_t row) { return column.get_slice(row); }

static RefType get_ref(const ValueType& value) { return Slice(value.data(), value.size()); }

static void update_max(ValueType& current, const RefType& input) {
if (Slice(current.data(), current.size()).compare(input) < 0) {
current.resize(input.size);
Expand All @@ -91,6 +99,8 @@ struct AggDataTypeTraits<lt, StringLTGuard<lt>> {
memcpy(current.data(), input.data, input.size);
}
}

static bool is_equal(const RefType& lhs, const RefType& rhs) { return lhs == rhs; }
};

template <LogicalType lt>
Expand Down
160 changes: 78 additions & 82 deletions be/src/exprs/agg/histogram.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,42 @@
#pragma once

#include "column/column_helper.h"
#include "column/object_column.h"
#include "column/column_viewer.h"
#include "column/datum_convert.h"
#include "column/nullable_column.h"
#include "column/type_traits.h"
#include "column/vectorized_fwd.h"
#include "exprs/agg/aggregate.h"
#include "exprs/agg/aggregate_traits.h"
#include "gutil/casts.h"
#include "runtime/large_int_value.h"
#include "storage/types.h"

namespace starrocks {

template <typename T>
template <LogicalType LT>
struct Bucket {
public:
using RefType = AggDataRefType<LT>;
using ValueType = AggDataValueType<LT>;

Bucket() = default;
Bucket(T lower, T upper, size_t count, size_t upper_repeats)
: lower(lower), upper(upper), count(count), upper_repeats(upper_repeats), count_in_bucket(1) {}
T lower;
T upper;

Bucket(RefType input_lower, RefType input_upper, size_t count, size_t upper_repeats)
: count(count), upper_repeats(upper_repeats), count_in_bucket(1) {
AggDataTypeTraits<LT>::assign_value(lower, input_lower);
AggDataTypeTraits<LT>::assign_value(upper, input_upper);
}

bool is_equals_to_upper(RefType value) {
return AggDataTypeTraits<LT>::is_equal(value, AggDataTypeTraits<LT>::get_ref(upper));
}

void update_upper(RefType value) { AggDataTypeTraits<LT>::assign_value(upper, value); }

Datum get_lower_datum() { return Datum(AggDataTypeTraits<LT>::get_ref(lower)); }
Datum get_upper_datum() { return Datum(AggDataTypeTraits<LT>::get_ref(upper)); }

ValueType lower;
ValueType upper;
// Up to this bucket, the total value
int64_t count;
// the number of values that on the upper boundary
Expand All @@ -40,140 +59,117 @@ struct Bucket {
int64_t count_in_bucket;
};

template <typename T>
template <LogicalType LT>
struct HistogramState {
HistogramState() = default;
std::vector<T> data;
HistogramState() {
auto data = RunTimeColumnType<LT>::create();
column = NullableColumn::create(data, NullColumn::create());
}

ColumnPtr column;
};

template <LogicalType LT, typename T = RunTimeCppType<LT>>
class HistogramAggregationFunction final
: public AggregateFunctionBatchHelper<HistogramState<T>, HistogramAggregationFunction<LT, T>> {
: public AggregateFunctionBatchHelper<HistogramState<LT>, HistogramAggregationFunction<LT, T>> {
public:
using ColumnType = RunTimeColumnType<LT>;

void update(FunctionContext* ctx, const Column** columns, AggDataPtr __restrict state,
size_t row_num) const override {
T v;
if (columns[0]->is_nullable()) {
if (columns[0]->is_null(row_num)) {
return;
}

const auto* data_column = down_cast<const NullableColumn*>(columns[0]);
v = down_cast<const ColumnType*>(data_column->data_column().get())->get_data()[row_num];
} else {
v = down_cast<const ColumnType*>(columns[0])->get_data()[row_num];
}
CHECK(false);
}

this->data(state).data.emplace_back(v);
void update_batch_single_state(FunctionContext* ctx, size_t chunk_size, const Column** columns,
AggDataPtr __restrict state) const override {
this->data(state).column->append(*columns[0], 0, chunk_size);
}

void update_batch_single_state_with_frame(FunctionContext* ctx, AggDataPtr __restrict state, const Column** columns,
int64_t peer_group_start, int64_t peer_group_end, int64_t frame_start,
int64_t frame_end) const override {
//Histogram aggregation function only support one stage Agg
DCHECK(false);
CHECK(false);
}

void merge(FunctionContext* ctx, const Column* column, AggDataPtr __restrict state, size_t row_num) const override {
//Histogram aggregation function only support one stage Agg
DCHECK(false);
CHECK(false);
}

void serialize_to_column(FunctionContext* ctx __attribute__((unused)), ConstAggDataPtr __restrict state,
Column* to) const override {
//Histogram aggregation function only support one stage Agg
DCHECK(false);
CHECK(false);
}

void convert_to_serialize_format(FunctionContext* ctx, const Columns& src, size_t chunk_size,
ColumnPtr* dst) const override {
//Histogram aggregation function only support one stage Agg
DCHECK(false);
CHECK(false);
}

std::string toBucketJson(const std::string& lower, const std::string& upper, size_t count, size_t upper_repeats,
double sample_ratio) const {
return fmt::format(R"(["{}","{}","{}","{}"])", lower, upper, std::to_string((int64_t)(count * sample_ratio)),
std::to_string((int64_t)(upper_repeats * sample_ratio)));
return fmt::format(R"(["{}","{}","{}","{}"])", lower, upper, (int64_t)(count * sample_ratio),
(int64_t)(upper_repeats * sample_ratio));
}

void finalize_to_column(FunctionContext* ctx __attribute__((unused)), ConstAggDataPtr __restrict state,
Column* to) const override {
auto bucket_num = ColumnHelper::get_const_value<TYPE_INT>(ctx->get_constant_column(1));
[[maybe_unused]] double sample_ratio =
1 / ColumnHelper::get_const_value<TYPE_DOUBLE>(ctx->get_constant_column(2));
int bucket_size = this->data(state).data.size() / bucket_num;

//Build bucket
std::vector<Bucket<T>> buckets;
for (int i = 0; i < this->data(state).data.size(); ++i) {
T v = this->data(state).data[i];
int bucket_size = this->data(state).column->size() / bucket_num;

// Build bucket
std::vector<Bucket<LT>> buckets;
ColumnViewer<LT> viewer(this->data(state).column);
for (size_t i = 0; i < viewer.size(); ++i) {
auto v = viewer.value(i);
if (viewer.is_null(i)) {
continue;
}
if (buckets.empty()) {
Bucket<T> bucket(v, v, 1, 1);
Bucket<LT> bucket(v, v, 1, 1);
buckets.emplace_back(bucket);
} else {
Bucket<T>* lastBucket = &buckets.back();
Bucket<LT>* last_bucket = &buckets.back();

if (lastBucket->upper == v) {
lastBucket->count++;
lastBucket->count_in_bucket++;
lastBucket->upper_repeats++;
if (last_bucket->is_equals_to_upper(v)) {
last_bucket->count++;
last_bucket->count_in_bucket++;
last_bucket->upper_repeats++;
} else {
if (lastBucket->count_in_bucket >= bucket_size) {
Bucket<T> bucket(v, v, lastBucket->count + 1, 1);
if (last_bucket->count_in_bucket >= bucket_size) {
Bucket<LT> bucket(v, v, last_bucket->count + 1, 1);
buckets.emplace_back(bucket);
} else {
lastBucket->upper = v;
lastBucket->count++;
lastBucket->count_in_bucket++;
lastBucket->upper_repeats = 1;
last_bucket->update_upper(v);
last_bucket->count++;
last_bucket->count_in_bucket++;
last_bucket->upper_repeats = 1;
}
}
}
}

const auto& type_desc = ctx->get_arg_type(0);
TypeInfoPtr type_info = get_type_info(LT, type_desc->precision, type_desc->scale);
std::string bucket_json;
if (buckets.empty()) {
bucket_json = "[]";
} else {
bucket_json = "[";
if constexpr (lt_is_largeint<LT>) {
for (int i = 0; i < buckets.size(); ++i) {
bucket_json += toBucketJson(LargeIntValue::to_string(buckets[i].lower),
LargeIntValue::to_string(buckets[i].upper), buckets[i].count,
buckets[i].upper_repeats, sample_ratio) +
",";
}
} else if constexpr (lt_is_arithmetic<LT>) {
for (int i = 0; i < buckets.size(); ++i) {
bucket_json += toBucketJson(std::to_string(buckets[i].lower), std::to_string(buckets[i].upper),
buckets[i].count, buckets[i].upper_repeats, sample_ratio) +
",";
}
} else if constexpr (lt_is_date_or_datetime<LT>) {
for (int i = 0; i < buckets.size(); ++i) {
bucket_json += toBucketJson(buckets[i].lower.to_string(), buckets[i].upper.to_string(),
buckets[i].count, buckets[i].upper_repeats, sample_ratio) +
",";
}
} else if constexpr (lt_is_decimal<LT>) {
int scale = ctx->get_arg_type(0)->scale;
int precision = ctx->get_arg_type(0)->precision;
for (int i = 0; i < buckets.size(); ++i) {
bucket_json += toBucketJson(DecimalV3Cast::to_string<T>(buckets[i].lower, precision, scale),
DecimalV3Cast::to_string<T>(buckets[i].upper, precision, scale),
buckets[i].count, buckets[i].upper_repeats, sample_ratio) +
",";
}
} else if constexpr (lt_is_string<LT>) {
for (int i = 0; i < buckets.size(); ++i) {
bucket_json += toBucketJson(buckets[i].lower.to_string(), buckets[i].upper.to_string(),
buckets[i].count, buckets[i].upper_repeats, sample_ratio) +
",";
}

for (int i = 0; i < buckets.size(); ++i) {
std::string lower_str = datum_to_string(type_info.get(), buckets[i].get_lower_datum());
std::string upper_str = datum_to_string(type_info.get(), buckets[i].get_upper_datum());
bucket_json +=
toBucketJson(lower_str, upper_str, buckets[i].count, buckets[i].upper_repeats, sample_ratio) +
",";
}

bucket_json[bucket_json.size() - 1] = ']';
}

Expand Down
2 changes: 1 addition & 1 deletion be/src/exprs/lambda_function.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Status LambdaFunction::extract_outer_common_exprs(RuntimeState* state, ExprConte
if (is_independent) {
SlotId slot_id = ctx->next_slot_id++;
#ifdef DEBUG
expr_ctx->root()->for_each_slot_id([expr_ctx, new_slot_id = slot_id](SlotId slot_id) {
expr_ctx->root()->for_each_slot_id([new_slot_id = slot_id](SlotId slot_id) {
DCHECK_NE(new_slot_id, slot_id) << "slot_id " << new_slot_id << " already exists in expr_ctx";
});
#endif
Expand Down
21 changes: 9 additions & 12 deletions be/src/io/io_profiler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

#include "io_profiler.h"

#include <cstdint>
#include <memory>
#include <mutex>
#include <thread>
#include <unordered_set>
Expand Down Expand Up @@ -98,13 +100,8 @@ struct IOStatEntry {
}
};

class IOStatEntryHash {
public:
size_t operator()(const IOStatEntry& entry) const { return std::hash<uint64_t>()(entry.id); }
};

static std::mutex _io_stats_mutex;
static std::unordered_set<IOStatEntry, IOStatEntryHash> _io_stats;
static std::unordered_map<uint64_t, std::unique_ptr<IOStatEntry>> _io_stats;

bool IOProfiler::is_empty() {
return _io_stats.empty();
Expand All @@ -126,16 +123,16 @@ void IOProfiler::reset() {
thread_local IOStatEntry* current_io_stat = nullptr;

void IOProfiler::set_context(uint32_t tag, uint64_t tablet_id) {
if (tablet_id == 0) {
if (tablet_id == 0 || _context_io_mode == IOMode::IOMODE_NONE) {
return;
}
uint64_t key = ((uint64_t)tag << 48UL) | tablet_id;
std::lock_guard<std::mutex> l(_io_stats_mutex);
auto it = _io_stats.find(IOStatEntry{key});
auto it = _io_stats.find(key);
if (it == _io_stats.end()) {
it = _io_stats.emplace(key).first;
it = _io_stats.emplace(key, std::make_unique<IOStatEntry>(key)).first;
}
current_io_stat = const_cast<IOStatEntry*>(&(*it));
current_io_stat = it->second.get();
}

IOStatEntry* IOProfiler::get_context() {
Expand Down Expand Up @@ -244,9 +241,9 @@ StatusOr<std::vector<std::string>> IOProfiler::get_topn_stats(size_t n,
}
stats.reserve(_io_stats.size());
for (auto& it : _io_stats) {
auto v = func(it);
auto v = func(*it.second);
if (v > 0) {
stats.emplace_back(v, &it);
stats.emplace_back(v, it.second.get());
}
}
std::sort(stats.begin(), stats.end(), [](const auto& a, const auto& b) { return a.first > b.first; });
Expand Down
2 changes: 1 addition & 1 deletion be/src/io/io_profiler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

namespace starrocks {

class IOStatEntry;
struct IOStatEntry;

class IOProfiler {
public:
Expand Down
Loading

0 comments on commit 4befb37

Please sign in to comment.