PG types: replace Y_ABORT_UNLESS with yexception

ydb-platform · May 24, 2024 · 8ed03a8 · 8ed03a8
1 parent 5cb09f9
commit 8ed03a8
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/ydb/core/client/server/msgbus_server_db.cpp b/ydb/core/client/server/msgbus_server_db.cpp
@@ -395,8 +395,10 @@ class TServerDbOperation : public TActorBootstrapped<TServerDbOperation<Interfac
             keyColumns.reserve(keys.size());
             for (const NTxProxy::TTableColumnInfo* key : keys) {
                 NJson::TJsonValue jsonKey;
-                // TODO: support pg types
-                Y_ABORT_UNLESS(key->PType.GetTypeId() != NScheme::NTypeIds::Pg, "pg types are not supported");
+
+                if (key->PType.GetTypeId() == NScheme::NTypeIds::Pg)
+                    throw yexception() << "pg types are not supported";
+
                 if (jsonWhere.GetValue(key->Name, &jsonKey)) {
                     keyColumns.emplace_back(NewDataLiteral(pgmBuilder, jsonKey, key->PType.GetTypeId()));
                 } else {
@@ -453,8 +455,9 @@ class TServerDbOperation : public TActorBootstrapped<TServerDbOperation<Interfac
                 NMiniKQL::TTableRangeOptions tableRangeOptions = pgmBuilder.GetDefaultTableRangeOptions();
                 TVector<NMiniKQL::TRuntimeNode> keyFromColumns = keyColumns;
                 for (size_t i = keyColumns.size(); i < keyTypes.size(); ++i) {
-                    // TODO: support pg types
-                    Y_ABORT_UNLESS(keyTypes[i].GetTypeId() != NScheme::NTypeIds::Pg, "pg types are not supported");
+                    if (keyTypes[i].GetTypeId() == NScheme::NTypeIds::Pg)
+                        throw yexception() << "pg types are not supported";
+
                     keyFromColumns.emplace_back(pgmBuilder.NewEmptyOptionalDataLiteral(keyTypes[i].GetTypeId()));
                 }
                 tableRangeOptions.ToColumns = keyColumns;
@@ -470,9 +473,10 @@ class TServerDbOperation : public TActorBootstrapped<TServerDbOperation<Interfac
             for (auto itVal = jsonMap.begin(); itVal != jsonMap.end(); ++itVal) {
                 auto itCol = columnByName.find(itVal->first);
                 if (itCol != columnByName.end()) {
+                    if (itCol->second->PType.GetTypeId() == NScheme::NTypeIds::Pg)
+                        throw yexception() << "pg types are not supported";
+
                     auto update = pgmBuilder.GetUpdateRowBuilder();
-                    // TODO: support pg types
-                    Y_ABORT_UNLESS(itCol->second->PType.GetTypeId() != NScheme::NTypeIds::Pg, "pg types are not supported");
                     update.SetColumn(itCol->second->Id, itCol->second->PType, pgmBuilder.NewOptional(NewDataLiteral(pgmBuilder, itVal->second, itCol->second->PType.GetTypeId())));
                     pgmReturn = pgmBuilder.Append(pgmReturn, pgmBuilder.UpdateRow(tableInfo.TableId, keyTypes, keyColumns, update));
                 } else {