Auto stash before merge of "main" and "origin/main"

ivanmorozov333 · ivanmorozov333 · commit bad0b60b6f1d · 2024-01-13T09:50:18.000+03:00
restore default for compaction method
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
@@ -1432,7 +1432,7 @@ message TColumnShardConfig {
     optional bool TTLEnabled = 6 [default = true];
     optional bool WritingEnabled = 7 [default = true];
     optional uint32 WritingBufferDurationMs = 8 [default = 0];
-    optional bool UseChunkedMergeOnCompaction = 9 [default = false];
+    optional bool UseChunkedMergeOnCompaction = 9 [default = true];
 }
 
 message TSchemeShardConfig {

Original file line number	Diff line number	Diff line change
`@@ -1432,7 +1432,7 @@ message TColumnShardConfig {`
`1432`	`1432`	`optional bool TTLEnabled = 6 [default = true];`
`1433`	`1433`	`optional bool WritingEnabled = 7 [default = true];`
`1434`	`1434`	`optional uint32 WritingBufferDurationMs = 8 [default = 0];`
`1435`		`- optional bool UseChunkedMergeOnCompaction = 9 [default = false];`
	`1435`	`+ optional bool UseChunkedMergeOnCompaction = 9 [default = true];`
`1436`	`1436`	`}`
`1437`	`1437`
`1438`	`1438`	`message TSchemeShardConfig {`