Skip to content

KIKIMR-20082: TableStore/ColumnTable with QueryService #1377

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 10 commits into from
Feb 1, 2024
Merged

KIKIMR-20082: TableStore/ColumnTable with QueryService #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d14676
Initial commit
shnikd Jan 26, 2024
29ed42e
Fixes
shnikd Jan 29, 2024
a3e630a
Fixes
shnikd Jan 30, 2024
76efb8a
Fixes
shnikd Jan 30, 2024
a96421d
Fixes
shnikd Jan 31, 2024
19a8b32
Fixes
shnikd Jan 31, 2024
02f6af3
Fixes
shnikd Jan 31, 2024
9041a5d
Fixes
shnikd Feb 1, 2024
5f86a67
Fixes
shnikd Feb 1, 2024
38ee3b1
Fixes
shnikd Feb 1, 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
30 changes: 30 additions & 0 deletions ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,36 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
break;
}

case NKqpProto::TKqpSchemeOperation::kCreateColumnTable: {
const auto& modifyScheme = schemeOp.GetCreateColumnTable();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kAlterColumnTable: {
const auto& modifyScheme = schemeOp.GetAlterColumnTable();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kCreateTableStore: {
const auto& modifyScheme = schemeOp.GetCreateTableStore();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kAlterTableStore: {
const auto& modifyScheme = schemeOp.GetAlterTableStore();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

case NKqpProto::TKqpSchemeOperation::kDropTableStore: {
const auto& modifyScheme = schemeOp.GetDropTableStore();
ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
break;
}

default:
InternalError(TStringBuilder() << "Unexpected scheme operation: "
<< (ui32) schemeOp.GetOperationCase());
Expand Down
276 changes: 23 additions & 253 deletions ydb/core/kqp/gateway/kqp_ic_gateway.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,51 +877,12 @@ class TKikimrIcGateway : public IKqpGateway {
return tablePromise.GetFuture();
}

TFuture<TGenericResult> CreateColumnTable(NYql::TKikimrTableMetadataPtr metadata, bool createDir) override {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

try {
if (!CheckCluster(metadata->Cluster)) {
return InvalidCluster<TGenericResult>(metadata->Cluster);
}

std::pair<TString, TString> pathPair;
{
TString error;
if (!GetPathPair(metadata->Name, pathPair, error, createDir)) {
return MakeFuture(ResultFromError<TGenericResult>(error));
}
}

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(Database);
if (UserToken) {
ev->Record.SetUserToken(UserToken->GetSerializedToken());
}
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
schemeTx.SetWorkingDir(pathPair.first);

Ydb::StatusIds::StatusCode code;
TString error;

schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpCreateColumnTable);
NKikimrSchemeOp::TColumnTableDescription* tableDesc = schemeTx.MutableCreateColumnTable();

tableDesc->SetName(pathPair.second);
FillColumnTableSchema(*tableDesc->MutableSchema(), *metadata);

if (!FillCreateColumnTableDesc(metadata, *tableDesc, code, error)) {
IKqpGateway::TGenericResult errResult;
errResult.AddIssue(NYql::TIssue(error));
errResult.SetStatus(NYql::YqlStatusFromYdbStatus(code));
return MakeFuture(std::move(errResult));
}

return SendSchemeRequest(ev.Release());
}
catch (yexception& e) {
return MakeFuture(ResultFromException<TGenericResult>(e));
}
TFuture<TGenericResult> CreateColumnTable(NYql::TKikimrTableMetadataPtr metadata,
bool createDir, bool existingOk) override {
Y_UNUSED(metadata);
Y_UNUSED(createDir);
Y_UNUSED(existingOk);
return NotImplemented<TGenericResult>();
}

TFuture<TGenericResult> AlterTable(const TString&, Ydb::Table::AlterTableRequest&&, const TMaybe<TString>&, ui64, NKikimrIndexBuilder::TIndexBuildSettings&&) override
Expand Down Expand Up @@ -1035,150 +996,33 @@ class TKikimrIcGateway : public IKqpGateway {

TFuture<TGenericResult> AlterColumnTable(const TString& cluster,
const NYql::TAlterColumnTableSettings& settings) override {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

try {
if (!CheckCluster(cluster)) {
return InvalidCluster<TGenericResult>(cluster);
}

std::pair<TString, TString> pathPair;
{
TString error;
if (!GetPathPair(settings.Table, pathPair, error, false)) {
return MakeFuture(ResultFromError<TGenericResult>(error));
}
}

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(Database);
if (UserToken) {
ev->Record.SetUserToken(UserToken->GetSerializedToken());
}
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
schemeTx.SetWorkingDir(pathPair.first);

schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpAlterColumnTable);
NKikimrSchemeOp::TAlterColumnTable* alter = schemeTx.MutableAlterColumnTable();
alter->SetName(settings.Table);

return SendSchemeRequest(ev.Release());
}
catch (yexception& e) {
return MakeFuture(ResultFromException<TGenericResult>(e));
}
Y_UNUSED(cluster);
Y_UNUSED(settings);
return NotImplemented<TGenericResult>();
}

TFuture<TGenericResult> CreateTableStore(const TString& cluster,
const NYql::TCreateTableStoreSettings& settings) override {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

try {
if (!CheckCluster(cluster)) {
return InvalidCluster<TGenericResult>(cluster);
}

std::pair<TString, TString> pathPair;
{
TString error;
if (!GetPathPair(settings.TableStore, pathPair, error, false)) {
return MakeFuture(ResultFromError<TGenericResult>(error));
}
}

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(Database);
if (UserToken) {
ev->Record.SetUserToken(UserToken->GetSerializedToken());
}
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
schemeTx.SetWorkingDir(pathPair.first);

schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpCreateColumnStore);
NKikimrSchemeOp::TColumnStoreDescription* storeDesc = schemeTx.MutableCreateColumnStore();
storeDesc->SetName(pathPair.second);
storeDesc->SetColumnShardCount(settings.ShardsCount);

NKikimrSchemeOp::TColumnTableSchemaPreset* schemaPreset = storeDesc->AddSchemaPresets();
schemaPreset->SetName("default");
FillColumnTableSchema(*schemaPreset->MutableSchema(), settings);

return SendSchemeRequest(ev.Release());
}
catch (yexception& e) {
return MakeFuture(ResultFromException<TGenericResult>(e));
}
const NYql::TCreateTableStoreSettings& settings,
bool existingOk) override {
Y_UNUSED(cluster);
Y_UNUSED(settings);
Y_UNUSED(existingOk);
return NotImplemented<TGenericResult>();
}

TFuture<TGenericResult> AlterTableStore(const TString& cluster,
const NYql::TAlterTableStoreSettings& settings) override {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

try {
if (!CheckCluster(cluster)) {
return InvalidCluster<TGenericResult>(cluster);
}

std::pair<TString, TString> pathPair;
{
TString error;
if (!GetPathPair(settings.TableStore, pathPair, error, false)) {
return MakeFuture(ResultFromError<TGenericResult>(error));
}
}

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(Database);
if (UserToken) {
ev->Record.SetUserToken(UserToken->GetSerializedToken());
}
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
schemeTx.SetWorkingDir(pathPair.first);

schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpAlterColumnStore);
NKikimrSchemeOp::TAlterColumnStore* alter = schemeTx.MutableAlterColumnStore();
alter->SetName(pathPair.second);

return SendSchemeRequest(ev.Release());
}
catch (yexception& e) {
return MakeFuture(ResultFromException<TGenericResult>(e));
}
Y_UNUSED(cluster);
Y_UNUSED(settings);
return NotImplemented<TGenericResult>();
}

TFuture<TGenericResult> DropTableStore(const TString& cluster,
const NYql::TDropTableStoreSettings& settings) override {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

try {
if (!CheckCluster(cluster)) {
return InvalidCluster<TGenericResult>(cluster);
}

std::pair<TString, TString> pathPair;
{
TString error;
if (!GetPathPair(settings.TableStore, pathPair, error, false)) {
return MakeFuture(ResultFromError<TGenericResult>(error));
}
}

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(Database);
if (UserToken) {
ev->Record.SetUserToken(UserToken->GetSerializedToken());
}
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
schemeTx.SetWorkingDir(pathPair.first);

schemeTx.SetOperationType(NKikimrSchemeOp::ESchemeOpDropColumnStore);
NKikimrSchemeOp::TDrop* drop = schemeTx.MutableDrop();
drop->SetName(pathPair.second);
return SendSchemeRequest(ev.Release());
}
catch (yexception& e) {
return MakeFuture(ResultFromException<TGenericResult>(e));
}
const NYql::TDropTableStoreSettings& settings, bool missingOk) override {
Y_UNUSED(cluster);
Y_UNUSED(settings);
Y_UNUSED(missingOk);
return NotImplemented<TGenericResult>();
}

TFuture<TGenericResult> CreateExternalTable(const TString& cluster,
Expand Down Expand Up @@ -2328,27 +2172,6 @@ class TKikimrIcGateway : public IKqpGateway {
return result;
}

template <typename T>
static void FillColumnTableSchema(NKikimrSchemeOp::TColumnTableSchema& schema, const T& metadata)
{
Y_ENSURE(metadata.ColumnOrder.size() == metadata.Columns.size());
for (const auto& name : metadata.ColumnOrder) {
auto columnIt = metadata.Columns.find(name);
Y_ENSURE(columnIt != metadata.Columns.end());

TOlapColumnDescription& columnDesc = *schema.AddColumns();
columnDesc.SetName(columnIt->second.Name);
columnDesc.SetType(columnIt->second.Type);
columnDesc.SetNotNull(columnIt->second.NotNull);
}

for (const auto& keyColumn : metadata.KeyColumnNames) {
schema.AddKeyColumnNames(keyColumn);
}

schema.SetEngine(NKikimrSchemeOp::EColumnTableEngine::COLUMN_ENGINE_REPLACING_TIMESERIES);
}

static void FillParameters(TQueryData::TPtr params, ::google::protobuf::Map<TBasicString<char>, Ydb::TypedValue>* output) {
if (!params) {
return;
Expand All @@ -2358,59 +2181,6 @@ class TKikimrIcGateway : public IKqpGateway {
output->insert(paramsMap.begin(), paramsMap.end());
}

static bool FillCreateColumnTableDesc(NYql::TKikimrTableMetadataPtr metadata,
NKikimrSchemeOp::TColumnTableDescription& tableDesc, Ydb::StatusIds::StatusCode& code, TString& error)
{
if (metadata->Columns.empty()) {
tableDesc.SetSchemaPresetName("default");
}

auto& hashSharding = *tableDesc.MutableSharding()->MutableHashSharding();

for (const TString& column : metadata->TableSettings.PartitionBy) {
if (!metadata->Columns.count(column)) {
code = Ydb::StatusIds::BAD_REQUEST;
error = TStringBuilder() << "Unknown column '" << column << "' in partition by key";
return false;
}

hashSharding.AddColumns(column);
}

if (metadata->TableSettings.PartitionByHashFunction) {
if (to_lower(metadata->TableSettings.PartitionByHashFunction.GetRef()) == "cloud_logs") {
hashSharding.SetFunction(NKikimrSchemeOp::TColumnTableSharding::THashSharding::HASH_FUNCTION_CLOUD_LOGS);
} else if (to_lower(metadata->TableSettings.PartitionByHashFunction.GetRef()) == "consistency_hash_64") {
hashSharding.SetFunction(NKikimrSchemeOp::TColumnTableSharding::THashSharding::HASH_FUNCTION_CONSISTENCY_64);
} else if (to_lower(metadata->TableSettings.PartitionByHashFunction.GetRef()) == "modulo_n") {
hashSharding.SetFunction(NKikimrSchemeOp::TColumnTableSharding::THashSharding::HASH_FUNCTION_MODULO_N);
} else {
code = Ydb::StatusIds::BAD_REQUEST;
error = TStringBuilder() << "Unknown hash function '"
<< metadata->TableSettings.PartitionByHashFunction.GetRef() << "' to partition by";
return false;
}
} else {
hashSharding.SetFunction(NKikimrSchemeOp::TColumnTableSharding::THashSharding::HASH_FUNCTION_CONSISTENCY_64);
}

if (metadata->TableSettings.MinPartitions) {
tableDesc.SetColumnShardCount(*metadata->TableSettings.MinPartitions);
}

if (metadata->TableSettings.TtlSettings.Defined() && metadata->TableSettings.TtlSettings.IsSet()) {
const auto& inputSettings = metadata->TableSettings.TtlSettings.GetValueSet();
auto& resultSettings = *tableDesc.MutableTtlSettings();
resultSettings.MutableEnabled()->SetColumnName(inputSettings.ColumnName);
resultSettings.MutableEnabled()->SetExpireAfterSeconds(inputSettings.ExpireAfter.Seconds());
if (inputSettings.ColumnUnit) {
resultSettings.MutableEnabled()->SetColumnUnit(static_cast<NKikimrSchemeOp::TTTLSettings::EUnit>(*inputSettings.ColumnUnit));
}
}

return true;
}

private:
TString Cluster;
const NKikimrKqp::EQueryType QueryType;
Expand Down
Loading