feat: add tag_columns to series normalize plan (#223)

* feat: add tag_columns to series normalize plan

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* feat: add `manifest_version` to `GrantedRegion` (#224)

* feat: add backend option to `SetFulltext` (#226)

Signed-off-by: Zhenchi <zhongzc_arch@outlook.com>

* feat: add `extensions` field to `GrantedRegion` (#227)

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
Signed-off-by: Zhenchi <zhongzc_arch@outlook.com>
Co-authored-by: Weny Xu <wenymedia@gmail.com>
Co-authored-by: Zhenchi <zhongzc_arch@outlook.com>
This commit is contained in:
Ruihang Xia
2025-04-08 15:47:19 +08:00
committed by GitHub
parent 2be0f36b32
commit dd4a199698
5 changed files with 506 additions and 63 deletions
+59 -18
View File
@@ -56,7 +56,8 @@ struct InstantManipulateDefaultTypeInternal {
PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 InstantManipulateDefaultTypeInternal _InstantManipulate_default_instance_;
PROTOBUF_CONSTEXPR SeriesNormalize::SeriesNormalize(
::_pbi::ConstantInitialized): _impl_{
/*decltype(_impl_.time_index_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
/*decltype(_impl_.tag_columns_)*/{}
, /*decltype(_impl_.time_index_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
, /*decltype(_impl_.offset_)*/int64_t{0}
, /*decltype(_impl_.filter_nan_)*/false
, /*decltype(_impl_._cached_size_)*/{}} {}
@@ -154,6 +155,7 @@ const uint32_t TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offset
PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.offset_),
PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.time_index_),
PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.filter_nan_),
PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesNormalize, _impl_.tag_columns_),
~0u, // no _has_bits_
PROTOBUF_FIELD_OFFSET(::substrait_extension::SeriesDivide, _internal_metadata_),
~0u, // no _extensions_
@@ -190,9 +192,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode
{ 0, -1, -1, sizeof(::substrait_extension::EmptyMetric)},
{ 9, -1, -1, sizeof(::substrait_extension::InstantManipulate)},
{ 21, -1, -1, sizeof(::substrait_extension::SeriesNormalize)},
{ 30, -1, -1, sizeof(::substrait_extension::SeriesDivide)},
{ 37, -1, -1, sizeof(::substrait_extension::RangeManipulate)},
{ 49, -1, -1, sizeof(::substrait_extension::ScalarCalculate)},
{ 31, -1, -1, sizeof(::substrait_extension::SeriesDivide)},
{ 38, -1, -1, sizeof(::substrait_extension::RangeManipulate)},
{ 50, -1, -1, sizeof(::substrait_extension::ScalarCalculate)},
};
static const ::_pb::Message* const file_default_instances[] = {
@@ -211,22 +213,22 @@ const char descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2epro
"\003\"\202\001\n\021InstantManipulate\022\r\n\005start\030\001 \001(\003\022\013"
"\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\026\n\016lookbac"
"k_delta\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013fie"
"ld_index\030\006 \001(\t\"I\n\017SeriesNormalize\022\016\n\006off"
"ld_index\030\006 \001(\t\"^\n\017SeriesNormalize\022\016\n\006off"
"set\030\001 \001(\003\022\022\n\ntime_index\030\002 \001(\t\022\022\n\nfilter_"
"nan\030\003 \001(\010\"#\n\014SeriesDivide\022\023\n\013tag_columns"
"\030\001 \003(\t\"w\n\017RangeManipulate\022\r\n\005start\030\001 \001(\003"
"\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\r\n\005range"
"\030\004 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013tag_column"
"s\030\006 \003(\t\"~\n\017ScalarCalculate\022\r\n\005start\030\001 \001("
"\003\022\013\n\003end\030\002 \001(\003\022\020\n\010interval\030\003 \001(\003\022\022\n\ntime"
"_index\030\005 \001(\t\022\023\n\013tag_columns\030\006 \003(\t\022\024\n\014fie"
"ld_column\030\007 \001(\tB\?Z=github.com/GreptimeTe"
"am/greptime-proto/go/substrait_extension"
"b\006proto3"
"nan\030\003 \001(\010\022\023\n\013tag_columns\030\004 \003(\t\"#\n\014Series"
"Divide\022\023\n\013tag_columns\030\001 \003(\t\"w\n\017RangeMani"
"pulate\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010in"
"terval\030\003 \001(\003\022\r\n\005range\030\004 \001(\003\022\022\n\ntime_inde"
"x\030\005 \001(\t\022\023\n\013tag_columns\030\006 \003(\t\"~\n\017ScalarCa"
"lculate\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\022\020\n\010i"
"nterval\030\003 \001(\003\022\022\n\ntime_index\030\005 \001(\t\022\023\n\013tag"
"_columns\030\006 \003(\t\022\024\n\014field_column\030\007 \001(\tB\?Z="
"github.com/GreptimeTeam/greptime-proto/g"
"o/substrait_extensionb\006proto3"
;
static ::_pbi::once_flag descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto = {
false, false, 688, descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2eproto,
false, false, 709, descriptor_table_protodef_substrait_5fextension_2fpromql_5fplan_2eproto,
"substrait_extension/promql_plan.proto",
&descriptor_table_substrait_5fextension_2fpromql_5fplan_2eproto_once, nullptr, 0, 6,
schemas, file_default_instances, TableStruct_substrait_5fextension_2fpromql_5fplan_2eproto::offsets,
@@ -853,7 +855,8 @@ SeriesNormalize::SeriesNormalize(const SeriesNormalize& from)
: ::PROTOBUF_NAMESPACE_ID::Message() {
SeriesNormalize* const _this = this; (void)_this;
new (&_impl_) Impl_{
decltype(_impl_.time_index_){}
decltype(_impl_.tag_columns_){from._impl_.tag_columns_}
, decltype(_impl_.time_index_){}
, decltype(_impl_.offset_){}
, decltype(_impl_.filter_nan_){}
, /*decltype(_impl_._cached_size_)*/{}};
@@ -878,7 +881,8 @@ inline void SeriesNormalize::SharedCtor(
(void)arena;
(void)is_message_owned;
new (&_impl_) Impl_{
decltype(_impl_.time_index_){}
decltype(_impl_.tag_columns_){arena}
, decltype(_impl_.time_index_){}
, decltype(_impl_.offset_){int64_t{0}}
, decltype(_impl_.filter_nan_){false}
, /*decltype(_impl_._cached_size_)*/{}
@@ -900,6 +904,7 @@ SeriesNormalize::~SeriesNormalize() {
inline void SeriesNormalize::SharedDtor() {
GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
_impl_.tag_columns_.~RepeatedPtrField();
_impl_.time_index_.Destroy();
}
@@ -913,6 +918,7 @@ void SeriesNormalize::Clear() {
// Prevent compiler warnings about cached_has_bits being unused
(void) cached_has_bits;
_impl_.tag_columns_.Clear();
_impl_.time_index_.ClearToEmpty();
::memset(&_impl_.offset_, 0, static_cast<size_t>(
reinterpret_cast<char*>(&_impl_.filter_nan_) -
@@ -952,6 +958,21 @@ const char* SeriesNormalize::_InternalParse(const char* ptr, ::_pbi::ParseContex
} else
goto handle_unusual;
continue;
// repeated string tag_columns = 4;
case 4:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_tag_columns();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
CHK_(::_pbi::VerifyUTF8(str, "substrait_extension.SeriesNormalize.tag_columns"));
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
} else
goto handle_unusual;
continue;
default:
goto handle_unusual;
} // switch
@@ -1003,6 +1024,16 @@ uint8_t* SeriesNormalize::_InternalSerialize(
target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_filter_nan(), target);
}
// repeated string tag_columns = 4;
for (int i = 0, n = this->_internal_tag_columns_size(); i < n; i++) {
const auto& s = this->_internal_tag_columns(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
s.data(), static_cast<int>(s.length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"substrait_extension.SeriesNormalize.tag_columns");
target = stream->WriteString(4, s, target);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
_internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -1019,6 +1050,14 @@ size_t SeriesNormalize::ByteSizeLong() const {
// Prevent compiler warnings about cached_has_bits being unused
(void) cached_has_bits;
// repeated string tag_columns = 4;
total_size += 1 *
::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.tag_columns_.size());
for (int i = 0, n = _impl_.tag_columns_.size(); i < n; i++) {
total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
_impl_.tag_columns_.Get(i));
}
// string time_index = 2;
if (!this->_internal_time_index().empty()) {
total_size += 1 +
@@ -1054,6 +1093,7 @@ void SeriesNormalize::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const
uint32_t cached_has_bits = 0;
(void) cached_has_bits;
_this->_impl_.tag_columns_.MergeFrom(from._impl_.tag_columns_);
if (!from._internal_time_index().empty()) {
_this->_internal_set_time_index(from._internal_time_index());
}
@@ -1082,6 +1122,7 @@ void SeriesNormalize::InternalSwap(SeriesNormalize* other) {
auto* lhs_arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation();
_internal_metadata_.InternalSwap(&other->_internal_metadata_);
_impl_.tag_columns_.InternalSwap(&other->_impl_.tag_columns_);
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
&_impl_.time_index_, lhs_arena,
&other->_impl_.time_index_, rhs_arena
+101
View File
@@ -580,10 +580,35 @@ class SeriesNormalize final :
// accessors -------------------------------------------------------
enum : int {
kTagColumnsFieldNumber = 4,
kTimeIndexFieldNumber = 2,
kOffsetFieldNumber = 1,
kFilterNanFieldNumber = 3,
};
// repeated string tag_columns = 4;
int tag_columns_size() const;
private:
int _internal_tag_columns_size() const;
public:
void clear_tag_columns();
const std::string& tag_columns(int index) const;
std::string* mutable_tag_columns(int index);
void set_tag_columns(int index, const std::string& value);
void set_tag_columns(int index, std::string&& value);
void set_tag_columns(int index, const char* value);
void set_tag_columns(int index, const char* value, size_t size);
std::string* add_tag_columns();
void add_tag_columns(const std::string& value);
void add_tag_columns(std::string&& value);
void add_tag_columns(const char* value);
void add_tag_columns(const char* value, size_t size);
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& tag_columns() const;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_tag_columns();
private:
const std::string& _internal_tag_columns(int index) const;
std::string* _internal_add_tag_columns();
public:
// string time_index = 2;
void clear_time_index();
const std::string& time_index() const;
@@ -624,6 +649,7 @@ class SeriesNormalize final :
typedef void InternalArenaConstructable_;
typedef void DestructorSkippable_;
struct Impl_ {
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> tag_columns_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr time_index_;
int64_t offset_;
bool filter_nan_;
@@ -1595,6 +1621,81 @@ inline void SeriesNormalize::set_filter_nan(bool value) {
// @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.filter_nan)
}
// repeated string tag_columns = 4;
inline int SeriesNormalize::_internal_tag_columns_size() const {
return _impl_.tag_columns_.size();
}
inline int SeriesNormalize::tag_columns_size() const {
return _internal_tag_columns_size();
}
inline void SeriesNormalize::clear_tag_columns() {
_impl_.tag_columns_.Clear();
}
inline std::string* SeriesNormalize::add_tag_columns() {
std::string* _s = _internal_add_tag_columns();
// @@protoc_insertion_point(field_add_mutable:substrait_extension.SeriesNormalize.tag_columns)
return _s;
}
inline const std::string& SeriesNormalize::_internal_tag_columns(int index) const {
return _impl_.tag_columns_.Get(index);
}
inline const std::string& SeriesNormalize::tag_columns(int index) const {
// @@protoc_insertion_point(field_get:substrait_extension.SeriesNormalize.tag_columns)
return _internal_tag_columns(index);
}
inline std::string* SeriesNormalize::mutable_tag_columns(int index) {
// @@protoc_insertion_point(field_mutable:substrait_extension.SeriesNormalize.tag_columns)
return _impl_.tag_columns_.Mutable(index);
}
inline void SeriesNormalize::set_tag_columns(int index, const std::string& value) {
_impl_.tag_columns_.Mutable(index)->assign(value);
// @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::set_tag_columns(int index, std::string&& value) {
_impl_.tag_columns_.Mutable(index)->assign(std::move(value));
// @@protoc_insertion_point(field_set:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::set_tag_columns(int index, const char* value) {
GOOGLE_DCHECK(value != nullptr);
_impl_.tag_columns_.Mutable(index)->assign(value);
// @@protoc_insertion_point(field_set_char:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::set_tag_columns(int index, const char* value, size_t size) {
_impl_.tag_columns_.Mutable(index)->assign(
reinterpret_cast<const char*>(value), size);
// @@protoc_insertion_point(field_set_pointer:substrait_extension.SeriesNormalize.tag_columns)
}
inline std::string* SeriesNormalize::_internal_add_tag_columns() {
return _impl_.tag_columns_.Add();
}
inline void SeriesNormalize::add_tag_columns(const std::string& value) {
_impl_.tag_columns_.Add()->assign(value);
// @@protoc_insertion_point(field_add:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::add_tag_columns(std::string&& value) {
_impl_.tag_columns_.Add(std::move(value));
// @@protoc_insertion_point(field_add:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::add_tag_columns(const char* value) {
GOOGLE_DCHECK(value != nullptr);
_impl_.tag_columns_.Add()->assign(value);
// @@protoc_insertion_point(field_add_char:substrait_extension.SeriesNormalize.tag_columns)
}
inline void SeriesNormalize::add_tag_columns(const char* value, size_t size) {
_impl_.tag_columns_.Add()->assign(reinterpret_cast<const char*>(value), size);
// @@protoc_insertion_point(field_add_pointer:substrait_extension.SeriesNormalize.tag_columns)
}
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
SeriesNormalize::tag_columns() const {
// @@protoc_insertion_point(field_list:substrait_extension.SeriesNormalize.tag_columns)
return _impl_.tag_columns_;
}
inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
SeriesNormalize::mutable_tag_columns() {
// @@protoc_insertion_point(field_mutable_list:substrait_extension.SeriesNormalize.tag_columns)
return &_impl_.tag_columns_;
}
// -------------------------------------------------------------------
// SeriesDivide