Merge pull request ClickHouse#80036 from CurtizJ/remove-outdated-code

Remove outdated code

Author: CurtizJ

src/Storages/MergeTree/FutureMergedMutatedPart.cpp

@@ -26,7 +26,7 @@ void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
         future_part_storage_type = std::min(future_part_storage_type, part->getDataPartStorage().getType());
     }
 
-    auto chosen_format = parts_.front()->storage.choosePartFormatOnDisk(sum_bytes_uncompressed, sum_rows);
+    auto chosen_format = parts_.front()->storage.choosePartFormat(sum_bytes_uncompressed, sum_rows);
     future_part_type = std::min(future_part_type, chosen_format.part_type);
     future_part_storage_type = std::min(future_part_storage_type, chosen_format.storage_type);
     assign(std::move(parts_), {future_part_type, future_part_storage_type});

src/Storages/MergeTree/MergeTreeData.cpp

@@ -4216,11 +4216,6 @@ MergeTreeDataPartFormat MergeTreeData::choosePartFormat(size_t bytes_uncompresse
     return {part_type, PartStorageType::Full};
 }
 
-MergeTreeDataPartFormat MergeTreeData::choosePartFormatOnDisk(size_t bytes_uncompressed, size_t rows_count) const
-{
-    return choosePartFormat(bytes_uncompressed, rows_count);
-}
-
 MergeTreeDataPartBuilder MergeTreeData::getDataPartBuilder(
     const String & name, const VolumePtr & volume, const String & part_dir, const ReadSettings & read_settings_) const
 {
@@ -9318,7 +9313,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::createE
 
     auto tmp_dir_holder = getTemporaryPartDirectoryHolder(EMPTY_PART_TMP_PREFIX + new_part_name);
     auto new_data_part = getDataPartBuilder(new_part_name, data_part_volume, EMPTY_PART_TMP_PREFIX + new_part_name, getReadSettings())
-        .withBytesAndRowsOnDisk(0, 0)
+        .withBytesAndRows(0, 0)
         .withPartInfo(new_part_info)
         .build();
 

src/Storages/MergeTree/MergeTreeData.h

@@ -263,7 +263,6 @@ class MergeTreeData : public IStorage, public WithMutableContext
     OperationDataPartsLock lockOperationsWithParts() const { return OperationDataPartsLock(operation_with_data_parts_mutex); }
 
     MergeTreeDataPartFormat choosePartFormat(size_t bytes_uncompressed, size_t rows_count) const;
-    MergeTreeDataPartFormat choosePartFormatOnDisk(size_t bytes_uncompressed, size_t rows_count) const;
     MergeTreeDataPartBuilder getDataPartBuilder(const String & name, const VolumePtr & volume, const String & part_dir, const ReadSettings & read_settings_) const;
 
     /// Auxiliary object to add a set of parts into the working set in two steps:

src/Storages/MergeTree/MergeTreeDataPartBuilder.cpp

@@ -165,7 +165,7 @@ MergeTreeDataPartBuilder & MergeTreeDataPartBuilder::withPartFormatFromVolume()
     if (!storage || !mark_type)
     {
         /// Didn't find any data or mark file, suppose that part is empty.
-        return withBytesAndRowsOnDisk(0, 0);
+        return withBytesAndRows(0, 0);
     }
 
     part_storage = std::move(storage);
@@ -181,7 +181,7 @@ MergeTreeDataPartBuilder & MergeTreeDataPartBuilder::withPartFormatFromStorage()
     if (!mark_type)
     {
         /// Didn't find any mark file, suppose that part is empty.
-        return withBytesAndRowsOnDisk(0, 0);
+        return withBytesAndRows(0, 0);
     }
 
     part_type = mark_type->part_type;
@@ -193,9 +193,4 @@ MergeTreeDataPartBuilder & MergeTreeDataPartBuilder::withBytesAndRows(size_t byt
     return withPartFormat(data.choosePartFormat(bytes_uncompressed, rows_count));
 }
 
-MergeTreeDataPartBuilder & MergeTreeDataPartBuilder::withBytesAndRowsOnDisk(size_t bytes_uncompressed, size_t rows_count)
-{
-    return withPartFormat(data.choosePartFormatOnDisk(bytes_uncompressed, rows_count));
-}
-
 }

src/Storages/MergeTree/MergeTreeDataPartBuilder.h

@@ -36,7 +36,6 @@ class MergeTreeDataPartBuilder
     Self & withPartFormat(MergeTreeDataPartFormat format_);
     Self & withPartFormatFromDisk();
     Self & withBytesAndRows(size_t bytes_uncompressed, size_t rows_count);
-    Self & withBytesAndRowsOnDisk(size_t bytes_uncompressed, size_t rows_count);
 
     using PartStorageAndMarkType = std::pair<MutableDataPartStoragePtr, std::optional<MarkType>>;
 

src/Storages/MergeTree/MergeTreeDataWriter.cpp

@@ -805,7 +805,7 @@ MergeTreeTemporaryPartPtr MergeTreeDataWriter::writeProjectionPartImpl(
     size_t expected_size = block.bytes();
     // just check if there is enough space on parent volume
     MergeTreeData::reserveSpace(expected_size, parent_part->getDataPartStorage());
-    part_type = data.choosePartFormatOnDisk(expected_size, block.rows()).part_type;
+    part_type = data.choosePartFormat(expected_size, block.rows()).part_type;
 
     auto new_data_part = parent_part->getProjectionPartBuilder(part_name, is_temp).withPartType(part_type).build();
     auto projection_part_storage = new_data_part->getDataPartStoragePtr();