Skip to content

Commit c5d8022

Browse files
dmasloffdmasloff
authored
Merge 7f6ed7d into ec4bf84 
2 parents ec4bf84 + 7f6ed7d commit c5d8022

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎ydb/library/yql/providers/generic/actors/ut/yql_generic_lookup_actor_ut.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Y_UNIT_TEST_SUITE(GenericProviderLookupActor) {
3030
return result;
3131
}
3232

33-
//Simple actor to call IDqAsyncLookupSource::AsyncLookup from an actor system's thread
33+
// Simple actor to call IDqAsyncLookupSource::AsyncLookup from an actor system's thread
3434
class TCallLookupActor: public TActorBootstrapped<TCallLookupActor> {
3535
public:
3636
TCallLookupActor(
@@ -135,7 +135,7 @@ Y_UNIT_TEST_SUITE(GenericProviderLookupActor) {
135135
.AddResponse(
136136
MakeRecordBatch(
137137
MakeArray<arrow::UInt64Builder, uint64_t>("id", {0, 1, 2}, arrow::uint64()),
138-
MakeArray<arrow::UInt64Builder, uint64_t>("optional_id", {100, 101, 103}, arrow::uint64()), //the last value is intentially wrong
138+
MakeArray<arrow::UInt64Builder, uint64_t>("optional_id", {100, 101, 103}, arrow::uint64()), // the last value is intentially wrong
139139
MakeArray<arrow::StringBuilder, std::string>("string_value", {"a", "b", "c"}, arrow::utf8())
140140
),
141141
NewSuccess()
@@ -184,7 +184,7 @@ Y_UNIT_TEST_SUITE(GenericProviderLookupActor) {
184184
request.emplace(std::move(key), NYql::NUdf::TUnboxedValue{});
185185
}
186186

187-
guard.Release(); //let actors use alloc
187+
guard.Release(); // let actors use alloc
188188

189189
auto callLookupActor = new TCallLookupActor(alloc, lookupSource, std::move(request));
190190
runtime.Register(callLookupActor);
@@ -213,4 +213,4 @@ Y_UNIT_TEST_SUITE(GenericProviderLookupActor) {
213213
}
214214
}
215215

216-
} //Y_UNIT_TEST_SUITE(GenericProviderLookupActor)
216+
} // Y_UNIT_TEST_SUITE(GenericProviderLookupActor)

‎ydb/library/yql/providers/generic/actors/yql_generic_base_actor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace NYql::NDq {
1010

1111
template <typename TDerived>
1212
class TGenericBaseActor: public NActors::TActorBootstrapped<TDerived> {
13-
protected: //Events
13+
protected: // Events
1414
// Event ids
1515
enum EEventIds: ui32 {
1616
EvBegin = EventSpaceBegin(NActors::TEvents::ES_PRIVATE),
@@ -89,7 +89,7 @@ namespace NYql::NDq {
8989
NConnector::NApi::TError Error;
9090
};
9191

92-
protected: //TODO move common logic here
92+
protected: // TODO move common logic here
9393
};
9494

9595
} // namespace NYql::NDq

‎ydb/library/yql/providers/generic/actors/yql_generic_lookup_actor.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ namespace NYql::NDq {
4444

4545
template <typename T>
4646
T ExtractFromConstFuture(const NThreading::TFuture<T>& f) {
47-
//We want to avoid making a copy of data stored in a future.
48-
//But there is no direct way to extract data from a const future5
49-
//So, we make a copy of the future, that is cheap. Then, extract the value from this copy.
50-
//It destructs the value in the original future, but this trick is legal and documented here:
51-
//https://docs.yandex-team.ru/arcadia-cpp/cookbook/concurrency
47+
// We want to avoid making a copy of data stored in a future.
48+
// But there is no direct way to extract data from a const future5
49+
// So, we make a copy of the future, that is cheap. Then, extract the value from this copy.
50+
// It destructs the value in the original future, but this trick is legal and documented here:
51+
// https://docs.yandex-team.ru/arcadia-cpp/cookbook/concurrency
5252
return NThreading::TFuture<T>(f).ExtractValueSync();
5353
}
5454

@@ -112,7 +112,7 @@ namespace NYql::NDq {
112112

113113
static constexpr char ActorName[] = "GENERIC_PROVIDER_LOOKUP_ACTOR";
114114

115-
private: //IDqAsyncLookupSource
115+
private: // IDqAsyncLookupSource
116116
size_t GetMaxSupportedKeysInRequest() const override {
117117
return MaxKeysInRequest;
118118
}
@@ -121,7 +121,7 @@ namespace NYql::NDq {
121121
CreateRequest(std::move(request));
122122
}
123123

124-
private: //events
124+
private: // events
125125
STRICT_STFUNC(StateFunc,
126126
hFunc(TEvListSplitsIterator, Handle);
127127
hFunc(TEvListSplitsPart, Handle);
@@ -238,7 +238,7 @@ namespace NYql::NDq {
238238
void ProcessReceivedData(const NConnector::NApi::TReadSplitsResponse& resp) {
239239
Y_ABORT_UNLESS(resp.payload_case() == NConnector::NApi::TReadSplitsResponse::PayloadCase::kArrowIpcStreaming);
240240
auto guard = Guard(*Alloc);
241-
NKikimr::NArrow::NSerialization::TSerializerContainer deser = NKikimr::NArrow::NSerialization::TSerializerContainer::GetDefaultSerializer(); //todo move to class' member
241+
NKikimr::NArrow::NSerialization::TSerializerContainer deser = NKikimr::NArrow::NSerialization::TSerializerContainer::GetDefaultSerializer(); // todo move to class' member
242242
const auto& data = deser->Deserialize(resp.arrow_ipc_streaming());
243243
Y_ABORT_UNLESS(data.ok());
244244
const auto& value = data.ValueOrDie();
@@ -259,7 +259,7 @@ namespace NYql::NDq {
259259
(ColumnDestinations[j].first == EColumnDestination::Key ? keyItems : outputItems)[ColumnDestinations[j].second] = columns[j][i];
260260
}
261261
if (auto* v = Request.FindPtr(key)) {
262-
*v = std::move(output); //duplicates will be overwritten
262+
*v = std::move(output); // duplicates will be overwritten
263263
}
264264
}
265265
}
@@ -316,8 +316,8 @@ namespace NYql::NDq {
316316

317317
NYql::NConnector::NApi::TDataSourceInstance GetDataSourceInstanceWithToken() const {
318318
auto dsi = LookupSource.data_source_instance();
319-
//Note: returned token may be stale and we have no way to check or recover here
320-
//Consider to redesign ICredentialsProvider
319+
// Note: returned token may be stale and we have no way to check or recover here
320+
// Consider to redesign ICredentialsProvider
321321
TokenProvider->MaybeFillToken(dsi);
322322
return dsi;
323323
}
@@ -361,13 +361,13 @@ namespace NYql::NDq {
361361
const NYql::Generic::TLookupSource LookupSource;
362362
const NKikimr::NMiniKQL::TStructType* const KeyType;
363363
const NKikimr::NMiniKQL::TStructType* const PayloadType;
364-
const NKikimr::NMiniKQL::TStructType* const SelectResultType; //columns from KeyType + PayloadType
364+
const NKikimr::NMiniKQL::TStructType* const SelectResultType; // columns from KeyType + PayloadType
365365
const NKikimr::NMiniKQL::THolderFactory& HolderFactory;
366366
const std::vector<std::pair<EColumnDestination, size_t>> ColumnDestinations;
367367
const size_t MaxKeysInRequest;
368368
std::atomic_bool InProgress;
369369
IDqAsyncLookupSource::TUnboxedValueMap Request;
370-
NConnector::IReadSplitsStreamIterator::TPtr ReadSplitsIterator; //TODO move me to TEvReadSplitsPart
370+
NConnector::IReadSplitsStreamIterator::TPtr ReadSplitsIterator; // TODO move me to TEvReadSplitsPart
371371
NKikimr::NMiniKQL::TKeyPayloadPairVector LookupResult;
372372
};
373373

‎ydb/library/yql/providers/generic/actors/yql_generic_read_actor.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ namespace NYql::NDq {
2727

2828
template <typename T>
2929
T ExtractFromConstFuture(const NThreading::TFuture<T>& f) {
30-
//We want to avoid making a copy of data stored in a future.
31-
//But there is no direct way to extract data from a const future
32-
//So, we make a copy of the future, that is cheap. Then, extract the value from this copy.
33-
//It destructs the value in the original future, but this trick is legal and documented here:
34-
//https://docs.yandex-team.ru/arcadia-cpp/cookbook/concurrency
30+
// We want to avoid making a copy of data stored in a future.
31+
// But there is no direct way to extract data from a const future
32+
// So, we make a copy of the future, that is cheap. Then, extract the value from this copy.
33+
// It destructs the value in the original future, but this trick is legal and documented here:
34+
// https://docs.yandex-team.ru/arcadia-cpp/cookbook/concurrency
3535
return NThreading::TFuture<T>(f).ExtractValueSync();
3636
}
3737

‎ydb/library/yql/providers/generic/actors/yql_generic_token_provider.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ namespace NYql::NDq {
6565
}
6666
return std::make_unique<TGenericTokenProvider>();
6767
}
68-
} //namespace NYql::NDq
68+
} // namespace NYql::NDq

‎ydb/library/yql/providers/generic/actors/yql_generic_token_provider.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NYql::NDq {
1212
class TGenericTokenProvider {
1313
public:
1414
using TPtr = std::unique_ptr<TGenericTokenProvider>;
15-
TGenericTokenProvider() = default; //No auth required
15+
TGenericTokenProvider() = default; // No auth required
1616
TGenericTokenProvider(const TString& staticIamToken);
1717
TGenericTokenProvider(
1818
const TString& serviceAccountId,
@@ -31,4 +31,4 @@ namespace NYql::NDq {
3131
const TString& staticIamToken,
3232
const TString& serviceAccountId, const TString& ServiceAccountIdSignature,
3333
const ISecuredServiceAccountCredentialsFactory::TPtr& credentialsFactory);
34-
} //namespace NYql::NDq
34+
} // namespace NYql::NDq

‎ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/test_creds.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ namespace NYql::NTestCreds {
3333
}
3434
};
3535

36-
} //namespace NYql::NTestCreds
36+
} // namespace NYql::NTestCreds

‎ydb/library/yql/providers/generic/provider/yql_generic_settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ namespace NYql {
4242
THashMap<TString, TGenericClusterConfig> ClusterNamesToClusterConfigs; // cluster name -> cluster config
4343
THashMap<TString, TVector<TString>> DatabaseIdsToClusterNames; // database id -> cluster name
4444
};
45-
} //namespace NYql
45+
} // namespace NYql

0 commit comments

Comments
 (0)