Skip to content

YDB-3080 Fix UUID prefix in select #3030

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
merged 3 commits into from
Mar 22, 2024
Merged

YDB-3080 Fix UUID prefix in select #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56417a6
.
SammyVimes Mar 21, 2024
94101d3
.
SammyVimes Mar 21, 2024
7e4d1d7
.
SammyVimes Mar 21, 2024
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
6 changes: 6 additions & 0 deletions ydb/core/kqp/opt/kqp_query_plan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,12 @@ class TxPlanSerializer {
}
}

if (auto literal = key.Maybe<TCoUuid>()) {
TStringStream out;
NUuid::UuidBytesToString(literal.Cast().Literal().Value().Data(), out);
return out.Str();
}

if (auto literal = key.Maybe<TCoDataCtor>()) {
return literal.Cast().Literal().StringValue();
}
Expand Down
12 changes: 12 additions & 0 deletions ydb/core/kqp/provider/yql_kikimr_provider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,12 @@ void FillLiteralProtoImpl(const NNodes::TCoDataCtor& literal, TProto& proto) {
protoValue.SetHi128(*reinterpret_cast<ui64*>(p + 8));
break;
}
case EDataSlot::Uuid: {
const ui64* uuidData = reinterpret_cast<const ui64*>(value.Data());
protoValue.SetLow128(uuidData[0]);
protoValue.SetHi128(uuidData[1]);
break;
}

default:
YQL_ENSURE(false, "Unexpected type slot " << slot);
Expand Down Expand Up @@ -668,6 +674,12 @@ void FillLiteralProto(const NNodes::TCoDataCtor& literal, Ydb::TypedValue& proto
protoValue.set_high_128(*reinterpret_cast<ui64*>(p + 8));
break;
}
case EDataSlot::Uuid: {
const ui64* uuidData = reinterpret_cast<const ui64*>(value.Data());
protoValue.set_low_128(uuidData[0]);
protoValue.set_high_128(uuidData[1]);
break;
}

default:
YQL_ENSURE(false, "Unexpected type slot " << slot);
Expand Down
88 changes: 88 additions & 0 deletions ydb/core/kqp/ut/yql/kqp_yql_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,94 @@ Y_UNIT_TEST_SUITE(KqpYql) {
}
}

Y_UNIT_TEST(TestUuidPrimaryKeyPrefixSearch) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
.SetEnableUuidAsPrimaryKey(true)
.SetKqpSettings({setting});
TKikimrRunner kikimr(serverSettings.SetWithSampleTables(false));

auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

TVector<TString> testUuids = {
"5b99a330-04ef-4f1a-9b64-ba6d5f44eafe",
"afcbef30-9ac3-481a-aa6a-8d9b785dbb0a",
"b91cd23b-861c-4cc1-9119-801a4dac1cb9",
"65df9ecc-a97d-47b2-ae56-3c023da6ee8c",
};

{
const auto query = Q_(R"(
CREATE TABLE test(
key uuid NOT NULL,
val int,
PRIMARY KEY (key)
);
)");
auto result = session.ExecuteSchemeQuery(query).ExtractValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}
{
int val = 0;
for (const auto& uuid : testUuids) {
const auto query = Sprintf("\
INSERT INTO test (key, val)\n\
VALUES (Uuid(\"%s\"), %u);\n\
", uuid.Data(), val++);
auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx()).ExtractValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}
}
{
int val = 0;
for (const auto& uuid : testUuids) {
const auto query = Sprintf("SELECT * FROM test WHERE key=Uuid(\"%s\");", uuid.Data());
auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx()).ExtractValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());

TResultSetParser parser(result.GetResultSetParser(0));
UNIT_ASSERT(parser.TryNextRow());
UNIT_ASSERT_VALUES_EQUAL(parser.ColumnParser("val").GetOptionalInt32().GetRef(), val++);
UNIT_ASSERT_VALUES_EQUAL(parser.RowsCount(), 1);
}
}
}

Y_UNIT_TEST(TestUuidDefaultColumn) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
auto setting = NKikimrKqp::TKqpSetting();
auto serverSettings = TKikimrSettings()
.SetAppConfig(appConfig)
.SetEnableUuidAsPrimaryKey(true)
.SetKqpSettings({setting});
TKikimrRunner kikimr(serverSettings.SetWithSampleTables(false));

auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

{
const auto query = Q_(R"(
CREATE TABLE test(
key int NOT NULL,
val uuid NOT NULL DEFAULT Uuid("65df9ecc-a97d-47b2-ae56-3c023da6ee8c"),
PRIMARY KEY (key)
);
)");
auto result = session.ExecuteSchemeQuery(query).ExtractValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}
{
const auto query = "INSERT INTO test (key) VALUES (0);";
auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx()).ExtractValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
}
}

Y_UNIT_TEST(UuidPrimaryKeyBulkUpsert) {
auto settings = TKikimrSettings()
.SetEnableUuidAsPrimaryKey(true)
Expand Down
6 changes: 6 additions & 0 deletions ydb/library/uuid/uuid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ static void WriteHex(ui16 bytes, IOutputStream& out, bool reverseBytes = false)
}
}

void UuidBytesToString(TString in, IOutputStream& out) {
ui16 dw[8];
std::memcpy(dw, in.Data(), sizeof(dw));
NUuid::UuidToString(dw, out);
}

void UuidToString(ui16 dw[8], IOutputStream& out) {
WriteHex(dw[1], out);
WriteHex(dw[0], out);
Expand Down
1 change: 1 addition & 0 deletions ydb/library/uuid/uuid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace NUuid {

static constexpr ui32 UUID_LEN = 16;

void UuidBytesToString(TString in, IOutputStream& out);
void UuidToString(ui16 dw[8], IOutputStream& out);
void UuidHalfsToByteString(ui64 low, ui64 hi, IOutputStream& out);

Expand Down