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
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ public CompletableFuture<Status> start(Observer<R> observer) {
public void sendNext(W message) {
synchronized (call) {
if (flush()) {
if (logger.isTraceEnabled()) {
String msg = TextFormat.shortDebugString((Message) message);
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, msg);
}
call.sendMessage(message);
} else {
messagesQueue.add(message);
Expand All @@ -103,7 +107,8 @@ private boolean flush() {
}

if (logger.isTraceEnabled()) {
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, TextFormat.shortDebugString((Message) next));
String msg = TextFormat.shortDebugString((Message) next);
logger.trace("ReadWriteStreamCall[{}] --> {}", traceId, msg);
}
call.sendMessage(next);
}
Expand Down
8 changes: 6 additions & 2 deletions topic/src/main/java/tech/ydb/topic/TopicRpc.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,13 @@ CompletableFuture<Result<YdbTopic.DescribeConsumerResult>> describeConsumer(
CompletableFuture<Status> updateOffsetsInTransaction(YdbTopic.UpdateOffsetsInTransactionRequest request,
GrpcRequestSettings settings);

GrpcReadWriteStream<YdbTopic.StreamWriteMessage.FromServer, YdbTopic.StreamWriteMessage.FromClient> writeSession();
GrpcReadWriteStream<YdbTopic.StreamWriteMessage.FromServer, YdbTopic.StreamWriteMessage.FromClient> writeSession(
String traceId
);

GrpcReadWriteStream<YdbTopic.StreamReadMessage.FromServer, YdbTopic.StreamReadMessage.FromClient> readSession();
GrpcReadWriteStream<YdbTopic.StreamReadMessage.FromServer, YdbTopic.StreamReadMessage.FromClient> readSession(
String traceId
);

ScheduledExecutorService getScheduler();
}
24 changes: 12 additions & 12 deletions topic/src/main/java/tech/ydb/topic/impl/GrpcTopicRpc.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@ public CompletableFuture<Status> updateOffsetsInTransaction(YdbTopic.UpdateOffse
}

@Override
public GrpcReadWriteStream<
YdbTopic.StreamWriteMessage.FromServer,
YdbTopic.StreamWriteMessage.FromClient
> writeSession() {
return transport.readWriteStreamCall(TopicServiceGrpc.getStreamWriteMethod(),
GrpcRequestSettings.newBuilder().build());
public GrpcReadWriteStream<YdbTopic.StreamWriteMessage.FromServer, YdbTopic.StreamWriteMessage.FromClient>
writeSession(String streamId) {
return transport.readWriteStreamCall(
TopicServiceGrpc.getStreamWriteMethod(),
GrpcRequestSettings.newBuilder().withTraceId(streamId).build()
);
}

@Override
public GrpcReadWriteStream<
YdbTopic.StreamReadMessage.FromServer,
YdbTopic.StreamReadMessage.FromClient
> readSession() {
return transport.readWriteStreamCall(TopicServiceGrpc.getStreamReadMethod(),
GrpcRequestSettings.newBuilder().build());
public GrpcReadWriteStream<YdbTopic.StreamReadMessage.FromServer, YdbTopic.StreamReadMessage.FromClient>
readSession(String streamId) {
return transport.readWriteStreamCall(
TopicServiceGrpc.getStreamReadMethod(),
GrpcRequestSettings.newBuilder().withTraceId(streamId).build()
);
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions topic/src/main/java/tech/ydb/topic/read/impl/ReadSession.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@
public abstract class ReadSession extends SessionBase<FromServer, FromClient> {
private static final Logger logger = LoggerFactory.getLogger(ReadSession.class);

public ReadSession(TopicRpc rpc) {
super(rpc.readSession());
protected final String streamId;

public ReadSession(TopicRpc rpc, String streamId) {
super(rpc.readSession(streamId));
this.streamId = streamId;
}

@Override
Expand Down
Loading
Loading