Fix typos

src/Storages/MergeTree/IMergeTreeDataPart.cpp

@@ -1153,12 +1153,12 @@ void IMergeTreeDataPart::renameTo(const String & new_relative_path, bool remove_
     storage.lockSharedData(*this);
 }
 
-void IMergeTreeDataPart::cleanupOldName(const String & old_name) const
+void IMergeTreeDataPart::cleanupOldName(const String & old_part_name) const
 {
-    if (name == old_name)
+    if (name == old_part_name)
         return;
 
-    storage.unlockSharedData(*this, old_name);
+    storage.unlockSharedData(*this, old_part_name);
 }
 
 std::optional<bool> IMergeTreeDataPart::keepSharedDataInDecoupledStorage() const

src/Storages/MergeTree/MergeTreeData.h

@@ -873,7 +873,7 @@ class MergeTreeData : public IStorage, public WithMutableContext
     /// Overridden in StorageReplicatedMergeTree
     virtual bool unlockSharedData(const IMergeTreeDataPart &) const { return true; }
 
-    /// Unlock same part with other (old) name
+    /// Remove lock with old name for shared data part after rename
     virtual bool unlockSharedData(const IMergeTreeDataPart &, const String &) const { return true; }
 
     /// Fetch part only if some replica has it on shared storage like S3

src/Storages/MergeTree/MergeTreeSettings.h

@@ -127,7 +127,7 @@ struct Settings;
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
     M(Bool, allow_remote_fs_zero_copy_replication, true, "Allow Zero-copy replication over remote fs.", 0) \
     M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for Zero-copy table-independet info.", 0) \
-    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during convertion process.", 0) \
+    M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm.", 0) \
     M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited. This setting is the default that can be overridden by the query-level setting with the same name.", 0) \

utils/zero_copy/zero_copy_schema_converter.py

@@ -18,14 +18,14 @@ def parse_args():
     parser.add_argument('-p', '--password', default='', help='ZooKeeper ACL password')
     parser.add_argument('-r', '--root', default='/clickhouse', help='ZooKeeper root path for ClickHouse')
     parser.add_argument('-z', '--zcroot', default='zero_copy', help='ZooKeeper node for new zero-copy data')
-    parser.add_argument('--dryrun', default=False, action='store_true', help='Do not perfome any actions')
+    parser.add_argument('--dryrun', default=False, action='store_true', help='Do not perform any actions')
     parser.add_argument('--cleanup', default=False, action='store_true', help='Clean old nodes')
     parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Verbose mode')
 
     return parser.parse_args()
 
 
-# Several folders to euristic that zookeepr node is folder node
+# Several folders to heuristic that zookeepr node is folder node
 # May be false positive when someone creates set of tables with same paths
 table_nodes = ['alter_partition_version', 'block_numbers', 'blocks', 'columns', 'leader_election']
 zc_nodes = ['zero_copy_s3', 'zero_copy_hdfs']