Merge 1e16ce3 into a20c225

Author: aavdonkin

ydb/core/protos/flat_tx_scheme.proto

@@ -190,6 +190,8 @@ message TSchemeLimits {
 
     optional uint64 MaxExports = 16;
     optional uint64 MaxImports = 17;
+
+    optional uint64 MaxOlapTableColumns = 18;
 }
 
 message TEvInitTenantSchemeShard {

ydb/core/tx/schemeshard/olap/operations/alter_table.cpp

@@ -312,6 +312,28 @@ class TAlterColumnTable: public TSubOperation {
             return result;
         }
 
+        NSchemeShard::TPath parentPath = NSchemeShard::TPath::Resolve(parentPathStr, context.SS);
+        auto domainInfo = parentPath.DomainInfo();
+        const TSchemeLimits& limits = domainInfo->GetSchemeLimits();
+
+        if (Transaction.HasAlterColumnTable()) {
+            auto& alterSchema = Transaction.GetAlterColumnTable().GetAlterSchema();
+            TTablesStorage::TTableReadGuard table = context.SS->ColumnTables.at(path->PathId);
+            ui64 curCols = table->Description.GetSchema().GetColumns().size();
+            ui64 dropCols = alterSchema.GetDropColumns().size();
+            ui64 addCols = alterSchema.GetAddColumns().size();
+            if (curCols + addCols - dropCols > limits.MaxOlapTableColumns) {
+                TString errStr = TStringBuilder()
+                    << "Too many columns"
+                    << ": current:" << curCols
+                    << ", new: " << addCols
+                    << ", dropping: " << dropCols
+                    << ". Limit: " << limits.MaxOlapTableColumns;
+                result->SetError(NKikimrScheme::StatusSchemeError, errStr);
+                return result;
+            }
+        }
+
         NIceDb::TNiceDb db(context.GetDB());
 
         if (update->GetShardIds().size()) {

ydb/core/tx/schemeshard/olap/operations/create_table.cpp

@@ -681,11 +681,23 @@ class TCreateColumnTable: public TSubOperation {
         TProposeErrorCollector errors(*result);
         TColumnTableInfo::TPtr tableInfo;
         bool needUpdateObject = false;
+        auto domainInfo = parentPath.DomainInfo();
+        const TSchemeLimits& limits = domainInfo->GetSchemeLimits();
+
         if (storeInfo) {
             TOlapPresetConstructor tableConstructor(*storeInfo);
             tableInfo = tableConstructor.BuildTableInfo(createDescription, context, errors);
             needUpdateObject = tableConstructor.GetNeedUpdateObject();
         } else {
+            ui64 columnCount = createDescription.schema().columns().size();
+            if (columnCount > limits.MaxOlapTableColumns) {
+                TString errStr = TStringBuilder()
+                    << "Too many columns"
+                    << ". new: " << columnCount
+                    << ". Limit: " << limits.MaxOlapTableColumns;
+                result->SetError(NKikimrScheme::StatusSchemeError, errStr);
+                return result;
+            }
             TOlapTableConstructor tableConstructor;
             tableInfo = tableConstructor.BuildTableInfo(createDescription, context, errors);
         }

ydb/core/tx/schemeshard/schemeshard_types.cpp

@@ -20,6 +20,9 @@ TSchemeLimits TSchemeLimits::FromProto(const NKikimrScheme::TSchemeLimits& proto
     if (proto.HasMaxTableColumns()) {
         result.MaxTableColumns = proto.GetMaxTableColumns();
     }
+    if (proto.HasMaxOlapTableColumns()) {
+        result.MaxOlapTableColumns = proto.GetMaxOlapTableColumns();
+    }
     if (proto.HasMaxTableColumnNameLength()) {
         result.MaxTableColumnNameLength = proto.GetMaxTableColumnNameLength();
     }
@@ -69,6 +72,7 @@ NKikimrScheme::TSchemeLimits TSchemeLimits::AsProto() const {
     result.SetMaxAclBytesSize(MaxAclBytesSize);
 
     result.SetMaxTableColumns(MaxTableColumns);
+    result.SetMaxOlapTableColumns(MaxOlapTableColumns);
     result.SetMaxTableColumnNameLength(MaxTableColumnNameLength);
     result.SetMaxTableKeyColumns(MaxTableKeyColumns);
     result.SetMaxTableIndices(MaxTableIndices);

ydb/core/tx/schemeshard/schemeshard_types.h

@@ -39,6 +39,7 @@ struct TSchemeLimits {
 
     // table
     ui64 MaxTableColumns = 200;
+    ui64 MaxOlapTableColumns = 10000;
     ui64 MaxTableColumnNameLength = 255;
     ui64 MaxTableKeyColumns = 20;
     ui64 MaxTableIndices = 20;