change export_filename to file

Author: arthurpassos

src/Storages/MergeTree/IMergeTreeDataPart.cpp

@@ -300,8 +300,11 @@ Block IMergeTreeDataPart::MinMaxIndex::getBlock(const MergeTreeData & data) cons
 
         const auto column = data_type->createColumn();
 
-        const auto min_val = hyperrectangle.at(i).left;
-        const auto max_val = hyperrectangle.at(i).right;
+        auto range = hyperrectangle.at(i);
+        range.shrinkToIncludedIfPossible();
+
+        const auto & min_val = range.left;
+        const auto & max_val = range.right;
 
         column->insert(min_val);
         column->insert(max_val);

src/Storages/ObjectStorage/ObjectStorageFilePathGenerator.h

@@ -19,13 +19,14 @@ namespace DB
 
     struct ObjectStorageWildcardFilePathGenerator : ObjectStorageFilePathGenerator
     {
+        static constexpr const char * FILE_WILDCARD = "{_file}";
         explicit ObjectStorageWildcardFilePathGenerator(const std::string & raw_path_) : raw_path(raw_path_) {}
 
         using ObjectStorageFilePathGenerator::getPathForWrite;  // Bring base class overloads into scope
         std::string getPathForWrite(const std::string & partition_id, const std::string & file_name_override) const override
         {
             const auto partition_replaced_path = PartitionedSink::replaceWildcards(raw_path, partition_id);
-            const auto final_path = boost::replace_all_copy(partition_replaced_path, "{_export_filename}", file_name_override);
+            const auto final_path = boost::replace_all_copy(partition_replaced_path, FILE_WILDCARD, file_name_override);
             return final_path;
         }
 

src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp

@@ -161,8 +161,7 @@ bool StorageObjectStorageConfiguration::Path::hasPartitionWildcard() const
 
 bool StorageObjectStorageConfiguration::Path::hasExportFilenameWildcard() const
 {
-    static const String EXPORT_FILENAME_WILDCARD = "{_export_filename}";
-    return path.find(EXPORT_FILENAME_WILDCARD) != String::npos;
+    return path.find(ObjectStorageWildcardFilePathGenerator::FILE_WILDCARD) != String::npos;
 }
 
 

tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh

@@ -38,7 +38,7 @@ query "CREATE TABLE $mt_table_roundtrip ENGINE = MergeTree() PARTITION BY year O
 echo "---- Data in roundtrip MergeTree table (should match s3_table)"
 query "SELECT * FROM $s3_table ORDER BY id"
 
-query "CREATE TABLE $s3_table_wildcard (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard/{_partition_id}/{_export_filename}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY year"
+query "CREATE TABLE $s3_table_wildcard (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard/{_partition_id}/{file}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY year"
 
 echo "---- Export 2020_1_1_0 and 2021_2_2_0 to wildcard table"
 query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table_wildcard SETTINGS allow_experimental_export_merge_tree_part = 1"
@@ -53,7 +53,7 @@ query "ALTER TABLE $mt_table EXPORT PART '2020_1_1_0' TO TABLE $s3_table_wildcar
 query "SELECT * FROM s3(s3_conn, filename='$s3_table_wildcard/**.parquet') ORDER BY id"
 
 query "CREATE TABLE $mt_table_partition_expression_with_function (id UInt64, year UInt16) ENGINE = MergeTree() PARTITION BY toString(year) ORDER BY tuple()"
-query "CREATE TABLE $s3_table_wildcard_partition_expression_with_function (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard_partition_expression_with_function/{_partition_id}/{_export_filename}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY toString(year)"
+query "CREATE TABLE $s3_table_wildcard_partition_expression_with_function (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table_wildcard_partition_expression_with_function/{_partition_id}/{file}.parquet', format=Parquet, partition_strategy='wildcard') PARTITION BY toString(year)"
 
 # insert
 query "INSERT INTO $mt_table_partition_expression_with_function VALUES (1, 2020), (2, 2020), (3, 2020), (4, 2021)"