Skip to content

fix row size estimation in stream lookup join (#19094) #19114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gridnevvvit merged 1 commit into from
Jun 1, 2025
Merged

fix row size estimation in stream lookup join (#19094) #19114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 2 additions & 9 deletions ydb/core/kqp/runtime/kqp_stream_lookup_worker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <ydb/public/api/protos/ydb_status_codes.pb.h>

#include <yql/essentials/minikql/mkql_node_serialization.h>
#include <ydb/library/yql/dq/runtime/dq_transport.h>

namespace NKikimr {
namespace NKqp {
Expand Down Expand Up @@ -57,11 +58,6 @@ std::vector<std::pair<ui64, TOwnedTableRange>> GetRangePartitioning(const TKqpSt
return rangePartition;
}

NScheme::TTypeInfo UnpackTypeInfo(NKikimr::NMiniKQL::TType* type) {
YQL_ENSURE(type);
return NScheme::TypeInfoFromMiniKQLType(type);
}


} // !namespace

Expand Down Expand Up @@ -901,10 +897,7 @@ class TKqpJoinRows : public TKqpStreamLookupWorker {

i64 storageReadBytes = 0;

for (size_t i = 0; i < leftRowType->GetMembersCount(); ++i) {
auto columnTypeInfo = UnpackTypeInfo(leftRowType->GetMemberType(i));
leftRowSize += NMiniKQL::GetUnboxedValueSize(leftRowInfo.Row.GetElement(i), columnTypeInfo).AllocatedBytes;
}
leftRowSize = NYql::NDq::TDqDataSerializer::EstimateSize(leftRowInfo.Row, leftRowType);

if (!rightRow.empty()) {
leftRowInfo.RightRowExist = true;
Expand Down
22 changes: 22 additions & 0 deletions ydb/core/kqp/ut/join/kqp_join_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,28 @@ Y_UNIT_TEST_SUITE(KqpJoin) {
}
}

Y_UNIT_TEST_TWIN(IndexLoookupJoinStructJoin, StreamLookupJoin) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamIdxLookupJoin(StreamLookupJoin);
auto settings = TKikimrSettings().SetAppConfig(appConfig);
TKikimrRunner kikimr(settings);
auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

CreateSampleTables(session);

auto result = session.ExecuteDataQuery(Q_(R"(
$a = AsList(AsStruct(AsStruct("Key" as Key) as join_info), AsStruct(AsStruct("Name1" as Key) as join_info));
SELECT a.join_info.Key as Key, b.Value as Value from AS_TABLE($a) as a
LEFT JOIN `/Root/Join1_3` as b
ON a.join_info.Key = b.Key
)"), TTxControl::BeginTx().CommitTx()).ExtractValueSync();
UNIT_ASSERT(result.IsSuccess());

CompareYson(R"([["Key";#];["Name1";[1001]]])",
FormatResultSetYson(result.GetResultSet(0)));
}

Y_UNIT_TEST(IdxLookupPartialLeftPredicate) {
TKikimrSettings settings;
TKikimrRunner kikimr(settings);
Expand Down
Loading