Skip to content

Commit 9546e40

Browse files
GazizonokiGazizonoki
committed
[C++ SDK] Adapted basic usage topic test for ydb-cpp-sdk repo (#18707)
1 parent 6542ce5 commit 9546e40

File tree

10 files changed

+1117
-858
lines changed

10 files changed

+1117
-858
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ jobs:
116116
- name: Test
117117
shell: bash
118118
run: |
119-
ctest -j$(nproc) --preset integration
119+
YDB_VERSION=${{ matrix.ydb-version }} ctest -j$(nproc) --preset integration

‎src/client/persqueue_public/CMakeLists.txt‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,12 @@
11
add_subdirectory(codecs)
22
add_subdirectory(impl)
3+
add_subdirectory(include)
34

45
_ydb_sdk_add_library(cpp-client-ydb_persqueue_public INTERFACE)
56

67
target_link_libraries(cpp-client-ydb_persqueue_public INTERFACE
78
yutil
8-
cpp-client-ydb_persqueue_core
9+
client-ydb_persqueue_public-include
910
client-ydb_persqueue_public-impl
1011
client-ydb_persqueue_public-codecs
1112
)
12-
13-
generate_enum_serilization(cpp-client-ydb_persqueue_public
14-
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/control_plane.h
15-
INCLUDE_HEADERS
16-
src/client/persqueue_public/include/control_plane.h
17-
)
18-
19-
generate_enum_serilization(cpp-client-ydb_persqueue_public
20-
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/read_events.h
21-
INCLUDE_HEADERS
22-
src/client/persqueue_public/include/read_events.h
23-
)
24-
25-
generate_enum_serilization(cpp-client-ydb_persqueue_public
26-
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/write_events.h
27-
INCLUDE_HEADERS
28-
src/client/persqueue_public/include/write_events.h
29-
)
30-
31-
generate_enum_serilization(cpp-client-ydb_persqueue_public
32-
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/write_session.h
33-
INCLUDE_HEADERS
34-
src/client/persqueue_public/include/write_session.h
35-
)

‎src/client/persqueue_public/impl/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ target_link_libraries(client-ydb_persqueue_public-impl PUBLIC
1212
impl-ydb_internal-make_request
1313
client-ydb_common_client-impl
1414
client-ydb_driver
15+
client-ydb_persqueue_public-include
1516
string_utils-misc
1617
)
1718

‎src/client/persqueue_public/impl/persqueue.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TCredentials::TCredentials(const Ydb::PersQueue::V1::Credentials& settings)
4848
break;
4949
}
5050
default: {
51-
ythrow yexception() << "unsupported credentials type " << ::NPersQueue::ObfuscateString(ToString(Credentials_));
51+
ythrow yexception() << "unsupported credentials type " << ::NPersQueue::ObfuscateString(Credentials_.ShortDebugString());
5252
}
5353
}
5454
}

‎src/client/persqueue_public/include/CMakeLists.txt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
_ydb_sdk_add_library(client-ydb_persqueue_public-include)
2+
3+
target_link_libraries(client-ydb_persqueue_public-include PUBLIC
4+
yutil
5+
api-grpc
6+
api-grpc-draft
7+
api-protos
8+
)
9+
10+
generate_enum_serilization(client-ydb_persqueue_public-include
11+
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/control_plane.h
12+
INCLUDE_HEADERS
13+
src/client/persqueue_public/include/control_plane.h
14+
)
15+
16+
generate_enum_serilization(client-ydb_persqueue_public-include
17+
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/read_events.h
18+
INCLUDE_HEADERS
19+
src/client/persqueue_public/include/read_events.h
20+
)
21+
22+
generate_enum_serilization(client-ydb_persqueue_public-include
23+
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/write_events.h
24+
INCLUDE_HEADERS
25+
src/client/persqueue_public/include/write_events.h
26+
)
27+
28+
generate_enum_serilization(client-ydb_persqueue_public-include
29+
${YDB_SDK_SOURCE_DIR}/src/client/persqueue_public/include/write_session.h
30+
INCLUDE_HEADERS
31+
src/client/persqueue_public/include/write_session.h
32+
)

‎src/client/topic/impl/read_session_impl.ipp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ inline void TSingleClusterReadSessionImpl<true>::OnReadDoneImpl(
994994
BreakConnectionAndReconnectImpl(EStatus::INTERNAL_ERROR,
995995
TStringBuilder()
996996
<< "Got unexpected partition stream data message. Topic: "
997-
<< partitionData.topic() << ". Partition: " << partitionData.partition()
997+
<< partitionData.topic().ShortDebugString() << ". Partition: " << partitionData.partition()
998998
<< " AssignId: " << partitionData.cookie().assign_id(),
999999
deferred);
10001000
return;
@@ -1031,9 +1031,9 @@ inline void TSingleClusterReadSessionImpl<true>::OnReadDoneImpl(
10311031
if (firstOffset == std::numeric_limits<ui64>::max()) {
10321032
BreakConnectionAndReconnectImpl(EStatus::INTERNAL_ERROR,
10331033
TStringBuilder() << "Got empty data message. Topic: "
1034-
<< partitionData.topic()
1034+
<< partitionData.topic().ShortDebugString()
10351035
<< ". Partition: " << partitionData.partition()
1036-
<< " message: " << msg,
1036+
<< " message: " << msg.ShortDebugString(),
10371037
deferred);
10381038
return;
10391039
}
@@ -1042,7 +1042,7 @@ inline void TSingleClusterReadSessionImpl<true>::OnReadDoneImpl(
10421042
if (!CookieMapping.AddMapping(cookie)) {
10431043
BreakConnectionAndReconnectImpl(EStatus::INTERNAL_ERROR,
10441044
TStringBuilder() << "Got unexpected data message. Topic: "
1045-
<< partitionData.topic()
1045+
<< partitionData.topic().ShortDebugString()
10461046
<< ". Partition: " << partitionData.partition()
10471047
<< ". Cookie mapping already has such cookie",
10481048
deferred);
@@ -1150,7 +1150,7 @@ inline void TSingleClusterReadSessionImpl<true>::OnReadDoneImpl(
11501150
TDeferredActions<true>& deferred) {
11511151
Y_ABORT_UNLESS(Lock.IsLocked());
11521152

1153-
LOG_LAZY(Log, TLOG_DEBUG, GetLogPrefix() << "Committed response: " << msg);
1153+
LOG_LAZY(Log, TLOG_DEBUG, GetLogPrefix() << "Committed response: " << msg.ShortDebugString());
11541154

11551155
std::map<ui64, TIntrusivePtr<TPartitionStreamImpl<true>>> partitionStreams;
11561156
for (const Ydb::PersQueue::V1::CommitCookie& cookieProto : msg.cookies()) {

0 commit comments

Comments
 (0)