Skip to content
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

Embed short blobs in TCell, fix empty string #13194

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Embed short blobs in TCell, fix empty string #13194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84db424
Fix empty string
zverevgeny Jan 7, 2025
17ee0c0
fix
zverevgeny Jan 7, 2025
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
15 changes: 10 additions & 5 deletions ydb/core/kqp/runtime/kqp_write_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,14 @@ class TRowBuilder {
? NYql::NUdf::TStringRef(cellInfo.PgBinaryValue)
: cellInfo.Value.AsStringRef();

char* initialPtr = dataPtr;
std::memcpy(initialPtr, ref.Data(), ref.Size());
dataPtr += ref.Size();
return TCell(initialPtr, ref.Size());
if (TCell::CanInline(ref.Size())) {
return TCell(ref.Data(), ref.Size());
} else {
char* initialPtr = dataPtr;
std::memcpy(initialPtr, ref.Data(), ref.Size());
dataPtr += ref.Size();
return TCell(initialPtr, ref.Size());
}
}

size_t GetCellSize(const TCellInfo& cellInfo) const {
Expand All @@ -301,7 +305,8 @@ class TRowBuilder {
if (cellInfo.Type.GetTypeId() == NScheme::NTypeIds::Pg) {
return cellInfo.PgBinaryValue.size();
}
return cellInfo.Value.AsStringRef().Size();
const auto s = cellInfo.Value.AsStringRef().Size();
return TCell::CanInline(s) ? 0 : s;
}

TCharVectorPtr Allocate(size_t size) {
Expand Down
38 changes: 38 additions & 0 deletions ydb/core/kqp/ut/olap/kqp_olap_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3122,6 +3122,44 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
)", FormatResultSetYson(resultSet));
}
}

Y_UNIT_TEST(InsertEmptyString) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableColumnShardConfig()->SetAllowNullableColumnsInPK(true);
auto settings = TKikimrSettings().SetAppConfig(appConfig).SetWithSampleTables(false);
TTestHelper testHelper(settings);

TVector<TTestHelper::TColumnSchema> schema = {
TTestHelper::TColumnSchema().SetName("id").SetType(NScheme::NTypeIds::Int64).SetNullable(false),
TTestHelper::TColumnSchema().SetName("value").SetType(NScheme::NTypeIds::String).SetNullable(false),
};
TTestHelper::TColumnTable testTable;
testTable.SetName("/Root/ttt").SetPrimaryKey({ "id", }).SetSharding({ "id" }).SetSchema(schema);
testHelper.CreateTable(testTable);
auto client = testHelper.GetKikimr().GetQueryClient();
const auto result = client
.ExecuteQuery(
R"(
INSERT INTO `/Root/ttt` (id, value) VALUES
(347, '')
)",
NYdb::NQuery::TTxControl::BeginTx().CommitTx())
.GetValueSync();
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
{
const auto resultSelect = client
.ExecuteQuery(
"SELECT * FROM `/Root/ttt`",
NYdb::NQuery::TTxControl::BeginTx().CommitTx())
.GetValueSync();
UNIT_ASSERT_C(resultSelect.IsSuccess(), resultSelect.GetIssues().ToString());
const auto resultSets = resultSelect.GetResultSets();
UNIT_ASSERT_VALUES_EQUAL(resultSets.size(), 1);
const auto resultSet = resultSets[0];
UNIT_ASSERT_VALUES_EQUAL(resultSet.RowsCount(), 1);
}
}

}

}
Loading