Skip to content

Commit 3cc25f6

Browse files
committed
removed flag part from the pr
1 parent a83b9cb commit 3cc25f6

File tree

5 files changed

+4
-19
lines changed

5 files changed

+4
-19
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
* Allowed overflow queue limit for one goroutine at time for topic writer
2-
* Added option WithReaderDisableSplitMergePartitionsSupport for topic reader
32

43
## v3.105.2
54
* Improved the `ydb.WithSessionPoolSessionUsageLimit` option for allow `time.Duration` as argument type for limit max session time to live since create time

internal/topic/topiclistenerinternal/stream_listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (l *streamListener) initStream(ctx context.Context, client TopicClient) err
174174
}
175175
l.stream = topicreadercommon.NewSyncedStream(stream)
176176

177-
initMessage := topicreadercommon.CreateInitMessage(l.cfg.Consumer, false, l.cfg.Selectors)
177+
initMessage := topicreadercommon.CreateInitMessage(l.cfg.Consumer, l.cfg.Selectors)
178178
err = stream.Send(initMessage)
179179
if err != nil {
180180
return xerrors.WithStackTrace(fmt.Errorf("ydb: failed to send init request for read stream in the listener: %w", err))

internal/topic/topicreadercommon/init_message.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ package topicreadercommon
22

33
import "github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicreader"
44

5-
func CreateInitMessage(
6-
consumer string,
7-
supportAutoPartition bool,
8-
selectors []*PublicReadSelector,
9-
) *rawtopicreader.InitRequest {
5+
func CreateInitMessage(consumer string, selectors []*PublicReadSelector) *rawtopicreader.InitRequest {
106
res := &rawtopicreader.InitRequest{
117
Consumer: consumer,
12-
AutoPartitioningSupport: supportAutoPartition,
8+
AutoPartitioningSupport: true,
139
}
1410

1511
res.TopicsReadSettings = make([]rawtopicreader.TopicReadSettings, len(selectors))

internal/topic/topicreaderinternal/stream_reader_impl.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ type topicStreamReaderConfig struct {
8080
GetPartitionStartOffsetCallback PublicGetPartitionStartOffsetFunc
8181
CommitMode topicreadercommon.PublicCommitMode
8282
Decoders topicreadercommon.DecoderMap
83-
DisableSplitMergeSupport bool
8483
}
8584

8685
func newTopicStreamReaderConfig() topicStreamReaderConfig {
@@ -612,8 +611,7 @@ func (r *topicStreamReaderImpl) setStarted() error {
612611
}
613612

614613
func (r *topicStreamReaderImpl) initSession() (err error) {
615-
supportAutoPartition := !r.cfg.DisableSplitMergeSupport
616-
initMessage := topicreadercommon.CreateInitMessage(r.cfg.Consumer, supportAutoPartition, r.cfg.ReadSelectors)
614+
initMessage := topicreadercommon.CreateInitMessage(r.cfg.Consumer, r.cfg.ReadSelectors)
617615

618616
onDone := trace.TopicOnReaderInit(r.cfg.Trace, r.readConnectionID, initMessage)
619617
defer func() {

topic/topicoptions/topicoptions_reader.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,3 @@ func WithReaderWithoutConsumer(saveStateOnReconnection bool) ReaderOption {
281281
cfg.CommitMode = CommitModeNone
282282
}
283283
}
284-
285-
// WithReaderDisableSplitMergePartitionsSupport turn off support split-merge reorder messages
286-
// on client side.
287-
func WithReaderDisableSplitMergePartitionsSupport(disableSupport bool) ReaderOption {
288-
return func(cfg *topicreaderinternal.ReaderConfig) {
289-
cfg.DisableSplitMergeSupport = disableSupport
290-
}
291-
}

0 commit comments

Comments
 (0)