hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] checkAndInsert/auto_increment/aggregation and fix local index bug

Browse Source
This commit is contained in:
WeiXinChan
2023-08-15 12:14:31 +00:00
committed by ob-robot
parent 2ff134f70b
commit 98fe20910b
27 changed files with 2149 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/share/table/ob_table.h
View File

@ -625,6 +625,34 @@ private:
ObString filter_string_;
};
enum ObTableAggregationType
{
INVAILD = 0,
MAX = 1,
MIN = 2,
COUNT = 3,
SUM = 4,
AVG = 5,
};
class ObTableAggregation
{
OB_UNIS_VERSION(1);
public:
ObTableAggregation()
: type_(ObTableAggregationType::INVAILD),
column_()
{}
ObTableAggregationType get_type() const { return type_; }
const common::ObString &get_column() const { return column_; }
bool is_agg_all_column() const { return column_ == "*"; };
int deep_copy(common::ObIAllocator &allocator, ObTableAggregation &dst) const;
TO_STRING_KV(K_(type), K_(column));
private:
ObTableAggregationType type_; // e.g. max
common::ObString column_; // e.g. age
};
/// A table query
/// 1. support multi range scan
/// 2. support reverse scan
@ -644,7 +672,9 @@ public:
index_name_(),
batch_size_(-1),
max_result_size_(-1),
htable_filter_()
htable_filter_(),
scan_range_columns_(),
aggregations_()
{}
~ObTableQuery() = default;
void reset();
@ -690,6 +720,8 @@ public:
void clear_scan_range() { key_ranges_.reset(); }
void set_deserialize_allocator(common::ObIAllocator *allocator) { deserialize_allocator_ = allocator; }
int deep_copy(ObIAllocator &allocator, ObTableQuery &dst) const;
const common::ObIArray<ObTableAggregation> &get_aggregations() const { return aggregations_; }
bool is_aggregate_query() const { return !aggregations_.empty(); }
TO_STRING_KV(K_(key_ranges),
K_(select_columns),
K_(filter_string),
@ -697,9 +729,11 @@ public:
K_(offset),
K_(scan_order),
K_(index_name),
K_(htable_filter),
K_(batch_size),
K_(max_result_size));
K_(max_result_size),
K_(htable_filter),
K_(scan_range_columns),
K_(aggregations));
public:
static ObString generate_filter_condition(const ObString &column, const ObString &op, const ObObj &value);
static ObString combile_filters(const ObString &filter1, const ObString &op, const ObString &filter2);
@ -716,6 +750,8 @@ private:
int32_t batch_size_;
int64_t max_result_size_;
ObHTableFilter htable_filter_;
ObSEArray<ObString, 8> scan_range_columns_;
ObSEArray<ObTableAggregation, 8> aggregations_;
};
/// result for ObTableQuery
@ -781,6 +817,7 @@ public:
int assign_property_names(const common::ObIArray<common::ObString> &other);
void reset_property_names() { properties_names_.reset(); }
int add_row(const common::ObNewRow &row);
int add_row(const common::ObIArray<ObObj> &row);
int add_all_property(const ObTableQueryResult &other);
int add_all_row(const ObTableQueryResult &other);
int64_t get_row_count() const { return row_count_; }