Skip to content

Commit fe3bb6c

Browse files
committed
fix public files for changes internal type location
1 parent c107dd8 commit fe3bb6c

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

internal/topic/topicreadercommon/batch.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ func (m *PublicBatch) PartitionID() int64 {
117117
return m.partitionSession().PartitionID
118118
}
119119

120-
// PartitionSessionID example only
121-
func (m *PublicBatch) PartitionSessionID() int64 {
122-
// TODO implement me
123-
panic("implement me")
124-
}
125-
126120
func (m *PublicBatch) partitionSession() *PartitionSession {
127121
return m.commitRange.PartitionSession
128122
}

testutil/topic.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package testutil
22

3-
import "github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
3+
import (
4+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon"
5+
)
46

5-
type TopicReaderMessageBuilder = topicreaderinternal.PublicMessageBuilder
7+
type TopicReaderMessageBuilder = topicreadercommon.PublicMessageBuilder
68

79
// NewTopicReaderMessageBuilder create builder, which can create Message (use for tests only)
810
func NewTopicReaderMessageBuilder() *TopicReaderMessageBuilder {
9-
return topicreaderinternal.NewPublicMessageBuilder()
11+
return topicreadercommon.NewPublicMessageBuilder()
1012
}

topic/topicoptions/topicoptions_reader.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import (
55

66
"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
77
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
8+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon"
89
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
910
"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
1011
"github.com/ydb-platform/ydb-go-sdk/v3/trace"
1112
)
1213

1314
// ReadSelector set rules for reader: set of topic, partitions, start time filted, etc.
14-
type ReadSelector = topicreaderinternal.PublicReadSelector
15+
type ReadSelector = topicreadercommon.PublicReadSelector
1516

1617
// ReadSelectors slice of rules for topic reader
1718
type ReadSelectors []ReadSelector
@@ -24,6 +25,9 @@ func ReadTopic(path string) ReadSelectors {
2425
// ReaderOption options for topic reader
2526
type ReaderOption = topicreaderinternal.PublicReaderOption
2627

28+
// CallbackReaderOption options for topic callback reader
29+
type CallbackReaderOption = topicreaderinternal.PublicCallbackReaderOption
30+
2731
// WithReaderOperationTimeout
2832
//
2933
// Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
@@ -160,7 +164,7 @@ func WithReaderBufferSizeBytes(size int) ReaderOption {
160164
}
161165

162166
// CreateDecoderFunc interface for fabric of message decoders
163-
type CreateDecoderFunc = topicreaderinternal.PublicCreateDecoderFunc
167+
type CreateDecoderFunc = topicreadercommon.PublicCreateDecoderFunc
164168

165169
// WithAddDecoder add decoder for a codec.
166170
// It allows to set decoders fabric for custom codec and replace internal decoders.

topic/topicreader/errors.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package topicreader
33
import (
44
"errors"
55

6+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon"
67
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
78
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
89
)
910

1011
// ErrUnexpectedCodec will return if topicreader receive message with unknown codec.
1112
// client side must check error with errors.Is
12-
var ErrUnexpectedCodec = topicreaderinternal.ErrPublicUnexpectedCodec
13+
var ErrUnexpectedCodec = topicreadercommon.ErrPublicUnexpectedCodec
1314

1415
// ErrConcurrencyCall return if method on reader called in concurrency
1516
// client side must check error with errors.Is

topic/topicreader/reader.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"sync/atomic"
66

7+
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreadercommon"
78
"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
89
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
910
)
@@ -49,10 +50,10 @@ func (r *Reader) ReadMessage(ctx context.Context) (*Message, error) {
4950
}
5051

5152
// Message contains data and metadata, readed from the server
52-
type Message = topicreaderinternal.PublicMessage
53+
type Message = topicreadercommon.PublicMessage
5354

5455
// MessageContentUnmarshaler is interface for unmarshal message content to own struct
55-
type MessageContentUnmarshaler = topicreaderinternal.PublicMessageContentUnmarshaler
56+
type MessageContentUnmarshaler = topicreadercommon.PublicMessageContentUnmarshaler
5657

5758
// Commit receive Message, Batch of single offset
5859
// It can be fast (by default) or sync and waite response from server
@@ -72,7 +73,7 @@ func (r *Reader) Commit(ctx context.Context, obj CommitRangeGetter) error {
7273
}
7374

7475
// CommitRangeGetter interface for get commit offsets
75-
type CommitRangeGetter = topicreaderinternal.PublicCommitRangeGetter
76+
type CommitRangeGetter = topicreadercommon.PublicCommitRangeGetter
7677

7778
// ReadMessageBatch
7879
//
@@ -103,7 +104,7 @@ func (r *Reader) ReadMessagesBatch(ctx context.Context, opts ...ReadBatchOption)
103104
}
104105

105106
// Batch is ordered group of messages from one partition
106-
type Batch = topicreaderinternal.PublicBatch
107+
type Batch = topicreadercommon.PublicBatch
107108

108109
// ReadBatchOption is type for options of read batch
109110
type ReadBatchOption = topicreaderinternal.PublicReadBatchOption

0 commit comments

Comments
 (0)