diff --git a/c++/greptime/v1/region/server.pb.cc b/c++/greptime/v1/region/server.pb.cc index 2d86f1a1..c7f2b47a 100644 --- a/c++/greptime/v1/region/server.pb.cc +++ b/c++/greptime/v1/region/server.pb.cc @@ -153,8 +153,7 @@ PROTOBUF_CONSTEXPR CreateRequest::CreateRequest( , /*decltype(_impl_._primary_key_cached_byte_size_)*/{0} , /*decltype(_impl_.options_)*/{::_pbi::ConstantInitialized()} , /*decltype(_impl_.engine_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_.catalog_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_.schema_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.path_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} , /*decltype(_impl_.region_id_)*/uint64_t{0u} , /*decltype(_impl_.create_if_not_exists_)*/false , /*decltype(_impl_._cached_size_)*/{}} {} @@ -195,8 +194,7 @@ PROTOBUF_CONSTEXPR OpenRequest::OpenRequest( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.options_)*/{::_pbi::ConstantInitialized()} , /*decltype(_impl_.engine_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_.catalog_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_.schema_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} + , /*decltype(_impl_.path_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} , /*decltype(_impl_.region_id_)*/uint64_t{0u} , /*decltype(_impl_._cached_size_)*/{}} {} struct OpenRequestDefaultTypeInternal { @@ -431,8 +429,7 @@ const uint32_t TableStruct_greptime_2fv1_2fregion_2fserver_2eproto::offsets[] PR PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.column_defs_), PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.primary_key_), PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.create_if_not_exists_), - PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.catalog_), - PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.schema_), + PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.path_), PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CreateRequest, _impl_.options_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::greptime::v1::region::DropRequest, _internal_metadata_), @@ -459,8 +456,7 @@ const uint32_t TableStruct_greptime_2fv1_2fregion_2fserver_2eproto::offsets[] PR ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.region_id_), PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.engine_), - PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.catalog_), - PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.schema_), + PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.path_), PROTOBUF_FIELD_OFFSET(::greptime::v1::region::OpenRequest, _impl_.options_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::greptime::v1::region::CloseRequest, _internal_metadata_), @@ -543,18 +539,18 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 63, -1, -1, sizeof(::greptime::v1::region::QueryRequest)}, { 72, 80, -1, sizeof(::greptime::v1::region::CreateRequest_OptionsEntry_DoNotUse)}, { 82, -1, -1, sizeof(::greptime::v1::region::CreateRequest)}, - { 96, -1, -1, sizeof(::greptime::v1::region::DropRequest)}, - { 103, 111, -1, sizeof(::greptime::v1::region::OpenRequest_OptionsEntry_DoNotUse)}, - { 113, -1, -1, sizeof(::greptime::v1::region::OpenRequest)}, - { 124, -1, -1, sizeof(::greptime::v1::region::CloseRequest)}, - { 131, -1, -1, sizeof(::greptime::v1::region::AlterRequest)}, - { 142, -1, -1, sizeof(::greptime::v1::region::AddColumns)}, - { 149, -1, -1, sizeof(::greptime::v1::region::DropColumns)}, - { 156, -1, -1, sizeof(::greptime::v1::region::AddColumn)}, - { 164, -1, -1, sizeof(::greptime::v1::region::DropColumn)}, - { 171, -1, -1, sizeof(::greptime::v1::region::FlushRequest)}, - { 178, -1, -1, sizeof(::greptime::v1::region::CompactRequest)}, - { 185, -1, -1, sizeof(::greptime::v1::region::RegionColumnDef)}, + { 95, -1, -1, sizeof(::greptime::v1::region::DropRequest)}, + { 102, 110, -1, sizeof(::greptime::v1::region::OpenRequest_OptionsEntry_DoNotUse)}, + { 112, -1, -1, sizeof(::greptime::v1::region::OpenRequest)}, + { 122, -1, -1, sizeof(::greptime::v1::region::CloseRequest)}, + { 129, -1, -1, sizeof(::greptime::v1::region::AlterRequest)}, + { 140, -1, -1, sizeof(::greptime::v1::region::AddColumns)}, + { 147, -1, -1, sizeof(::greptime::v1::region::DropColumns)}, + { 154, -1, -1, sizeof(::greptime::v1::region::AddColumn)}, + { 162, -1, -1, sizeof(::greptime::v1::region::DropColumn)}, + { 169, -1, -1, sizeof(::greptime::v1::region::FlushRequest)}, + { 176, -1, -1, sizeof(::greptime::v1::region::CompactRequest)}, + { 183, -1, -1, sizeof(::greptime::v1::region::RegionColumnDef)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -613,41 +609,40 @@ const char descriptor_table_protodef_greptime_2fv1_2fregion_2fserver_2eproto[] P "(\0132\021.greptime.v1.Rows\"h\n\014QueryRequest\0227\n" "\006header\030\001 \001(\0132\'.greptime.v1.region.Regio" "nRequestHeader\022\021\n\tregion_id\030\002 \001(\004\022\014\n\004pla" - "n\030\003 \001(\014\"\261\002\n\rCreateRequest\022\021\n\tregion_id\030\001" + "n\030\003 \001(\014\"\236\002\n\rCreateRequest\022\021\n\tregion_id\030\001" " \001(\004\022\016\n\006engine\030\002 \001(\t\0228\n\013column_defs\030\003 \003(" "\0132#.greptime.v1.region.RegionColumnDef\022\023" "\n\013primary_key\030\004 \003(\r\022\034\n\024create_if_not_exi" - "sts\030\005 \001(\010\022\017\n\007catalog\030\006 \001(\t\022\016\n\006schema\030\007 \001" - "(\t\022\?\n\007options\030\010 \003(\0132..greptime.v1.region" - ".CreateRequest.OptionsEntry\032.\n\014OptionsEn" - "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\" \n\013D" - "ropRequest\022\021\n\tregion_id\030\001 \001(\004\"\300\001\n\013OpenRe" - "quest\022\021\n\tregion_id\030\001 \001(\004\022\016\n\006engine\030\002 \001(\t" - "\022\017\n\007catalog\030\003 \001(\t\022\016\n\006schema\030\004 \001(\t\022=\n\007opt" - "ions\030\005 \003(\0132,.greptime.v1.region.OpenRequ" - "est.OptionsEntry\032.\n\014OptionsEntry\022\013\n\003key\030" - "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"!\n\014CloseRequest" - "\022\021\n\tregion_id\030\001 \001(\004\"\261\001\n\014AlterRequest\022\021\n\t" - "region_id\030\001 \001(\004\0225\n\013add_columns\030\002 \001(\0132\036.g" - "reptime.v1.region.AddColumnsH\000\0227\n\014drop_c" - "olumns\030\003 \001(\0132\037.greptime.v1.region.DropCo" - "lumnsH\000\022\026\n\016schema_version\030\004 \001(\004B\006\n\004kind\"" - "@\n\nAddColumns\0222\n\013add_columns\030\001 \003(\0132\035.gre" - "ptime.v1.region.AddColumn\"C\n\013DropColumns" - "\0224\n\014drop_columns\030\001 \003(\0132\036.greptime.v1.reg" - "ion.DropColumn\"v\n\tAddColumn\0227\n\ncolumn_de" - "f\030\001 \001(\0132#.greptime.v1.region.RegionColum" - "nDef\0220\n\010location\030\003 \001(\0132\036.greptime.v1.Add" - "ColumnLocation\"\032\n\nDropColumn\022\014\n\004name\030\001 \001" - "(\t\"!\n\014FlushRequest\022\021\n\tregion_id\030\001 \001(\004\"#\n" - "\016CompactRequest\022\021\n\tregion_id\030\001 \001(\004\"P\n\017Re" - "gionColumnDef\022*\n\ncolumn_def\030\001 \001(\0132\026.grep" - "time.v1.ColumnDef\022\021\n\tcolumn_id\030\002 \001(\r2Y\n\006" - "Region\022O\n\006Handle\022!.greptime.v1.region.Re" - "gionRequest\032\".greptime.v1.region.RegionR" - "esponseB]\n\025io.greptime.v1.regionB\006Server" - "Z_impl_.engine_.Set(from._internal_engine(), _this->GetArenaForAllocation()); } - _impl_.catalog_.InitDefault(); + _impl_.path_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.Set("", GetArenaForAllocation()); + _impl_.path_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_catalog().empty()) { - _this->_impl_.catalog_.Set(from._internal_catalog(), - _this->GetArenaForAllocation()); - } - _impl_.schema_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_schema().empty()) { - _this->_impl_.schema_.Set(from._internal_schema(), + if (!from._internal_path().empty()) { + _this->_impl_.path_.Set(from._internal_path(), _this->GetArenaForAllocation()); } ::memcpy(&_impl_.region_id_, &from._impl_.region_id_, @@ -3054,8 +3040,7 @@ inline void CreateRequest::SharedCtor( , /*decltype(_impl_._primary_key_cached_byte_size_)*/{0} , /*decltype(_impl_.options_)*/{::_pbi::ArenaInitialized(), arena} , decltype(_impl_.engine_){} - , decltype(_impl_.catalog_){} - , decltype(_impl_.schema_){} + , decltype(_impl_.path_){} , decltype(_impl_.region_id_){uint64_t{0u}} , decltype(_impl_.create_if_not_exists_){false} , /*decltype(_impl_._cached_size_)*/{} @@ -3064,13 +3049,9 @@ inline void CreateRequest::SharedCtor( #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.engine_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.InitDefault(); + _impl_.path_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.Set("", GetArenaForAllocation()); + _impl_.path_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } @@ -3091,8 +3072,7 @@ inline void CreateRequest::SharedDtor() { _impl_.options_.Destruct(); _impl_.options_.~MapField(); _impl_.engine_.Destroy(); - _impl_.catalog_.Destroy(); - _impl_.schema_.Destroy(); + _impl_.path_.Destroy(); } void CreateRequest::ArenaDtor(void* object) { @@ -3113,8 +3093,7 @@ void CreateRequest::Clear() { _impl_.primary_key_.Clear(); _impl_.options_.Clear(); _impl_.engine_.ClearToEmpty(); - _impl_.catalog_.ClearToEmpty(); - _impl_.schema_.ClearToEmpty(); + _impl_.path_.ClearToEmpty(); ::memset(&_impl_.region_id_, 0, static_cast( reinterpret_cast(&_impl_.create_if_not_exists_) - reinterpret_cast(&_impl_.region_id_)) + sizeof(_impl_.create_if_not_exists_)); @@ -3177,36 +3156,26 @@ const char* CreateRequest::_InternalParse(const char* ptr, ::_pbi::ParseContext* } else goto handle_unusual; continue; - // string catalog = 6; + // string path = 6; case 6: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 50)) { - auto str = _internal_mutable_catalog(); + auto str = _internal_mutable_path(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.CreateRequest.catalog")); + CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.CreateRequest.path")); } else goto handle_unusual; continue; - // string schema = 7; + // map options = 7; case 7: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 58)) { - auto str = _internal_mutable_schema(); - ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); - CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.CreateRequest.schema")); - } else - goto handle_unusual; - continue; - // map options = 8; - case 8: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 66)) { ptr -= 1; do { ptr += 1; ptr = ctx->ParseMessage(&_impl_.options_, ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<66>(ptr)); + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<58>(ptr)); } else goto handle_unusual; continue; @@ -3278,27 +3247,17 @@ uint8_t* CreateRequest::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteBoolToArray(5, this->_internal_create_if_not_exists(), target); } - // string catalog = 6; - if (!this->_internal_catalog().empty()) { + // string path = 6; + if (!this->_internal_path().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_catalog().data(), static_cast(this->_internal_catalog().length()), + this->_internal_path().data(), static_cast(this->_internal_path().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "greptime.v1.region.CreateRequest.catalog"); + "greptime.v1.region.CreateRequest.path"); target = stream->WriteStringMaybeAliased( - 6, this->_internal_catalog(), target); + 6, this->_internal_path(), target); } - // string schema = 7; - if (!this->_internal_schema().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_schema().data(), static_cast(this->_internal_schema().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "greptime.v1.region.CreateRequest.schema"); - target = stream->WriteStringMaybeAliased( - 7, this->_internal_schema(), target); - } - - // map options = 8; + // map options = 7; if (!this->_internal_options().empty()) { using MapType = ::_pb::Map; using WireHelper = CreateRequest_OptionsEntry_DoNotUse::Funcs; @@ -3317,12 +3276,12 @@ uint8_t* CreateRequest::_InternalSerialize( if (stream->IsSerializationDeterministic() && map_field.size() > 1) { for (const auto& entry : ::_pbi::MapSorterPtr(map_field)) { - target = WireHelper::InternalSerialize(8, entry.first, entry.second, target, stream); + target = WireHelper::InternalSerialize(7, entry.first, entry.second, target, stream); check_utf8(entry); } } else { for (const auto& entry : map_field) { - target = WireHelper::InternalSerialize(8, entry.first, entry.second, target, stream); + target = WireHelper::InternalSerialize(7, entry.first, entry.second, target, stream); check_utf8(entry); } } @@ -3365,7 +3324,7 @@ size_t CreateRequest::ByteSizeLong() const { total_size += data_size; } - // map options = 8; + // map options = 7; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_options_size()); for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator @@ -3381,18 +3340,11 @@ size_t CreateRequest::ByteSizeLong() const { this->_internal_engine()); } - // string catalog = 6; - if (!this->_internal_catalog().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_catalog()); - } - - // string schema = 7; - if (!this->_internal_schema().empty()) { + // string path = 6; + if (!this->_internal_path().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_schema()); + this->_internal_path()); } // uint64 region_id = 1; @@ -3429,11 +3381,8 @@ void CreateRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const :: if (!from._internal_engine().empty()) { _this->_internal_set_engine(from._internal_engine()); } - if (!from._internal_catalog().empty()) { - _this->_internal_set_catalog(from._internal_catalog()); - } - if (!from._internal_schema().empty()) { - _this->_internal_set_schema(from._internal_schema()); + if (!from._internal_path().empty()) { + _this->_internal_set_path(from._internal_path()); } if (from._internal_region_id() != 0) { _this->_internal_set_region_id(from._internal_region_id()); @@ -3468,12 +3417,8 @@ void CreateRequest::InternalSwap(CreateRequest* other) { &other->_impl_.engine_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.catalog_, lhs_arena, - &other->_impl_.catalog_, rhs_arena - ); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.schema_, lhs_arena, - &other->_impl_.schema_, rhs_arena + &_impl_.path_, lhs_arena, + &other->_impl_.path_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< PROTOBUF_FIELD_OFFSET(CreateRequest, _impl_.create_if_not_exists_) @@ -3702,8 +3647,7 @@ OpenRequest::OpenRequest(const OpenRequest& from) new (&_impl_) Impl_{ /*decltype(_impl_.options_)*/{} , decltype(_impl_.engine_){} - , decltype(_impl_.catalog_){} - , decltype(_impl_.schema_){} + , decltype(_impl_.path_){} , decltype(_impl_.region_id_){} , /*decltype(_impl_._cached_size_)*/{}}; @@ -3717,20 +3661,12 @@ OpenRequest::OpenRequest(const OpenRequest& from) _this->_impl_.engine_.Set(from._internal_engine(), _this->GetArenaForAllocation()); } - _impl_.catalog_.InitDefault(); + _impl_.path_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.Set("", GetArenaForAllocation()); + _impl_.path_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_catalog().empty()) { - _this->_impl_.catalog_.Set(from._internal_catalog(), - _this->GetArenaForAllocation()); - } - _impl_.schema_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_schema().empty()) { - _this->_impl_.schema_.Set(from._internal_schema(), + if (!from._internal_path().empty()) { + _this->_impl_.path_.Set(from._internal_path(), _this->GetArenaForAllocation()); } _this->_impl_.region_id_ = from._impl_.region_id_; @@ -3744,8 +3680,7 @@ inline void OpenRequest::SharedCtor( new (&_impl_) Impl_{ /*decltype(_impl_.options_)*/{::_pbi::ArenaInitialized(), arena} , decltype(_impl_.engine_){} - , decltype(_impl_.catalog_){} - , decltype(_impl_.schema_){} + , decltype(_impl_.path_){} , decltype(_impl_.region_id_){uint64_t{0u}} , /*decltype(_impl_._cached_size_)*/{} }; @@ -3753,13 +3688,9 @@ inline void OpenRequest::SharedCtor( #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.engine_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.InitDefault(); + _impl_.path_.InitDefault(); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.catalog_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.schema_.Set("", GetArenaForAllocation()); + _impl_.path_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } @@ -3778,8 +3709,7 @@ inline void OpenRequest::SharedDtor() { _impl_.options_.Destruct(); _impl_.options_.~MapField(); _impl_.engine_.Destroy(); - _impl_.catalog_.Destroy(); - _impl_.schema_.Destroy(); + _impl_.path_.Destroy(); } void OpenRequest::ArenaDtor(void* object) { @@ -3798,8 +3728,7 @@ void OpenRequest::Clear() { _impl_.options_.Clear(); _impl_.engine_.ClearToEmpty(); - _impl_.catalog_.ClearToEmpty(); - _impl_.schema_.ClearToEmpty(); + _impl_.path_.ClearToEmpty(); _impl_.region_id_ = uint64_t{0u}; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -3828,36 +3757,26 @@ const char* OpenRequest::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; - // string catalog = 3; + // string path = 3; case 3: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 26)) { - auto str = _internal_mutable_catalog(); + auto str = _internal_mutable_path(); ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.OpenRequest.catalog")); + CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.OpenRequest.path")); } else goto handle_unusual; continue; - // string schema = 4; + // map options = 4; case 4: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { - auto str = _internal_mutable_schema(); - ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); - CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "greptime.v1.region.OpenRequest.schema")); - } else - goto handle_unusual; - continue; - // map options = 5; - case 5: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 42)) { ptr -= 1; do { ptr += 1; ptr = ctx->ParseMessage(&_impl_.options_, ptr); CHK_(ptr); if (!ctx->DataAvailable(ptr)) break; - } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr)); + } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr)); } else goto handle_unusual; continue; @@ -3906,27 +3825,17 @@ uint8_t* OpenRequest::_InternalSerialize( 2, this->_internal_engine(), target); } - // string catalog = 3; - if (!this->_internal_catalog().empty()) { + // string path = 3; + if (!this->_internal_path().empty()) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_catalog().data(), static_cast(this->_internal_catalog().length()), + this->_internal_path().data(), static_cast(this->_internal_path().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "greptime.v1.region.OpenRequest.catalog"); + "greptime.v1.region.OpenRequest.path"); target = stream->WriteStringMaybeAliased( - 3, this->_internal_catalog(), target); + 3, this->_internal_path(), target); } - // string schema = 4; - if (!this->_internal_schema().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_schema().data(), static_cast(this->_internal_schema().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "greptime.v1.region.OpenRequest.schema"); - target = stream->WriteStringMaybeAliased( - 4, this->_internal_schema(), target); - } - - // map options = 5; + // map options = 4; if (!this->_internal_options().empty()) { using MapType = ::_pb::Map; using WireHelper = OpenRequest_OptionsEntry_DoNotUse::Funcs; @@ -3945,12 +3854,12 @@ uint8_t* OpenRequest::_InternalSerialize( if (stream->IsSerializationDeterministic() && map_field.size() > 1) { for (const auto& entry : ::_pbi::MapSorterPtr(map_field)) { - target = WireHelper::InternalSerialize(5, entry.first, entry.second, target, stream); + target = WireHelper::InternalSerialize(4, entry.first, entry.second, target, stream); check_utf8(entry); } } else { for (const auto& entry : map_field) { - target = WireHelper::InternalSerialize(5, entry.first, entry.second, target, stream); + target = WireHelper::InternalSerialize(4, entry.first, entry.second, target, stream); check_utf8(entry); } } @@ -3972,7 +3881,7 @@ size_t OpenRequest::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // map options = 5; + // map options = 4; total_size += 1 * ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_options_size()); for (::PROTOBUF_NAMESPACE_ID::Map< std::string, std::string >::const_iterator @@ -3988,18 +3897,11 @@ size_t OpenRequest::ByteSizeLong() const { this->_internal_engine()); } - // string catalog = 3; - if (!this->_internal_catalog().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_catalog()); - } - - // string schema = 4; - if (!this->_internal_schema().empty()) { + // string path = 3; + if (!this->_internal_path().empty()) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_schema()); + this->_internal_path()); } // uint64 region_id = 1; @@ -4029,11 +3931,8 @@ void OpenRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR if (!from._internal_engine().empty()) { _this->_internal_set_engine(from._internal_engine()); } - if (!from._internal_catalog().empty()) { - _this->_internal_set_catalog(from._internal_catalog()); - } - if (!from._internal_schema().empty()) { - _this->_internal_set_schema(from._internal_schema()); + if (!from._internal_path().empty()) { + _this->_internal_set_path(from._internal_path()); } if (from._internal_region_id() != 0) { _this->_internal_set_region_id(from._internal_region_id()); @@ -4063,12 +3962,8 @@ void OpenRequest::InternalSwap(OpenRequest* other) { &other->_impl_.engine_, rhs_arena ); ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.catalog_, lhs_arena, - &other->_impl_.catalog_, rhs_arena - ); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.schema_, lhs_arena, - &other->_impl_.schema_, rhs_arena + &_impl_.path_, lhs_arena, + &other->_impl_.path_, rhs_arena ); swap(_impl_.region_id_, other->_impl_.region_id_); } diff --git a/c++/greptime/v1/region/server.pb.h b/c++/greptime/v1/region/server.pb.h index 8652fcb8..394bc965 100644 --- a/c++/greptime/v1/region/server.pb.h +++ b/c++/greptime/v1/region/server.pb.h @@ -1837,10 +1837,9 @@ class CreateRequest final : enum : int { kColumnDefsFieldNumber = 3, kPrimaryKeyFieldNumber = 4, - kOptionsFieldNumber = 8, + kOptionsFieldNumber = 7, kEngineFieldNumber = 2, - kCatalogFieldNumber = 6, - kSchemaFieldNumber = 7, + kPathFieldNumber = 6, kRegionIdFieldNumber = 1, kCreateIfNotExistsFieldNumber = 5, }; @@ -1884,7 +1883,7 @@ class CreateRequest final : ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >* mutable_primary_key(); - // map options = 8; + // map options = 7; int options_size() const; private: int _internal_options_size() const; @@ -1915,32 +1914,18 @@ class CreateRequest final : std::string* _internal_mutable_engine(); public: - // string catalog = 6; - void clear_catalog(); - const std::string& catalog() const; + // string path = 6; + void clear_path(); + const std::string& path() const; template - void set_catalog(ArgT0&& arg0, ArgT... args); - std::string* mutable_catalog(); - PROTOBUF_NODISCARD std::string* release_catalog(); - void set_allocated_catalog(std::string* catalog); - private: - const std::string& _internal_catalog() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_catalog(const std::string& value); - std::string* _internal_mutable_catalog(); - public: - - // string schema = 7; - void clear_schema(); - const std::string& schema() const; - template - void set_schema(ArgT0&& arg0, ArgT... args); - std::string* mutable_schema(); - PROTOBUF_NODISCARD std::string* release_schema(); - void set_allocated_schema(std::string* schema); - private: - const std::string& _internal_schema() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_schema(const std::string& value); - std::string* _internal_mutable_schema(); + void set_path(ArgT0&& arg0, ArgT... args); + std::string* mutable_path(); + PROTOBUF_NODISCARD std::string* release_path(); + void set_allocated_path(std::string* path); + private: + const std::string& _internal_path() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(const std::string& value); + std::string* _internal_mutable_path(); public: // uint64 region_id = 1; @@ -1978,8 +1963,7 @@ class CreateRequest final : ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING> options_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr engine_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr catalog_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr schema_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr path_; uint64_t region_id_; bool create_if_not_exists_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; @@ -2289,13 +2273,12 @@ class OpenRequest final : // accessors ------------------------------------------------------- enum : int { - kOptionsFieldNumber = 5, + kOptionsFieldNumber = 4, kEngineFieldNumber = 2, - kCatalogFieldNumber = 3, - kSchemaFieldNumber = 4, + kPathFieldNumber = 3, kRegionIdFieldNumber = 1, }; - // map options = 5; + // map options = 4; int options_size() const; private: int _internal_options_size() const; @@ -2326,32 +2309,18 @@ class OpenRequest final : std::string* _internal_mutable_engine(); public: - // string catalog = 3; - void clear_catalog(); - const std::string& catalog() const; + // string path = 3; + void clear_path(); + const std::string& path() const; template - void set_catalog(ArgT0&& arg0, ArgT... args); - std::string* mutable_catalog(); - PROTOBUF_NODISCARD std::string* release_catalog(); - void set_allocated_catalog(std::string* catalog); - private: - const std::string& _internal_catalog() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_catalog(const std::string& value); - std::string* _internal_mutable_catalog(); - public: - - // string schema = 4; - void clear_schema(); - const std::string& schema() const; - template - void set_schema(ArgT0&& arg0, ArgT... args); - std::string* mutable_schema(); - PROTOBUF_NODISCARD std::string* release_schema(); - void set_allocated_schema(std::string* schema); - private: - const std::string& _internal_schema() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_schema(const std::string& value); - std::string* _internal_mutable_schema(); + void set_path(ArgT0&& arg0, ArgT... args); + std::string* mutable_path(); + PROTOBUF_NODISCARD std::string* release_path(); + void set_allocated_path(std::string* path); + private: + const std::string& _internal_path() const; + inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(const std::string& value); + std::string* _internal_mutable_path(); public: // uint64 region_id = 1; @@ -2377,8 +2346,7 @@ class OpenRequest final : ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING> options_; ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr engine_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr catalog_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr schema_; + ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr path_; uint64_t region_id_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; @@ -5441,107 +5409,57 @@ inline void CreateRequest::set_create_if_not_exists(bool value) { // @@protoc_insertion_point(field_set:greptime.v1.region.CreateRequest.create_if_not_exists) } -// string catalog = 6; -inline void CreateRequest::clear_catalog() { - _impl_.catalog_.ClearToEmpty(); -} -inline const std::string& CreateRequest::catalog() const { - // @@protoc_insertion_point(field_get:greptime.v1.region.CreateRequest.catalog) - return _internal_catalog(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void CreateRequest::set_catalog(ArgT0&& arg0, ArgT... args) { - - _impl_.catalog_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:greptime.v1.region.CreateRequest.catalog) -} -inline std::string* CreateRequest::mutable_catalog() { - std::string* _s = _internal_mutable_catalog(); - // @@protoc_insertion_point(field_mutable:greptime.v1.region.CreateRequest.catalog) - return _s; -} -inline const std::string& CreateRequest::_internal_catalog() const { - return _impl_.catalog_.Get(); -} -inline void CreateRequest::_internal_set_catalog(const std::string& value) { - - _impl_.catalog_.Set(value, GetArenaForAllocation()); -} -inline std::string* CreateRequest::_internal_mutable_catalog() { - - return _impl_.catalog_.Mutable(GetArenaForAllocation()); -} -inline std::string* CreateRequest::release_catalog() { - // @@protoc_insertion_point(field_release:greptime.v1.region.CreateRequest.catalog) - return _impl_.catalog_.Release(); -} -inline void CreateRequest::set_allocated_catalog(std::string* catalog) { - if (catalog != nullptr) { - - } else { - - } - _impl_.catalog_.SetAllocated(catalog, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.catalog_.IsDefault()) { - _impl_.catalog_.Set("", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.CreateRequest.catalog) -} - -// string schema = 7; -inline void CreateRequest::clear_schema() { - _impl_.schema_.ClearToEmpty(); +// string path = 6; +inline void CreateRequest::clear_path() { + _impl_.path_.ClearToEmpty(); } -inline const std::string& CreateRequest::schema() const { - // @@protoc_insertion_point(field_get:greptime.v1.region.CreateRequest.schema) - return _internal_schema(); +inline const std::string& CreateRequest::path() const { + // @@protoc_insertion_point(field_get:greptime.v1.region.CreateRequest.path) + return _internal_path(); } template inline PROTOBUF_ALWAYS_INLINE -void CreateRequest::set_schema(ArgT0&& arg0, ArgT... args) { +void CreateRequest::set_path(ArgT0&& arg0, ArgT... args) { - _impl_.schema_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:greptime.v1.region.CreateRequest.schema) + _impl_.path_.Set(static_cast(arg0), args..., GetArenaForAllocation()); + // @@protoc_insertion_point(field_set:greptime.v1.region.CreateRequest.path) } -inline std::string* CreateRequest::mutable_schema() { - std::string* _s = _internal_mutable_schema(); - // @@protoc_insertion_point(field_mutable:greptime.v1.region.CreateRequest.schema) +inline std::string* CreateRequest::mutable_path() { + std::string* _s = _internal_mutable_path(); + // @@protoc_insertion_point(field_mutable:greptime.v1.region.CreateRequest.path) return _s; } -inline const std::string& CreateRequest::_internal_schema() const { - return _impl_.schema_.Get(); +inline const std::string& CreateRequest::_internal_path() const { + return _impl_.path_.Get(); } -inline void CreateRequest::_internal_set_schema(const std::string& value) { +inline void CreateRequest::_internal_set_path(const std::string& value) { - _impl_.schema_.Set(value, GetArenaForAllocation()); + _impl_.path_.Set(value, GetArenaForAllocation()); } -inline std::string* CreateRequest::_internal_mutable_schema() { +inline std::string* CreateRequest::_internal_mutable_path() { - return _impl_.schema_.Mutable(GetArenaForAllocation()); + return _impl_.path_.Mutable(GetArenaForAllocation()); } -inline std::string* CreateRequest::release_schema() { - // @@protoc_insertion_point(field_release:greptime.v1.region.CreateRequest.schema) - return _impl_.schema_.Release(); +inline std::string* CreateRequest::release_path() { + // @@protoc_insertion_point(field_release:greptime.v1.region.CreateRequest.path) + return _impl_.path_.Release(); } -inline void CreateRequest::set_allocated_schema(std::string* schema) { - if (schema != nullptr) { +inline void CreateRequest::set_allocated_path(std::string* path) { + if (path != nullptr) { } else { } - _impl_.schema_.SetAllocated(schema, GetArenaForAllocation()); + _impl_.path_.SetAllocated(path, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.schema_.IsDefault()) { - _impl_.schema_.Set("", GetArenaForAllocation()); + if (_impl_.path_.IsDefault()) { + _impl_.path_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.CreateRequest.schema) + // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.CreateRequest.path) } -// map options = 8; +// map options = 7; inline int CreateRequest::_internal_options_size() const { return _impl_.options_.size(); } @@ -5670,107 +5588,57 @@ inline void OpenRequest::set_allocated_engine(std::string* engine) { // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.OpenRequest.engine) } -// string catalog = 3; -inline void OpenRequest::clear_catalog() { - _impl_.catalog_.ClearToEmpty(); -} -inline const std::string& OpenRequest::catalog() const { - // @@protoc_insertion_point(field_get:greptime.v1.region.OpenRequest.catalog) - return _internal_catalog(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void OpenRequest::set_catalog(ArgT0&& arg0, ArgT... args) { - - _impl_.catalog_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:greptime.v1.region.OpenRequest.catalog) -} -inline std::string* OpenRequest::mutable_catalog() { - std::string* _s = _internal_mutable_catalog(); - // @@protoc_insertion_point(field_mutable:greptime.v1.region.OpenRequest.catalog) - return _s; -} -inline const std::string& OpenRequest::_internal_catalog() const { - return _impl_.catalog_.Get(); -} -inline void OpenRequest::_internal_set_catalog(const std::string& value) { - - _impl_.catalog_.Set(value, GetArenaForAllocation()); -} -inline std::string* OpenRequest::_internal_mutable_catalog() { - - return _impl_.catalog_.Mutable(GetArenaForAllocation()); -} -inline std::string* OpenRequest::release_catalog() { - // @@protoc_insertion_point(field_release:greptime.v1.region.OpenRequest.catalog) - return _impl_.catalog_.Release(); -} -inline void OpenRequest::set_allocated_catalog(std::string* catalog) { - if (catalog != nullptr) { - - } else { - - } - _impl_.catalog_.SetAllocated(catalog, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.catalog_.IsDefault()) { - _impl_.catalog_.Set("", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.OpenRequest.catalog) -} - -// string schema = 4; -inline void OpenRequest::clear_schema() { - _impl_.schema_.ClearToEmpty(); +// string path = 3; +inline void OpenRequest::clear_path() { + _impl_.path_.ClearToEmpty(); } -inline const std::string& OpenRequest::schema() const { - // @@protoc_insertion_point(field_get:greptime.v1.region.OpenRequest.schema) - return _internal_schema(); +inline const std::string& OpenRequest::path() const { + // @@protoc_insertion_point(field_get:greptime.v1.region.OpenRequest.path) + return _internal_path(); } template inline PROTOBUF_ALWAYS_INLINE -void OpenRequest::set_schema(ArgT0&& arg0, ArgT... args) { +void OpenRequest::set_path(ArgT0&& arg0, ArgT... args) { - _impl_.schema_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:greptime.v1.region.OpenRequest.schema) + _impl_.path_.Set(static_cast(arg0), args..., GetArenaForAllocation()); + // @@protoc_insertion_point(field_set:greptime.v1.region.OpenRequest.path) } -inline std::string* OpenRequest::mutable_schema() { - std::string* _s = _internal_mutable_schema(); - // @@protoc_insertion_point(field_mutable:greptime.v1.region.OpenRequest.schema) +inline std::string* OpenRequest::mutable_path() { + std::string* _s = _internal_mutable_path(); + // @@protoc_insertion_point(field_mutable:greptime.v1.region.OpenRequest.path) return _s; } -inline const std::string& OpenRequest::_internal_schema() const { - return _impl_.schema_.Get(); +inline const std::string& OpenRequest::_internal_path() const { + return _impl_.path_.Get(); } -inline void OpenRequest::_internal_set_schema(const std::string& value) { +inline void OpenRequest::_internal_set_path(const std::string& value) { - _impl_.schema_.Set(value, GetArenaForAllocation()); + _impl_.path_.Set(value, GetArenaForAllocation()); } -inline std::string* OpenRequest::_internal_mutable_schema() { +inline std::string* OpenRequest::_internal_mutable_path() { - return _impl_.schema_.Mutable(GetArenaForAllocation()); + return _impl_.path_.Mutable(GetArenaForAllocation()); } -inline std::string* OpenRequest::release_schema() { - // @@protoc_insertion_point(field_release:greptime.v1.region.OpenRequest.schema) - return _impl_.schema_.Release(); +inline std::string* OpenRequest::release_path() { + // @@protoc_insertion_point(field_release:greptime.v1.region.OpenRequest.path) + return _impl_.path_.Release(); } -inline void OpenRequest::set_allocated_schema(std::string* schema) { - if (schema != nullptr) { +inline void OpenRequest::set_allocated_path(std::string* path) { + if (path != nullptr) { } else { } - _impl_.schema_.SetAllocated(schema, GetArenaForAllocation()); + _impl_.path_.SetAllocated(path, GetArenaForAllocation()); #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.schema_.IsDefault()) { - _impl_.schema_.Set("", GetArenaForAllocation()); + if (_impl_.path_.IsDefault()) { + _impl_.path_.Set("", GetArenaForAllocation()); } #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.OpenRequest.schema) + // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.OpenRequest.path) } -// map options = 5; +// map options = 4; inline int OpenRequest::_internal_options_size() const { return _impl_.options_.size(); } diff --git a/java/src/main/java/io/greptime/v1/region/Server.java b/java/src/main/java/io/greptime/v1/region/Server.java index b9267f96..244fe142 100644 --- a/java/src/main/java/io/greptime/v1/region/Server.java +++ b/java/src/main/java/io/greptime/v1/region/Server.java @@ -7955,52 +7955,30 @@ io.greptime.v1.region.Server.RegionColumnDefOrBuilder getColumnDefsOrBuilder( /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 6; - * @return The catalog. + * string path = 6; + * @return The path. */ - java.lang.String getCatalog(); + java.lang.String getPath(); /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 6; - * @return The bytes for catalog. + * string path = 6; + * @return The bytes for path. */ com.google.protobuf.ByteString - getCatalogBytes(); - - /** - *
-     * schema name
-     * 
- * - * string schema = 7; - * @return The schema. - */ - java.lang.String getSchema(); - /** - *
-     * schema name
-     * 
- * - * string schema = 7; - * @return The bytes for schema. - */ - com.google.protobuf.ByteString - getSchemaBytes(); + getPathBytes(); /** *
      * Options of the created region.
      * 
* - * map<string, string> options = 8; + * map<string, string> options = 7; */ int getOptionsCount(); /** @@ -8008,7 +7986,7 @@ io.greptime.v1.region.Server.RegionColumnDefOrBuilder getColumnDefsOrBuilder( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ boolean containsOptions( java.lang.String key); @@ -8023,7 +8001,7 @@ boolean containsOptions( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ java.util.Map getOptionsMap(); @@ -8032,7 +8010,7 @@ boolean containsOptions( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ /* nullable */ @@ -8045,7 +8023,7 @@ java.lang.String getOptionsOrDefault( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ java.lang.String getOptionsOrThrow( @@ -8067,8 +8045,7 @@ private CreateRequest() { engine_ = ""; columnDefs_ = java.util.Collections.emptyList(); primaryKey_ = emptyIntList(); - catalog_ = ""; - schema_ = ""; + path_ = ""; } @java.lang.Override @@ -8151,16 +8128,10 @@ private CreateRequest( case 50: { java.lang.String s = input.readStringRequireUtf8(); - catalog_ = s; + path_ = s; break; } case 58: { - java.lang.String s = input.readStringRequireUtf8(); - - schema_ = s; - break; - } - case 66: { if (!((mutable_bitField0_ & 0x00000004) != 0)) { options_ = com.google.protobuf.MapField.newMapField( OptionsDefaultEntryHolder.defaultEntry); @@ -8210,7 +8181,7 @@ private CreateRequest( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 8: + case 7: return internalGetOptions(); default: throw new RuntimeException( @@ -8397,101 +8368,53 @@ public boolean getCreateIfNotExists() { return createIfNotExists_; } - public static final int CATALOG_FIELD_NUMBER = 6; - private volatile java.lang.Object catalog_; + public static final int PATH_FIELD_NUMBER = 6; + private volatile java.lang.Object path_; /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 6; - * @return The catalog. + * string path = 6; + * @return The path. */ @java.lang.Override - public java.lang.String getCatalog() { - java.lang.Object ref = catalog_; + public java.lang.String getPath() { + java.lang.Object ref = path_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - catalog_ = s; + path_ = s; return s; } } /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 6; - * @return The bytes for catalog. + * string path = 6; + * @return The bytes for path. */ @java.lang.Override public com.google.protobuf.ByteString - getCatalogBytes() { - java.lang.Object ref = catalog_; + getPathBytes() { + java.lang.Object ref = path_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - catalog_ = b; + path_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int SCHEMA_FIELD_NUMBER = 7; - private volatile java.lang.Object schema_; - /** - *
-     * schema name
-     * 
- * - * string schema = 7; - * @return The schema. - */ - @java.lang.Override - public java.lang.String getSchema() { - java.lang.Object ref = schema_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - schema_ = s; - return s; - } - } - /** - *
-     * schema name
-     * 
- * - * string schema = 7; - * @return The bytes for schema. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getSchemaBytes() { - java.lang.Object ref = schema_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - schema_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int OPTIONS_FIELD_NUMBER = 8; + public static final int OPTIONS_FIELD_NUMBER = 7; private static final class OptionsDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.String, java.lang.String> defaultEntry = @@ -8522,7 +8445,7 @@ public int getOptionsCount() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -8544,7 +8467,7 @@ public java.util.Map getOptions() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -8556,7 +8479,7 @@ public java.util.Map getOptionsMap() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -8573,7 +8496,7 @@ public java.lang.String getOptionsOrDefault( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -8622,18 +8545,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (createIfNotExists_ != false) { output.writeBool(5, createIfNotExists_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalog_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, catalog_); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schema_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, schema_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, path_); } com.google.protobuf.GeneratedMessageV3 .serializeStringMapTo( output, internalGetOptions(), OptionsDefaultEntryHolder.defaultEntry, - 8); + 7); unknownFields.writeTo(output); } @@ -8672,11 +8592,8 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(5, createIfNotExists_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalog_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, catalog_); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schema_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, schema_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, path_); } for (java.util.Map.Entry entry : internalGetOptions().getMap().entrySet()) { @@ -8686,7 +8603,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, options__); + .computeMessageSize(7, options__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -8713,10 +8630,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getPrimaryKeyList())) return false; if (getCreateIfNotExists() != other.getCreateIfNotExists()) return false; - if (!getCatalog() - .equals(other.getCatalog())) return false; - if (!getSchema() - .equals(other.getSchema())) return false; + if (!getPath() + .equals(other.getPath())) return false; if (!internalGetOptions().equals( other.internalGetOptions())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -8746,10 +8661,8 @@ public int hashCode() { hash = (37 * hash) + CREATE_IF_NOT_EXISTS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getCreateIfNotExists()); - hash = (37 * hash) + CATALOG_FIELD_NUMBER; - hash = (53 * hash) + getCatalog().hashCode(); - hash = (37 * hash) + SCHEMA_FIELD_NUMBER; - hash = (53 * hash) + getSchema().hashCode(); + hash = (37 * hash) + PATH_FIELD_NUMBER; + hash = (53 * hash) + getPath().hashCode(); if (!internalGetOptions().getMap().isEmpty()) { hash = (37 * hash) + OPTIONS_FIELD_NUMBER; hash = (53 * hash) + internalGetOptions().hashCode(); @@ -8865,7 +8778,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 8: + case 7: return internalGetOptions(); default: throw new RuntimeException( @@ -8876,7 +8789,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 8: + case 7: return internalGetMutableOptions(); default: throw new RuntimeException( @@ -8924,9 +8837,7 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000002); createIfNotExists_ = false; - catalog_ = ""; - - schema_ = ""; + path_ = ""; internalGetMutableOptions().clear(); return this; @@ -8973,8 +8884,7 @@ public io.greptime.v1.region.Server.CreateRequest buildPartial() { } result.primaryKey_ = primaryKey_; result.createIfNotExists_ = createIfNotExists_; - result.catalog_ = catalog_; - result.schema_ = schema_; + result.path_ = path_; result.options_ = internalGetOptions(); result.options_.makeImmutable(); onBuilt(); @@ -9071,12 +8981,8 @@ public Builder mergeFrom(io.greptime.v1.region.Server.CreateRequest other) { if (other.getCreateIfNotExists() != false) { setCreateIfNotExists(other.getCreateIfNotExists()); } - if (!other.getCatalog().isEmpty()) { - catalog_ = other.catalog_; - onChanged(); - } - if (!other.getSchema().isEmpty()) { - schema_ = other.schema_; + if (!other.getPath().isEmpty()) { + path_ = other.path_; onChanged(); } internalGetMutableOptions().mergeFrom( @@ -9700,123 +9606,22 @@ public Builder clearCreateIfNotExists() { return this; } - private java.lang.Object catalog_ = ""; - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 6; - * @return The catalog. - */ - public java.lang.String getCatalog() { - java.lang.Object ref = catalog_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - catalog_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 6; - * @return The bytes for catalog. - */ - public com.google.protobuf.ByteString - getCatalogBytes() { - java.lang.Object ref = catalog_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - catalog_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 6; - * @param value The catalog to set. - * @return This builder for chaining. - */ - public Builder setCatalog( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - catalog_ = value; - onChanged(); - return this; - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 6; - * @return This builder for chaining. - */ - public Builder clearCatalog() { - - catalog_ = getDefaultInstance().getCatalog(); - onChanged(); - return this; - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 6; - * @param value The bytes for catalog to set. - * @return This builder for chaining. - */ - public Builder setCatalogBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - catalog_ = value; - onChanged(); - return this; - } - - private java.lang.Object schema_ = ""; + private java.lang.Object path_ = ""; /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 7; - * @return The schema. + * string path = 6; + * @return The path. */ - public java.lang.String getSchema() { - java.lang.Object ref = schema_; + public java.lang.String getPath() { + java.lang.Object ref = path_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - schema_ = s; + path_ = s; return s; } else { return (java.lang.String) ref; @@ -9824,20 +9629,20 @@ public java.lang.String getSchema() { } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 7; - * @return The bytes for schema. + * string path = 6; + * @return The bytes for path. */ public com.google.protobuf.ByteString - getSchemaBytes() { - java.lang.Object ref = schema_; + getPathBytes() { + java.lang.Object ref = path_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - schema_ = b; + path_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -9845,54 +9650,54 @@ public java.lang.String getSchema() { } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 7; - * @param value The schema to set. + * string path = 6; + * @param value The path to set. * @return This builder for chaining. */ - public Builder setSchema( + public Builder setPath( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - schema_ = value; + path_ = value; onChanged(); return this; } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 7; + * string path = 6; * @return This builder for chaining. */ - public Builder clearSchema() { + public Builder clearPath() { - schema_ = getDefaultInstance().getSchema(); + path_ = getDefaultInstance().getPath(); onChanged(); return this; } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 7; - * @param value The bytes for schema to set. + * string path = 6; + * @param value The bytes for path to set. * @return This builder for chaining. */ - public Builder setSchemaBytes( + public Builder setPathBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - schema_ = value; + path_ = value; onChanged(); return this; } @@ -9928,7 +9733,7 @@ public int getOptionsCount() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -9950,7 +9755,7 @@ public java.util.Map getOptions() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -9962,7 +9767,7 @@ public java.util.Map getOptionsMap() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -9979,7 +9784,7 @@ public java.lang.String getOptionsOrDefault( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ @java.lang.Override @@ -10004,7 +9809,7 @@ public Builder clearOptions() { * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ public Builder removeOptions( @@ -10027,7 +9832,7 @@ public Builder removeOptions( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ public Builder putOptions( java.lang.String key, @@ -10046,7 +9851,7 @@ public Builder putOptions( * Options of the created region. * * - * map<string, string> options = 8; + * map<string, string> options = 7; */ public Builder putAllOptions( @@ -10631,52 +10436,30 @@ public interface OpenRequestOrBuilder extends /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 3; - * @return The catalog. + * string path = 3; + * @return The path. */ - java.lang.String getCatalog(); + java.lang.String getPath(); /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 3; - * @return The bytes for catalog. + * string path = 3; + * @return The bytes for path. */ com.google.protobuf.ByteString - getCatalogBytes(); - - /** - *
-     * schema name
-     * 
- * - * string schema = 4; - * @return The schema. - */ - java.lang.String getSchema(); - /** - *
-     * schema name
-     * 
- * - * string schema = 4; - * @return The bytes for schema. - */ - com.google.protobuf.ByteString - getSchemaBytes(); + getPathBytes(); /** *
      * Options of the opened region.
      * 
* - * map<string, string> options = 5; + * map<string, string> options = 4; */ int getOptionsCount(); /** @@ -10684,7 +10467,7 @@ public interface OpenRequestOrBuilder extends * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ boolean containsOptions( java.lang.String key); @@ -10699,7 +10482,7 @@ boolean containsOptions( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ java.util.Map getOptionsMap(); @@ -10708,7 +10491,7 @@ boolean containsOptions( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ /* nullable */ @@ -10721,7 +10504,7 @@ java.lang.String getOptionsOrDefault( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ java.lang.String getOptionsOrThrow( @@ -10741,8 +10524,7 @@ private OpenRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private OpenRequest() { engine_ = ""; - catalog_ = ""; - schema_ = ""; + path_ = ""; } @java.lang.Override @@ -10790,16 +10572,10 @@ private OpenRequest( case 26: { java.lang.String s = input.readStringRequireUtf8(); - catalog_ = s; + path_ = s; break; } case 34: { - java.lang.String s = input.readStringRequireUtf8(); - - schema_ = s; - break; - } - case 42: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { options_ = com.google.protobuf.MapField.newMapField( OptionsDefaultEntryHolder.defaultEntry); @@ -10843,7 +10619,7 @@ private OpenRequest( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 5: + case 4: return internalGetOptions(); default: throw new RuntimeException( @@ -10915,101 +10691,53 @@ public java.lang.String getEngine() { } } - public static final int CATALOG_FIELD_NUMBER = 3; - private volatile java.lang.Object catalog_; + public static final int PATH_FIELD_NUMBER = 3; + private volatile java.lang.Object path_; /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 3; - * @return The catalog. + * string path = 3; + * @return The path. */ @java.lang.Override - public java.lang.String getCatalog() { - java.lang.Object ref = catalog_; + public java.lang.String getPath() { + java.lang.Object ref = path_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - catalog_ = s; + path_ = s; return s; } } /** *
-     * catalog name and schema name is to accomplish storage path
-     * catalog name
+     * Region storage path
      * 
* - * string catalog = 3; - * @return The bytes for catalog. + * string path = 3; + * @return The bytes for path. */ @java.lang.Override public com.google.protobuf.ByteString - getCatalogBytes() { - java.lang.Object ref = catalog_; + getPathBytes() { + java.lang.Object ref = path_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - catalog_ = b; + path_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int SCHEMA_FIELD_NUMBER = 4; - private volatile java.lang.Object schema_; - /** - *
-     * schema name
-     * 
- * - * string schema = 4; - * @return The schema. - */ - @java.lang.Override - public java.lang.String getSchema() { - java.lang.Object ref = schema_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - schema_ = s; - return s; - } - } - /** - *
-     * schema name
-     * 
- * - * string schema = 4; - * @return The bytes for schema. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getSchemaBytes() { - java.lang.Object ref = schema_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - schema_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int OPTIONS_FIELD_NUMBER = 5; + public static final int OPTIONS_FIELD_NUMBER = 4; private static final class OptionsDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.String, java.lang.String> defaultEntry = @@ -11040,7 +10768,7 @@ public int getOptionsCount() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11062,7 +10790,7 @@ public java.util.Map getOptions() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11074,7 +10802,7 @@ public java.util.Map getOptionsMap() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11091,7 +10819,7 @@ public java.lang.String getOptionsOrDefault( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11126,18 +10854,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(engine_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, engine_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalog_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, catalog_); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schema_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, schema_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, path_); } com.google.protobuf.GeneratedMessageV3 .serializeStringMapTo( output, internalGetOptions(), OptionsDefaultEntryHolder.defaultEntry, - 5); + 4); unknownFields.writeTo(output); } @@ -11154,11 +10879,8 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(engine_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, engine_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(catalog_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, catalog_); - } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(schema_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, schema_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(path_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, path_); } for (java.util.Map.Entry entry : internalGetOptions().getMap().entrySet()) { @@ -11168,7 +10890,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, options__); + .computeMessageSize(4, options__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -11189,10 +10911,8 @@ public boolean equals(final java.lang.Object obj) { != other.getRegionId()) return false; if (!getEngine() .equals(other.getEngine())) return false; - if (!getCatalog() - .equals(other.getCatalog())) return false; - if (!getSchema() - .equals(other.getSchema())) return false; + if (!getPath() + .equals(other.getPath())) return false; if (!internalGetOptions().equals( other.internalGetOptions())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -11211,10 +10931,8 @@ public int hashCode() { getRegionId()); hash = (37 * hash) + ENGINE_FIELD_NUMBER; hash = (53 * hash) + getEngine().hashCode(); - hash = (37 * hash) + CATALOG_FIELD_NUMBER; - hash = (53 * hash) + getCatalog().hashCode(); - hash = (37 * hash) + SCHEMA_FIELD_NUMBER; - hash = (53 * hash) + getSchema().hashCode(); + hash = (37 * hash) + PATH_FIELD_NUMBER; + hash = (53 * hash) + getPath().hashCode(); if (!internalGetOptions().getMap().isEmpty()) { hash = (37 * hash) + OPTIONS_FIELD_NUMBER; hash = (53 * hash) + internalGetOptions().hashCode(); @@ -11330,7 +11048,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 5: + case 4: return internalGetOptions(); default: throw new RuntimeException( @@ -11341,7 +11059,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 5: + case 4: return internalGetMutableOptions(); default: throw new RuntimeException( @@ -11378,9 +11096,7 @@ public Builder clear() { engine_ = ""; - catalog_ = ""; - - schema_ = ""; + path_ = ""; internalGetMutableOptions().clear(); return this; @@ -11412,8 +11128,7 @@ public io.greptime.v1.region.Server.OpenRequest buildPartial() { int from_bitField0_ = bitField0_; result.regionId_ = regionId_; result.engine_ = engine_; - result.catalog_ = catalog_; - result.schema_ = schema_; + result.path_ = path_; result.options_ = internalGetOptions(); result.options_.makeImmutable(); onBuilt(); @@ -11471,12 +11186,8 @@ public Builder mergeFrom(io.greptime.v1.region.Server.OpenRequest other) { engine_ = other.engine_; onChanged(); } - if (!other.getCatalog().isEmpty()) { - catalog_ = other.catalog_; - onChanged(); - } - if (!other.getSchema().isEmpty()) { - schema_ = other.schema_; + if (!other.getPath().isEmpty()) { + path_ = other.path_; onChanged(); } internalGetMutableOptions().mergeFrom( @@ -11638,123 +11349,22 @@ public Builder setEngineBytes( return this; } - private java.lang.Object catalog_ = ""; - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 3; - * @return The catalog. - */ - public java.lang.String getCatalog() { - java.lang.Object ref = catalog_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - catalog_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 3; - * @return The bytes for catalog. - */ - public com.google.protobuf.ByteString - getCatalogBytes() { - java.lang.Object ref = catalog_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - catalog_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 3; - * @param value The catalog to set. - * @return This builder for chaining. - */ - public Builder setCatalog( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - catalog_ = value; - onChanged(); - return this; - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 3; - * @return This builder for chaining. - */ - public Builder clearCatalog() { - - catalog_ = getDefaultInstance().getCatalog(); - onChanged(); - return this; - } - /** - *
-       * catalog name and schema name is to accomplish storage path
-       * catalog name
-       * 
- * - * string catalog = 3; - * @param value The bytes for catalog to set. - * @return This builder for chaining. - */ - public Builder setCatalogBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - catalog_ = value; - onChanged(); - return this; - } - - private java.lang.Object schema_ = ""; + private java.lang.Object path_ = ""; /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 4; - * @return The schema. + * string path = 3; + * @return The path. */ - public java.lang.String getSchema() { - java.lang.Object ref = schema_; + public java.lang.String getPath() { + java.lang.Object ref = path_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - schema_ = s; + path_ = s; return s; } else { return (java.lang.String) ref; @@ -11762,20 +11372,20 @@ public java.lang.String getSchema() { } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 4; - * @return The bytes for schema. + * string path = 3; + * @return The bytes for path. */ public com.google.protobuf.ByteString - getSchemaBytes() { - java.lang.Object ref = schema_; + getPathBytes() { + java.lang.Object ref = path_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - schema_ = b; + path_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -11783,54 +11393,54 @@ public java.lang.String getSchema() { } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 4; - * @param value The schema to set. + * string path = 3; + * @param value The path to set. * @return This builder for chaining. */ - public Builder setSchema( + public Builder setPath( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - schema_ = value; + path_ = value; onChanged(); return this; } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 4; + * string path = 3; * @return This builder for chaining. */ - public Builder clearSchema() { + public Builder clearPath() { - schema_ = getDefaultInstance().getSchema(); + path_ = getDefaultInstance().getPath(); onChanged(); return this; } /** *
-       * schema name
+       * Region storage path
        * 
* - * string schema = 4; - * @param value The bytes for schema to set. + * string path = 3; + * @param value The bytes for path to set. * @return This builder for chaining. */ - public Builder setSchemaBytes( + public Builder setPathBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - schema_ = value; + path_ = value; onChanged(); return this; } @@ -11866,7 +11476,7 @@ public int getOptionsCount() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11888,7 +11498,7 @@ public java.util.Map getOptions() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11900,7 +11510,7 @@ public java.util.Map getOptionsMap() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11917,7 +11527,7 @@ public java.lang.String getOptionsOrDefault( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ @java.lang.Override @@ -11942,7 +11552,7 @@ public Builder clearOptions() { * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ public Builder removeOptions( @@ -11965,7 +11575,7 @@ public Builder removeOptions( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ public Builder putOptions( java.lang.String key, @@ -11984,7 +11594,7 @@ public Builder putOptions( * Options of the opened region. * * - * map<string, string> options = 5; + * map<string, string> options = 4; */ public Builder putAllOptions( @@ -18474,41 +18084,40 @@ public io.greptime.v1.region.Server.RegionColumnDef getDefaultInstanceForType() "(\0132\021.greptime.v1.Rows\"h\n\014QueryRequest\0227\n" + "\006header\030\001 \001(\0132\'.greptime.v1.region.Regio" + "nRequestHeader\022\021\n\tregion_id\030\002 \001(\004\022\014\n\004pla" + - "n\030\003 \001(\014\"\261\002\n\rCreateRequest\022\021\n\tregion_id\030\001" + + "n\030\003 \001(\014\"\236\002\n\rCreateRequest\022\021\n\tregion_id\030\001" + " \001(\004\022\016\n\006engine\030\002 \001(\t\0228\n\013column_defs\030\003 \003(" + "\0132#.greptime.v1.region.RegionColumnDef\022\023" + "\n\013primary_key\030\004 \003(\r\022\034\n\024create_if_not_exi" + - "sts\030\005 \001(\010\022\017\n\007catalog\030\006 \001(\t\022\016\n\006schema\030\007 \001" + - "(\t\022?\n\007options\030\010 \003(\0132..greptime.v1.region" + - ".CreateRequest.OptionsEntry\032.\n\014OptionsEn" + - "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\" \n\013D" + - "ropRequest\022\021\n\tregion_id\030\001 \001(\004\"\300\001\n\013OpenRe" + - "quest\022\021\n\tregion_id\030\001 \001(\004\022\016\n\006engine\030\002 \001(\t" + - "\022\017\n\007catalog\030\003 \001(\t\022\016\n\006schema\030\004 \001(\t\022=\n\007opt" + - "ions\030\005 \003(\0132,.greptime.v1.region.OpenRequ" + - "est.OptionsEntry\032.\n\014OptionsEntry\022\013\n\003key\030" + - "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"!\n\014CloseRequest" + - "\022\021\n\tregion_id\030\001 \001(\004\"\261\001\n\014AlterRequest\022\021\n\t" + - "region_id\030\001 \001(\004\0225\n\013add_columns\030\002 \001(\0132\036.g" + - "reptime.v1.region.AddColumnsH\000\0227\n\014drop_c" + - "olumns\030\003 \001(\0132\037.greptime.v1.region.DropCo" + - "lumnsH\000\022\026\n\016schema_version\030\004 \001(\004B\006\n\004kind\"" + - "@\n\nAddColumns\0222\n\013add_columns\030\001 \003(\0132\035.gre" + - "ptime.v1.region.AddColumn\"C\n\013DropColumns" + - "\0224\n\014drop_columns\030\001 \003(\0132\036.greptime.v1.reg" + - "ion.DropColumn\"v\n\tAddColumn\0227\n\ncolumn_de" + - "f\030\001 \001(\0132#.greptime.v1.region.RegionColum" + - "nDef\0220\n\010location\030\003 \001(\0132\036.greptime.v1.Add" + - "ColumnLocation\"\032\n\nDropColumn\022\014\n\004name\030\001 \001" + - "(\t\"!\n\014FlushRequest\022\021\n\tregion_id\030\001 \001(\004\"#\n" + - "\016CompactRequest\022\021\n\tregion_id\030\001 \001(\004\"P\n\017Re" + - "gionColumnDef\022*\n\ncolumn_def\030\001 \001(\0132\026.grep" + - "time.v1.ColumnDef\022\021\n\tcolumn_id\030\002 \001(\r2Y\n\006" + - "Region\022O\n\006Handle\022!.greptime.v1.region.Re" + - "gionRequest\032\".greptime.v1.region.RegionR" + - "esponseB]\n\025io.greptime.v1.regionB\006Server" + - "Z options = 8; + map options = 7; // TODO: add partition def } @@ -101,13 +98,10 @@ message OpenRequest { uint64 region_id = 1; // Region engine name string engine = 2; - // catalog name and schema name is to accomplish storage path - // catalog name - string catalog = 3; - // schema name - string schema = 4; + // Region storage path + string path = 3; // Options of the opened region. - map options = 5; + map options = 4; } message CloseRequest { uint64 region_id = 1; }