Merge 95c8005 into 61b0e0a

Author: azevaykin

ydb/core/tx/schemeshard/schemeshard_types.h

@@ -41,7 +41,7 @@ struct TSchemeLimits {
  ui64 MaxTableColumns = 200;
  ui64 MaxColumnTableColumns = 10000;
  ui64 MaxTableColumnNameLength = 255;
- ui64 MaxTableKeyColumns = 20;
+ ui64 MaxTableKeyColumns = 30;
  ui64 MaxTableIndices = 20;
  ui64 MaxTableCdcStreams = 5;
  ui64 MaxShards = 200*1000; // In each database

ydb/core/tx/schemeshard/ut_base/ut_base.cpp

@@ -2105,11 +2105,22 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) {
  Columns { Name: "key18" Type: "Uint64" }
  Columns { Name: "key19" Type: "Uint64" }
  Columns { Name: "key20" Type: "Uint64" }
+ Columns { Name: "key21" Type: "Uint64" }
+ Columns { Name: "key22" Type: "Uint64" }
+ Columns { Name: "key23" Type: "Uint64" }
+ Columns { Name: "key24" Type: "Uint64" }
+ Columns { Name: "key25" Type: "Uint64" }
+ Columns { Name: "key26" Type: "Uint64" }
+ Columns { Name: "key27" Type: "Uint64" }
+ Columns { Name: "key28" Type: "Uint64" }
+ Columns { Name: "key29" Type: "Uint64" }
+ Columns { Name: "key30" Type: "Uint64" }
 
  Columns { Name: "value0" Type: "Utf8" }
  Columns { Name: "value1" Type: "Utf8" }
  KeyColumnNames: ["key1", "key2", "key3", "key4", "key5", "key6", "key7", "key8", "key9", "key10",
- "key11", "key12", "key13", "key14", "key15", "key16", "key17", "key18", "key19", "key20"]
+ "key11", "key12", "key13", "key14", "key15", "key16", "key17", "key18", "key19", "key20",
+ "key21", "key22", "key23", "key24", "key25", "key26", "key27", "key28", "key29", "key30"]
  }
  IndexDescription {
  Name: "UserDefinedIndexByValue0"