Skip to content

Commit ca1f264

Browse files
MrLolthe1stMrLolthe1st
committed
fix
1 parent 30e69ac commit ca1f264

File tree

8 files changed

+18
-21
lines changed

8 files changed

+18
-21
lines changed

‎ydb/library/yql/minikql/computation/mkql_block_reader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ struct TConverterTraits {
184184
using TTuple = TTupleBlockItemConverter<Nullable>;
185185
template <typename T, bool Nullable>
186186
using TFixedSize = TFixedSizeBlockItemConverter<T, Nullable>;
187-
template <typename TStringType, bool Nullable, NUdf::EDataSlot OriginalT = NUdf::EDataSlot::String, NUdf::EPgStringType PgString = NUdf::EPgStringType::None>
187+
template <typename TStringType, bool Nullable, NUdf::EDataSlot TOriginal = NUdf::EDataSlot::String, NUdf::EPgStringType PgString = NUdf::EPgStringType::None>
188188
using TStrings = TStringBlockItemConverter<TStringType, Nullable, PgString>;
189189
using TExtOptional = TExternalOptionalBlockItemConverter;
190190

‎ydb/library/yql/minikql/computation/mkql_block_transport.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ struct TSerializerTraits {
500500
using TTuple = TTupleBlockSerializer<Nullable>;
501501
template <typename T, bool Nullable>
502502
using TFixedSize = TFixedSizeBlockSerializer<sizeof(T), Nullable>;
503-
template <typename TStringType, bool Nullable, NUdf::EDataSlot OriginalT = NUdf::EDataSlot::String>
503+
template <typename TStringType, bool Nullable, NUdf::EDataSlot TOriginal = NUdf::EDataSlot::String>
504504
using TStrings = TStringBlockSerializer<TStringType, Nullable>;
505505
using TExtOptional = TExtOptionalBlockSerializer;
506506

@@ -519,7 +519,7 @@ struct TDeserializerTraits {
519519
using TTuple = TTupleBlockDeserializer<Nullable>;
520520
template <typename T, bool Nullable>
521521
using TFixedSize = TFixedSizeBlockDeserializer<sizeof(T), Nullable>;
522-
template <typename TStringType, bool Nullable, NUdf::EDataSlot OriginalT = NUdf::EDataSlot::String>
522+
template <typename TStringType, bool Nullable, NUdf::EDataSlot TOriginal = NUdf::EDataSlot::String>
523523
using TStrings = TStringBlockDeserializer<TStringType, Nullable>;
524524
using TExtOptional = TExtOptionalBlockDeserializer;
525525

‎ydb/library/yql/minikql/mkql_type_builder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,7 +2425,7 @@ struct TComparatorTraits {
24252425
using TTuple = NUdf::TTupleBlockItemComparator<Nullable>;
24262426
template <typename T, bool Nullable>
24272427
using TFixedSize = NUdf::TFixedSizeBlockItemComparator<T, Nullable>;
2428-
template <typename TStringType, bool Nullable, NUdf::EDataSlot OriginalT = NUdf::EDataSlot::String>
2428+
template <typename TStringType, bool Nullable, NUdf::EDataSlot TOriginal = NUdf::EDataSlot::String>
24292429
using TStrings = NUdf::TStringBlockItemComparator<TStringType, Nullable>;
24302430
using TExtOptional = NUdf::TExternalOptionalBlockItemComparator;
24312431

@@ -2441,7 +2441,7 @@ struct THasherTraits {
24412441
using TTuple = NUdf::TTupleBlockItemHasher<Nullable>;
24422442
template <typename T, bool Nullable>
24432443
using TFixedSize = NUdf::TFixedSizeBlockItemHasher<T, Nullable>;
2444-
template <typename TStringType, bool Nullable, NUdf::EDataSlot OriginalT = NUdf::EDataSlot::String>
2444+
template <typename TStringType, bool Nullable, NUdf::EDataSlot TOriginal = NUdf::EDataSlot::String>
24452445
using TStrings = NUdf::TStringBlockItemHasher<TStringType, Nullable>;
24462446
using TExtOptional = NUdf::TExternalOptionalBlockItemHasher;
24472447

‎ydb/library/yql/providers/yt/provider/ut/yql_yt_dq_integration_ut.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ struct TTestSetup {
1313
, State(MakeIntrusive<TYtState>())
1414
{
1515
State->Types = TypesCtx.Get();
16-
auto functionRegistry = NKikimr::NMiniKQL::CreateFunctionRegistry(NKikimr::NMiniKQL::IBuiltinFunctionRegistry::TPtr(nullptr));
17-
State->DqIntegration_ = CreateYtDqIntegration(State.Get(), functionRegistry.Get());
16+
State->DqIntegration_ = CreateYtDqIntegration(State.Get());
1817

1918
}
2019

‎ydb/library/yql/providers/yt/provider/yql_yt_dq_integration.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ using namespace NNodes;
4040

4141
class TYtDqIntegration: public TDqIntegrationBase {
4242
public:
43-
TYtDqIntegration(TYtState* state, const NKikimr::NMiniKQL::IFunctionRegistry& functionRegistry)
43+
TYtDqIntegration(TYtState* state)
4444
: State_(state)
45-
, ArrowResolver_(MakeSimpleArrowResolver(functionRegistry))
4645
{
4746
}
4847

@@ -377,7 +376,7 @@ class TYtDqIntegration: public TDqIntegrationBase {
377376
subTypeAnn.emplace_back(type->GetItemType());
378377
}
379378

380-
if (ArrowResolver_->AreTypesSupported(ctx.GetPosition(node.Pos()), subTypeAnn, ctx) != IArrowResolver::EStatus::OK) {
379+
if (State_->Types->ArrowResolver->AreTypesSupported(ctx.GetPosition(node.Pos()), subTypeAnn, ctx) != IArrowResolver::EStatus::OK) {
381380
return false;
382381
}
383382

@@ -675,12 +674,11 @@ class TYtDqIntegration: public TDqIntegrationBase {
675674

676675
private:
677676
TYtState* State_;
678-
IArrowResolver::TPtr ArrowResolver_;
679677
};
680678

681-
THolder<IDqIntegration> CreateYtDqIntegration(TYtState* state, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry) {
679+
THolder<IDqIntegration> CreateYtDqIntegration(TYtState* state) {
682680
Y_ABORT_UNLESS(state);
683-
return MakeHolder<TYtDqIntegration>(state, *functionRegistry);
681+
return MakeHolder<TYtDqIntegration>(state);
684682
}
685683

686684
}

‎ydb/library/yql/providers/yt/provider/yql_yt_dq_integration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
namespace NYql {
1111

12-
THolder<IDqIntegration> CreateYtDqIntegration(TYtState* state, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry);
12+
THolder<IDqIntegration> CreateYtDqIntegration(TYtState* state);
1313

1414
}

‎ydb/library/yql/providers/yt/provider/yql_yt_provider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ TDataProviderInitializer GetYtNativeDataProviderInitializer(IYtGateway::TPtr gat
356356
ytState->SessionId = sessionId;
357357
ytState->Gateway = gateway;
358358
ytState->Types = typeCtx.Get();
359-
ytState->DqIntegration_ = CreateYtDqIntegration(ytState.Get(), functionRegistry);
359+
ytState->DqIntegration_ = CreateYtDqIntegration(ytState.Get());
360360

361361
TStatWriter statWriter = [ytState](ui32 publicId, const TVector<TOperationStatistics::TEntry>& stat) {
362362
with_lock(ytState->StatisticsMutex) {

‎ydb/library/yql/public/udf/arrow/block_reader.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class TFixedSizeBlockReader final : public IBlockReader {
9797
}
9898
};
9999

100-
template<typename TStringType, bool Nullable, NKikimr::NUdf::EDataSlot OriginalT = NKikimr::NUdf::EDataSlot::String>
100+
template<typename TStringType, bool Nullable, NKikimr::NUdf::EDataSlot TOriginal = NKikimr::NUdf::EDataSlot::String>
101101
class TStringBlockReader final : public IBlockReader {
102102
public:
103103
using TOffset = typename TStringType::offset_type;
@@ -364,8 +364,8 @@ struct TReaderTraits {
364364
using TTuple = TTupleBlockReader<Nullable>;
365365
template <typename T, bool Nullable>
366366
using TFixedSize = TFixedSizeBlockReader<T, Nullable>;
367-
template <typename TStringType, bool Nullable, NKikimr::NUdf::EDataSlot OriginalT>
368-
using TStrings = TStringBlockReader<TStringType, Nullable, OriginalT>;
367+
template <typename TStringType, bool Nullable, NKikimr::NUdf::EDataSlot TOriginal>
368+
using TStrings = TStringBlockReader<TStringType, Nullable, TOriginal>;
369369
using TExtOptional = TExternalOptionalBlockReader;
370370

371371
static std::unique_ptr<TResult> MakePg(const TPgTypeDescription& desc, const IPgBuilder* pgBuilder) {
@@ -396,12 +396,12 @@ std::unique_ptr<typename TTraits::TResult> MakeFixedSizeBlockReaderImpl(bool isO
396396
}
397397
}
398398

399-
template <typename TTraits, typename T, NKikimr::NUdf::EDataSlot OriginalT>
399+
template <typename TTraits, typename T, NKikimr::NUdf::EDataSlot TOriginal>
400400
std::unique_ptr<typename TTraits::TResult> MakeStringBlockReaderImpl(bool isOptional) {
401401
if (isOptional) {
402-
return std::make_unique<typename TTraits::template TStrings<T, true, OriginalT>>();
402+
return std::make_unique<typename TTraits::template TStrings<T, true, TOriginal>>();
403403
} else {
404-
return std::make_unique<typename TTraits::template TStrings<T, false, OriginalT>>();
404+
return std::make_unique<typename TTraits::template TStrings<T, false, TOriginal>>();
405405
}
406406
}
407407

0 commit comments

Comments
 (0)