Skip to content

Commit 8f381d4

Browse files
cleaning useless proto data (#4857)
1 parent 20ac289 commit 8f381d4

File tree

4 files changed

+0
-19
lines changed

4 files changed

+0
-19
lines changed

ydb/core/protos/flat_scheme_op.proto

-2
Original file line numberDiff line numberDiff line change
@@ -751,9 +751,7 @@ message TColumnTableDescription {
751751

752752
// Table may be created using presets specific to the olap store.
753753
optional uint32 SchemaPresetId = 4;
754-
optional uint32 RESERVED_TtlSettingsPresetId = 5;
755754
optional string SchemaPresetName = 6;
756-
optional string RESERVED_TtlSettingsPresetName = 7;
757755

758756
// Associated olap store id, initialized by schemeshard
759757
// May be missing for tables that are not part of an ColumnStore

ydb/core/protos/tx_columnshard.proto

-5
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@ message TCreateTable {
227227
optional NKikimrSchemeOp.TColumnTableSchema Schema = 2;
228228
optional NKikimrSchemeOp.TColumnTableSchemaPreset SchemaPreset = 3;
229229
optional NKikimrSchemeOp.TColumnDataLifeCycle TtlSettings = 4;
230-
optional NKikimrSchemeOp.TColumnTableTtlSettingsPreset TtlSettingsPreset = 5;
231230
optional uint64 SchemaPresetVersionAdj = 6;
232-
optional uint64 TtlSettingsPresetVersionAdj = 7;
233231
}
234232

235233
message TInitShard {
@@ -241,13 +239,10 @@ message TInitShard {
241239

242240
message TAlterTable {
243241
optional uint64 PathId = 1;
244-
optional NKikimrSchemeOp.TAlterColumnTable AlterBody = 2;
245242
optional NKikimrSchemeOp.TColumnTableSchema Schema = 3;
246243
optional NKikimrSchemeOp.TColumnTableSchemaPreset SchemaPreset = 4;
247244
optional NKikimrSchemeOp.TColumnDataLifeCycle TtlSettings = 5;
248-
optional NKikimrSchemeOp.TColumnTableTtlSettingsPreset TtlSettingsPreset = 6;
249245
optional uint64 SchemaPresetVersionAdj = 7;
250-
optional uint64 TtlSettingsPresetVersionAdj = 8;
251246
}
252247

253248
message TDropTable {

ydb/core/tx/columnshard/columnshard_impl.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,6 @@ void TColumnShard::RunSchemaTx(const NKikimrTxColumnShard::TSchemaTxBody& body,
341341
break;
342342
}
343343
}
344-
345344
Y_ABORT("Unsupported schema tx type");
346345
}
347346

@@ -420,7 +419,6 @@ void TColumnShard::RunEnsureTable(const NKikimrTxColumnShard::TCreateTable& tabl
420419
}
421420

422421
tableVerProto.SetSchemaPresetVersionAdj(tableProto.GetSchemaPresetVersionAdj());
423-
tableVerProto.SetTtlSettingsPresetVersionAdj(tableProto.GetTtlSettingsPresetVersionAdj());
424422

425423
TablesManager.AddTableVersion(pathId, version, tableVerProto, db, Tiers);
426424

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

-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ class TTableConstructorBase {
2525
public:
2626
bool Deserialize(const NKikimrSchemeOp::TColumnTableDescription& description, IErrorCollector& errors) {
2727
Name = description.GetName();
28-
if (description.HasRESERVED_TtlSettingsPresetName() || description.HasRESERVED_TtlSettingsPresetId()) {
29-
errors.AddError("TTL presets are not supported");
30-
return false;
31-
}
32-
33-
if (description.HasRESERVED_TtlSettingsPresetName() || description.HasRESERVED_TtlSettingsPresetId()) {
34-
errors.AddError("TTL presets are not supported");
35-
return false;
36-
}
37-
3828
ShardsCount = std::max<ui32>(description.GetColumnShardCount(), 1);
3929

4030
if (!DoDeserialize(description, errors)) {

0 commit comments

Comments
 (0)