Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<ydb-auth-api.version>1.0.0</ydb-auth-api.version>
<ydb-proto-api.version>1.7.0</ydb-proto-api.version>
<ydb-proto-api.version>1.7.1</ydb-proto-api.version>
<yc-auth.version>2.2.0</yc-auth.version>
</properties>

Expand Down
12 changes: 8 additions & 4 deletions topic/src/main/java/tech/ydb/topic/impl/TopicClientImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -373,15 +373,19 @@ public AsyncReader createAsyncReader(ReaderSettings settings, ReadEventHandlersS

@Override
public CompletableFuture<Status> commitOffset(String path, CommitOffsetSettings settings) {
YdbTopic.CommitOffsetRequest request = YdbTopic.CommitOffsetRequest.newBuilder()
YdbTopic.CommitOffsetRequest.Builder request = YdbTopic.CommitOffsetRequest.newBuilder()
.setOperationParams(Operation.buildParams(settings))
.setOffset(settings.getOffset())
.setPath(path)
.setConsumer(settings.getConsumer())
.setPartitionId(settings.getPartitionId())
.build();
.setPath(path);

if (settings.getReadSessionId() != null) {
request.setReadSessionId(settings.getReadSessionId());
}

final GrpcRequestSettings grpcRequestSettings = makeGrpcRequestSettings(settings);
return topicRpc.commitOffset(request, grpcRequestSettings);
return topicRpc.commitOffset(request.build(), grpcRequestSettings);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ public class CommitOffsetSettings extends OperationSettings {
private final long partitionId;
private final String consumer;
private final long offset;
private final String readSessionId;

private CommitOffsetSettings(Builder builder) {
super(builder);
this.partitionId = builder.partitionId;
this.consumer = builder.consumer;
this.offset = builder.offset;
this.readSessionId = builder.readSessionId;
}

public static Builder newBuilder() {
Expand All @@ -33,13 +35,18 @@ public long getOffset() {
return offset;
}

/**
public String getReadSessionId() {
return readSessionId;
}

/*
* BUILDER
*/
public static class Builder extends OperationBuilder<Builder> {
private long partitionId = -1;
private String consumer = null;
private long offset = 0;
private String readSessionId = null;

public Builder setPartitionId(long partitionId) {
this.partitionId = partitionId;
Expand All @@ -56,6 +63,11 @@ public Builder setOffset(long offset) {
return this;
}

public Builder setReadSessionId(String sessionId) {
this.readSessionId = sessionId;
return this;
}

@Override
public CommitOffsetSettings build() {
return new CommitOffsetSettings(this);
Expand Down