diff --git a/.github/import_generation.txt b/.github/import_generation.txt index a45fd52cc58..7273c0fa8c5 100644 --- a/.github/import_generation.txt +++ b/.github/import_generation.txt @@ -1 +1 @@ -24 +25 diff --git a/.github/last_commit.txt b/.github/last_commit.txt index 9e9b2a1c928..4a5d128d765 100644 --- a/.github/last_commit.txt +++ b/.github/last_commit.txt @@ -1 +1 @@ -110937321b45fb3be9ca39ff3bb83bcdfcf52c97 +b39a359f04c57875ea162524646ae879f06c7a33 diff --git a/include/ydb-cpp-sdk/client/monitoring/monitoring.h b/include/ydb-cpp-sdk/client/monitoring/monitoring.h index 72866e87622..54ce3211844 100644 --- a/include/ydb-cpp-sdk/client/monitoring/monitoring.h +++ b/include/ydb-cpp-sdk/client/monitoring/monitoring.h @@ -28,6 +28,8 @@ enum class EStatusFlag { struct TSelfCheckSettings : public TOperationRequestSettings{ FLUENT_SETTING_OPTIONAL(bool, ReturnVerboseStatus); + FLUENT_SETTING_OPTIONAL(bool, NoMerge); + FLUENT_SETTING_OPTIONAL(bool, NoCache); FLUENT_SETTING_OPTIONAL(EStatusFlag, MinimumStatus); FLUENT_SETTING_OPTIONAL(uint32_t, MaximumLevel); }; diff --git a/src/api/protos/ydb_topic.proto b/src/api/protos/ydb_topic.proto index 5e0f65838f2..6ae3aa6f6e4 100644 --- a/src/api/protos/ydb_topic.proto +++ b/src/api/protos/ydb_topic.proto @@ -475,6 +475,9 @@ message StreamReadMessage { // Write timestamp of next message written to this partition will be no less than write_time_high_watermark. google.protobuf.Timestamp write_time_high_watermark = 4; + + // Messages with offsets up to and including (read_offset - 1) was read. + int64 read_offset = 5; } // Command from server to create and start a partition session. diff --git a/src/client/monitoring/monitoring.cpp b/src/client/monitoring/monitoring.cpp index 7f86d9a2006..16a4945ebd1 100644 --- a/src/client/monitoring/monitoring.cpp +++ b/src/client/monitoring/monitoring.cpp @@ -40,6 +40,14 @@ class TMonitoringClient::TImpl : public TClientImplCommon::OnReadDoneImpl( bool pushRes = EventsQueue->PushEvent(partitionStreamIt->second, TReadSessionEvent::TPartitionSessionStatusEvent( partitionStreamIt->second, msg.committed_offset(), - 0, // TODO: support read offset in status + msg.read_offset(), msg.partition_offsets().end(), TInstant::MilliSeconds(::google::protobuf::util::TimeUtil::TimestampToMilliseconds( msg.write_time_high_watermark()))),