From a2420389d8f542458abf8f795f6f9029154cd27e Mon Sep 17 00:00:00 2001 From: luofucong Date: Wed, 23 Aug 2023 13:38:02 +0800 Subject: [PATCH 1/2] fix: typo --- c++/greptime/v1/region/server.pb.h | 42 +++++++++++++-------------- proto/greptime/v1/region/server.proto | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/c++/greptime/v1/region/server.pb.h b/c++/greptime/v1/region/server.pb.h index c8952455..2d89b2be 100644 --- a/c++/greptime/v1/region/server.pb.h +++ b/c++/greptime/v1/region/server.pb.h @@ -623,7 +623,7 @@ class RegionResponse final : enum : int { kHeaderFieldNumber = 1, - kAffactedRowsFieldNumber = 2, + kAffectedRowsFieldNumber = 2, }; // .greptime.v1.ResponseHeader header = 1; bool has_header() const; @@ -643,13 +643,13 @@ class RegionResponse final : ::greptime::v1::ResponseHeader* header); ::greptime::v1::ResponseHeader* unsafe_arena_release_header(); - // uint64 affacted_rows = 2; - void clear_affacted_rows(); - uint64_t affacted_rows() const; - void set_affacted_rows(uint64_t value); + // uint64 affected_rows = 2; + void clear_affected_rows(); + uint64_t affected_rows() const; + void set_affected_rows(uint64_t value); private: - uint64_t _internal_affacted_rows() const; - void _internal_set_affacted_rows(uint64_t value); + uint64_t _internal_affected_rows() const; + void _internal_set_affected_rows(uint64_t value); public: // @@protoc_insertion_point(class_scope:greptime.v1.region.RegionResponse) @@ -661,7 +661,7 @@ class RegionResponse final : typedef void DestructorSkippable_; struct Impl_ { ::greptime::v1::ResponseHeader* header_; - uint64_t affacted_rows_; + uint64_t affected_rows_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -3818,24 +3818,24 @@ inline void RegionResponse::set_allocated_header(::greptime::v1::ResponseHeader* // @@protoc_insertion_point(field_set_allocated:greptime.v1.region.RegionResponse.header) } -// uint64 affacted_rows = 2; -inline void RegionResponse::clear_affacted_rows() { - _impl_.affacted_rows_ = uint64_t{0u}; +// uint64 affected_rows = 2; +inline void RegionResponse::clear_affected_rows() { + _impl_.affected_rows_ = uint64_t{0u}; } -inline uint64_t RegionResponse::_internal_affacted_rows() const { - return _impl_.affacted_rows_; +inline uint64_t RegionResponse::_internal_affected_rows() const { + return _impl_.affected_rows_; } -inline uint64_t RegionResponse::affacted_rows() const { - // @@protoc_insertion_point(field_get:greptime.v1.region.RegionResponse.affacted_rows) - return _internal_affacted_rows(); +inline uint64_t RegionResponse::affected_rows() const { + // @@protoc_insertion_point(field_get:greptime.v1.region.RegionResponse.affected_rows) + return _internal_affected_rows(); } -inline void RegionResponse::_internal_set_affacted_rows(uint64_t value) { +inline void RegionResponse::_internal_set_affected_rows(uint64_t value) { - _impl_.affacted_rows_ = value; + _impl_.affected_rows_ = value; } -inline void RegionResponse::set_affacted_rows(uint64_t value) { - _internal_set_affacted_rows(value); - // @@protoc_insertion_point(field_set:greptime.v1.region.RegionResponse.affacted_rows) +inline void RegionResponse::set_affected_rows(uint64_t value) { + _internal_set_affected_rows(value); + // @@protoc_insertion_point(field_set:greptime.v1.region.RegionResponse.affected_rows) } // ------------------------------------------------------------------- diff --git a/proto/greptime/v1/region/server.proto b/proto/greptime/v1/region/server.proto index c4cd92af..863b5f62 100644 --- a/proto/greptime/v1/region/server.proto +++ b/proto/greptime/v1/region/server.proto @@ -47,7 +47,7 @@ message RegionRequest { message RegionResponse { ResponseHeader header = 1; - uint64 affacted_rows = 2; + uint64 affected_rows = 2; } message InsertRequests { repeated InsertRequest requests = 1; } From 27c5ff62c60a3448de092a9903ec73aecf3b8c1d Mon Sep 17 00:00:00 2001 From: luofucong Date: Fri, 25 Aug 2023 17:37:21 +0800 Subject: [PATCH 2/2] rebase main --- c++/greptime/v1/region/server.pb.cc | 38 +++++----- .../java/io/greptime/v1/region/Server.java | 72 +++++++++---------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/c++/greptime/v1/region/server.pb.cc b/c++/greptime/v1/region/server.pb.cc index 5bc9b6f7..dc1a7201 100644 --- a/c++/greptime/v1/region/server.pb.cc +++ b/c++/greptime/v1/region/server.pb.cc @@ -41,7 +41,7 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT PROTOBUF_CONSTEXPR RegionResponse::RegionResponse( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.header_)*/nullptr - , /*decltype(_impl_.affacted_rows_)*/uint64_t{0u} + , /*decltype(_impl_.affected_rows_)*/uint64_t{0u} , /*decltype(_impl_._cached_size_)*/{}} {} struct RegionResponseDefaultTypeInternal { PROTOBUF_CONSTEXPR RegionResponseDefaultTypeInternal() @@ -293,7 +293,7 @@ const uint32_t TableStruct_greptime_2fv1_2fregion_2fserver_2eproto::offsets[] PR ~0u, // no _weak_field_map_ ~0u, // no _inlined_string_donated_ PROTOBUF_FIELD_OFFSET(::greptime::v1::region::RegionResponse, _impl_.header_), - PROTOBUF_FIELD_OFFSET(::greptime::v1::region::RegionResponse, _impl_.affacted_rows_), + PROTOBUF_FIELD_OFFSET(::greptime::v1::region::RegionResponse, _impl_.affected_rows_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::greptime::v1::region::InsertRequests, _internal_metadata_), ~0u, // no _extensions_ @@ -481,7 +481,7 @@ const char descriptor_table_protodef_greptime_2fv1_2fregion_2fserver_2eproto[] P "ion.FlushRequestH\000\0225\n\007compact\030\013 \001(\0132\".gr" "eptime.v1.region.CompactRequestH\000B\006\n\004bod" "y\"T\n\016RegionResponse\022+\n\006header\030\001 \001(\0132\033.gr" - "eptime.v1.ResponseHeader\022\025\n\raffacted_row" + "eptime.v1.ResponseHeader\022\025\n\raffected_row" "s\030\002 \001(\004\"E\n\016InsertRequests\0223\n\010requests\030\001 " "\003(\0132!.greptime.v1.region.InsertRequest\"E" "\n\016DeleteRequests\0223\n\010requests\030\001 \003(\0132!.gre" @@ -1330,14 +1330,14 @@ RegionResponse::RegionResponse(const RegionResponse& from) RegionResponse* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.header_){nullptr} - , decltype(_impl_.affacted_rows_){} + , decltype(_impl_.affected_rows_){} , /*decltype(_impl_._cached_size_)*/{}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); if (from._internal_has_header()) { _this->_impl_.header_ = new ::greptime::v1::ResponseHeader(*from._impl_.header_); } - _this->_impl_.affacted_rows_ = from._impl_.affacted_rows_; + _this->_impl_.affected_rows_ = from._impl_.affected_rows_; // @@protoc_insertion_point(copy_constructor:greptime.v1.region.RegionResponse) } @@ -1347,7 +1347,7 @@ inline void RegionResponse::SharedCtor( (void)is_message_owned; new (&_impl_) Impl_{ decltype(_impl_.header_){nullptr} - , decltype(_impl_.affacted_rows_){uint64_t{0u}} + , decltype(_impl_.affected_rows_){uint64_t{0u}} , /*decltype(_impl_._cached_size_)*/{} }; } @@ -1380,7 +1380,7 @@ void RegionResponse::Clear() { delete _impl_.header_; } _impl_.header_ = nullptr; - _impl_.affacted_rows_ = uint64_t{0u}; + _impl_.affected_rows_ = uint64_t{0u}; _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1398,10 +1398,10 @@ const char* RegionResponse::_InternalParse(const char* ptr, ::_pbi::ParseContext } else goto handle_unusual; continue; - // uint64 affacted_rows = 2; + // uint64 affected_rows = 2; case 2: if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 16)) { - _impl_.affacted_rows_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + _impl_.affected_rows_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); CHK_(ptr); } else goto handle_unusual; @@ -1442,10 +1442,10 @@ uint8_t* RegionResponse::_InternalSerialize( _Internal::header(this).GetCachedSize(), target, stream); } - // uint64 affacted_rows = 2; - if (this->_internal_affacted_rows() != 0) { + // uint64 affected_rows = 2; + if (this->_internal_affected_rows() != 0) { target = stream->EnsureSpace(target); - target = ::_pbi::WireFormatLite::WriteUInt64ToArray(2, this->_internal_affacted_rows(), target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(2, this->_internal_affected_rows(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -1471,9 +1471,9 @@ size_t RegionResponse::ByteSizeLong() const { *_impl_.header_); } - // uint64 affacted_rows = 2; - if (this->_internal_affacted_rows() != 0) { - total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_affacted_rows()); + // uint64 affected_rows = 2; + if (this->_internal_affected_rows() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_affected_rows()); } return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); @@ -1498,8 +1498,8 @@ void RegionResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const : _this->_internal_mutable_header()->::greptime::v1::ResponseHeader::MergeFrom( from._internal_header()); } - if (from._internal_affacted_rows() != 0) { - _this->_internal_set_affacted_rows(from._internal_affacted_rows()); + if (from._internal_affected_rows() != 0) { + _this->_internal_set_affected_rows(from._internal_affected_rows()); } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1519,8 +1519,8 @@ void RegionResponse::InternalSwap(RegionResponse* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(RegionResponse, _impl_.affacted_rows_) - + sizeof(RegionResponse::_impl_.affacted_rows_) + PROTOBUF_FIELD_OFFSET(RegionResponse, _impl_.affected_rows_) + + sizeof(RegionResponse::_impl_.affected_rows_) - PROTOBUF_FIELD_OFFSET(RegionResponse, _impl_.header_)>( reinterpret_cast(&_impl_.header_), reinterpret_cast(&other->_impl_.header_)); 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 b41c6650..4468e94c 100644 --- a/java/src/main/java/io/greptime/v1/region/Server.java +++ b/java/src/main/java/io/greptime/v1/region/Server.java @@ -2798,10 +2798,10 @@ public interface RegionResponseOrBuilder extends io.greptime.v1.Common.ResponseHeaderOrBuilder getHeaderOrBuilder(); /** - * uint64 affacted_rows = 2; - * @return The affactedRows. + * uint64 affected_rows = 2; + * @return The affectedRows. */ - long getAffactedRows(); + long getAffectedRows(); } /** * Protobuf type {@code greptime.v1.region.RegionResponse} @@ -2863,7 +2863,7 @@ private RegionResponse( } case 16: { - affactedRows_ = input.readUInt64(); + affectedRows_ = input.readUInt64(); break; } default: { @@ -2926,15 +2926,15 @@ public io.greptime.v1.Common.ResponseHeaderOrBuilder getHeaderOrBuilder() { return getHeader(); } - public static final int AFFACTED_ROWS_FIELD_NUMBER = 2; - private long affactedRows_; + public static final int AFFECTED_ROWS_FIELD_NUMBER = 2; + private long affectedRows_; /** - * uint64 affacted_rows = 2; - * @return The affactedRows. + * uint64 affected_rows = 2; + * @return The affectedRows. */ @java.lang.Override - public long getAffactedRows() { - return affactedRows_; + public long getAffectedRows() { + return affectedRows_; } private byte memoizedIsInitialized = -1; @@ -2954,8 +2954,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (header_ != null) { output.writeMessage(1, getHeader()); } - if (affactedRows_ != 0L) { - output.writeUInt64(2, affactedRows_); + if (affectedRows_ != 0L) { + output.writeUInt64(2, affectedRows_); } unknownFields.writeTo(output); } @@ -2970,9 +2970,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getHeader()); } - if (affactedRows_ != 0L) { + if (affectedRows_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(2, affactedRows_); + .computeUInt64Size(2, affectedRows_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -2994,8 +2994,8 @@ public boolean equals(final java.lang.Object obj) { if (!getHeader() .equals(other.getHeader())) return false; } - if (getAffactedRows() - != other.getAffactedRows()) return false; + if (getAffectedRows() + != other.getAffectedRows()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -3011,9 +3011,9 @@ public int hashCode() { hash = (37 * hash) + HEADER_FIELD_NUMBER; hash = (53 * hash) + getHeader().hashCode(); } - hash = (37 * hash) + AFFACTED_ROWS_FIELD_NUMBER; + hash = (37 * hash) + AFFECTED_ROWS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getAffactedRows()); + getAffectedRows()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -3153,7 +3153,7 @@ public Builder clear() { header_ = null; headerBuilder_ = null; } - affactedRows_ = 0L; + affectedRows_ = 0L; return this; } @@ -3186,7 +3186,7 @@ public io.greptime.v1.region.Server.RegionResponse buildPartial() { } else { result.header_ = headerBuilder_.build(); } - result.affactedRows_ = affactedRows_; + result.affectedRows_ = affectedRows_; onBuilt(); return result; } @@ -3238,8 +3238,8 @@ public Builder mergeFrom(io.greptime.v1.region.Server.RegionResponse other) { if (other.hasHeader()) { mergeHeader(other.getHeader()); } - if (other.getAffactedRows() != 0L) { - setAffactedRows(other.getAffactedRows()); + if (other.getAffectedRows() != 0L) { + setAffectedRows(other.getAffectedRows()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -3389,33 +3389,33 @@ public io.greptime.v1.Common.ResponseHeaderOrBuilder getHeaderOrBuilder() { return headerBuilder_; } - private long affactedRows_ ; + private long affectedRows_ ; /** - * uint64 affacted_rows = 2; - * @return The affactedRows. + * uint64 affected_rows = 2; + * @return The affectedRows. */ @java.lang.Override - public long getAffactedRows() { - return affactedRows_; + public long getAffectedRows() { + return affectedRows_; } /** - * uint64 affacted_rows = 2; - * @param value The affactedRows to set. + * uint64 affected_rows = 2; + * @param value The affectedRows to set. * @return This builder for chaining. */ - public Builder setAffactedRows(long value) { + public Builder setAffectedRows(long value) { - affactedRows_ = value; + affectedRows_ = value; onChanged(); return this; } /** - * uint64 affacted_rows = 2; + * uint64 affected_rows = 2; * @return This builder for chaining. */ - public Builder clearAffactedRows() { + public Builder clearAffectedRows() { - affactedRows_ = 0L; + affectedRows_ = 0L; onChanged(); return this; } @@ -14286,7 +14286,7 @@ public io.greptime.v1.region.Server.ColumnDef getDefaultInstanceForType() { "ion.FlushRequestH\000\0225\n\007compact\030\013 \001(\0132\".gr" + "eptime.v1.region.CompactRequestH\000B\006\n\004bod" + "y\"T\n\016RegionResponse\022+\n\006header\030\001 \001(\0132\033.gr" + - "eptime.v1.ResponseHeader\022\025\n\raffacted_row" + + "eptime.v1.ResponseHeader\022\025\n\raffected_row" + "s\030\002 \001(\004\"E\n\016InsertRequests\0223\n\010requests\030\001 " + "\003(\0132!.greptime.v1.region.InsertRequest\"E" + "\n\016DeleteRequests\0223\n\010requests\030\001 \003(\0132!.gre" + @@ -14342,7 +14342,7 @@ public io.greptime.v1.region.Server.ColumnDef getDefaultInstanceForType() { internal_static_greptime_v1_region_RegionResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_greptime_v1_region_RegionResponse_descriptor, - new java.lang.String[] { "Header", "AffactedRows", }); + new java.lang.String[] { "Header", "AffectedRows", }); internal_static_greptime_v1_region_InsertRequests_descriptor = getDescriptor().getMessageTypes().get(2); internal_static_greptime_v1_region_InsertRequests_fieldAccessorTable = new