Import YDB C++ SDK 24

.github/import_generation.txt

@@ -1 +1 @@
-24
+25

.github/last_commit.txt

@@ -1 +1 @@
-110937321b45fb3be9ca39ff3bb83bcdfcf52c97
+b39a359f04c57875ea162524646ae879f06c7a33

include/ydb-cpp-sdk/client/monitoring/monitoring.h

@@ -28,6 +28,8 @@ enum class EStatusFlag {
 
 struct TSelfCheckSettings : public TOperationRequestSettings<TSelfCheckSettings>{
     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);
 };

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.

src/client/monitoring/monitoring.cpp

@@ -40,6 +40,14 @@ class TMonitoringClient::TImpl : public TClientImplCommon<TMonitoringClient::TIm
             request.set_return_verbose_status(settings.ReturnVerboseStatus_.value());
         }
 
+        if (settings.NoMerge_) {
+            request.set_merge_records(!settings.NoMerge_.value());
+        }
+
+        if (settings.NoCache_) {
+            request.set_do_not_cache(settings.NoCache_.value());
+        }
+
         if (settings.MinimumStatus_) {
             request.set_minimum_status((::Ydb::Monitoring::StatusFlag_Status)settings.MinimumStatus_.value());
         }

src/client/topic/impl/read_session_impl.ipp

@@ -1701,7 +1701,7 @@ inline void TSingleClusterReadSessionImpl<false>::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()))),