Merge pull request ClickHouse#79558 from alsugiliazova/Fix-small-typos

hanfei1991 · web-flow · commit 2f398f3a168b · 2025-04-28T12:13:01.000Z
Fix small typos in ProfileEvents
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
@@ -229,10 +229,10 @@
     M(ExternalJoinCompressedBytes, "Number of compressed bytes written for JOIN in external memory.", ValueType::Bytes) \
     M(ExternalJoinUncompressedBytes, "Amount of data (uncompressed, before compression) written for JOIN in external memory.", ValueType::Bytes) \
     \
-    M(IcebergPartitionPrunnedFiles, "Number of skipped files during Iceberg partition pruning", ValueType::Number) \
+    M(IcebergPartitionPrunedFiles, "Number of skipped files during Iceberg partition pruning", ValueType::Number) \
     M(IcebergTrivialCountOptimizationApplied, "Trivial count optimization applied while reading from Iceberg", ValueType::Number) \
-    M(IcebegerVersionHintUsed, "Number of times version-hint.text has been used.", ValueType::Number) \
-    M(IcebergMinMaxIndexPrunnedFiles, "Number of skipped files by using MinMax index in Iceberg", ValueType::Number) \
+    M(IcebergVersionHintUsed, "Number of times version-hint.text has been used.", ValueType::Number) \
+    M(IcebergMinMaxIndexPrunedFiles, "Number of skipped files by using MinMax index in Iceberg", ValueType::Number) \
     M(JoinBuildTableRowCount, "Total number of rows in the build table for a JOIN operation.", ValueType::Number) \
     M(JoinProbeTableRowCount, "Total number of rows in the probe table for a JOIN operation.", ValueType::Number) \
     M(JoinResultRowCount, "Total number of rows in the result of a JOIN operation.", ValueType::Number) \
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp
@@ -28,7 +28,7 @@
 namespace ProfileEvents
 {
     extern const Event IcebergTrivialCountOptimizationApplied;
-    extern const Event IcebegerVersionHintUsed;
+    extern const Event IcebergVersionHintUsed;
 }
 
 namespace DB
@@ -433,7 +433,7 @@ static std::pair<Int32, String> getLatestOrExplicitMetadataFileAndVersion(
                 metadata_file = metadata_file + ".metadata.json";
         }
         LOG_TEST(log, "Version hint file points to {}, will read from this metadata file", metadata_file);
-        ProfileEvents::increment(ProfileEvents::IcebegerVersionHintUsed);
+        ProfileEvents::increment(ProfileEvents::IcebergVersionHintUsed);
         return getMetadataFileAndVersion(std::filesystem::path(prefix_storage_path) / "metadata" / metadata_file);
     }
     else
diff --git a/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp b/src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFilesPruning.cpp
@@ -23,8 +23,8 @@ using namespace DB;
 
 namespace ProfileEvents
 {
-    extern const Event IcebergPartitionPrunnedFiles;
-    extern const Event IcebergMinMaxIndexPrunnedFiles;
+    extern const Event IcebergPartitionPrunedFiles;
+    extern const Event IcebergMinMaxIndexPrunedFiles;
 }
 
 
@@ -191,7 +191,7 @@ bool ManifestFilesPruner::canBePruned(const ManifestFileEntry & entry) const
 
         if (!can_be_true)
         {
-            ProfileEvents::increment(ProfileEvents::IcebergPartitionPrunnedFiles);
+            ProfileEvents::increment(ProfileEvents::IcebergPartitionPrunedFiles);
             return true;
         }
     }
@@ -207,7 +207,7 @@ bool ManifestFilesPruner::canBePruned(const ManifestFileEntry & entry) const
         auto hyperrectangle = entry.columns_infos.at(column_id).hyperrectangle;
         if (hyperrectangle.has_value() && !key_condition.mayBeTrueInRange(1, &hyperrectangle->left, &hyperrectangle->right, {name_and_type->type}))
         {
-            ProfileEvents::increment(ProfileEvents::IcebergMinMaxIndexPrunnedFiles);
+            ProfileEvents::increment(ProfileEvents::IcebergMinMaxIndexPrunedFiles);
             return true;
         }
     }
diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py
@@ -2077,24 +2077,24 @@ def check_validity_and_get_prunned_files(select_expression):
         print(
             "Unprunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             ),
         )
         print(
             "Prunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             ),
         )
 
         assert 0 == int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             )
         )
         return int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             )
         )
 
@@ -2745,24 +2745,24 @@ def check_validity_and_get_prunned_files(select_expression):
         print(
             "Unprunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             ),
         )
         print(
             "Prunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             ),
         )
 
         assert 0 == int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             )
         )
         return int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             )
         )
 
@@ -3047,24 +3047,24 @@ def check_validity_and_get_prunned_files(select_expression):
         print(
             "Unprunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             ),
         )
         print(
             "Prunned: ",
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             ),
         )
 
         assert 0 == int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"
             )
         )
         return int(
             instance.query(
-                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
+                f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"
             )
         )
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`namespace ProfileEvents`
`29`	`29`	`{`
`30`	`30`	`extern const Event IcebergTrivialCountOptimizationApplied;`
`31`		`- extern const Event IcebegerVersionHintUsed;`
	`31`	`+ extern const Event IcebergVersionHintUsed;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`namespace DB`
`@@ -433,7 +433,7 @@ static std::pair<Int32, String> getLatestOrExplicitMetadataFileAndVersion(`
`433`	`433`	`metadata_file = metadata_file + ".metadata.json";`
`434`	`434`	`}`
`435`	`435`	`LOG_TEST(log, "Version hint file points to {}, will read from this metadata file", metadata_file);`
`436`		`- ProfileEvents::increment(ProfileEvents::IcebegerVersionHintUsed);`
	`436`	`+ ProfileEvents::increment(ProfileEvents::IcebergVersionHintUsed);`
`437`	`437`	`return getMetadataFileAndVersion(std::filesystem::path(prefix_storage_path) / "metadata" / metadata_file);`
`438`	`438`	`}`
`439`	`439`	`else`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ using namespace DB;`
`23`	`23`
`24`	`24`	`namespace ProfileEvents`
`25`	`25`	`{`
`26`		`- extern const Event IcebergPartitionPrunnedFiles;`
`27`		`- extern const Event IcebergMinMaxIndexPrunnedFiles;`
	`26`	`+ extern const Event IcebergPartitionPrunedFiles;`
	`27`	`+ extern const Event IcebergMinMaxIndexPrunedFiles;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`
`@@ -191,7 +191,7 @@ bool ManifestFilesPruner::canBePruned(const ManifestFileEntry & entry) const`
`191`	`191`
`192`	`192`	`if (!can_be_true)`
`193`	`193`	`{`
`194`		`- ProfileEvents::increment(ProfileEvents::IcebergPartitionPrunnedFiles);`
	`194`	`+ ProfileEvents::increment(ProfileEvents::IcebergPartitionPrunedFiles);`
`195`	`195`	`return true;`
`196`	`196`	`}`
`197`	`197`	`}`
`@@ -207,7 +207,7 @@ bool ManifestFilesPruner::canBePruned(const ManifestFileEntry & entry) const`
`207`	`207`	`auto hyperrectangle = entry.columns_infos.at(column_id).hyperrectangle;`
`208`	`208`	`if (hyperrectangle.has_value() && !key_condition.mayBeTrueInRange(1, &hyperrectangle->left, &hyperrectangle->right, {name_and_type->type}))`
`209`	`209`	`{`
`210`		`- ProfileEvents::increment(ProfileEvents::IcebergMinMaxIndexPrunnedFiles);`
	`210`	`+ ProfileEvents::increment(ProfileEvents::IcebergMinMaxIndexPrunedFiles);`
`211`	`211`	`return true;`
`212`	`212`	`}`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2077,24 +2077,24 @@ def check_validity_and_get_prunned_files(select_expression):`
`2077`	`2077`	`print(`
`2078`	`2078`	`"Unprunned: ",`
`2079`	`2079`	`instance.query(`
`2080`		`- f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`2080`	`+ f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`2081`	`2081`	`),`
`2082`	`2082`	`)`
`2083`	`2083`	`print(`
`2084`	`2084`	`"Prunned: ",`
`2085`	`2085`	`instance.query(`
`2086`		`- f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`2086`	`+ f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`2087`	`2087`	`),`
`2088`	`2088`	`)`
`2089`	`2089`
`2090`	`2090`	`assert 0 == int(`
`2091`	`2091`	`instance.query(`
`2092`		`- f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`2092`	`+ f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`2093`	`2093`	`)`
`2094`	`2094`	`)`
`2095`	`2095`	`return int(`
`2096`	`2096`	`instance.query(`
`2097`		`- f"SELECT ProfileEvents['IcebergPartitionPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`2097`	`+ f"SELECT ProfileEvents['IcebergPartitionPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`2098`	`2098`	`)`
`2099`	`2099`	`)`
`2100`	`2100`
`@@ -2745,24 +2745,24 @@ def check_validity_and_get_prunned_files(select_expression):`
`2745`	`2745`	`print(`
`2746`	`2746`	`"Unprunned: ",`
`2747`	`2747`	`instance.query(`
`2748`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`2748`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`2749`	`2749`	`),`
`2750`	`2750`	`)`
`2751`	`2751`	`print(`
`2752`	`2752`	`"Prunned: ",`
`2753`	`2753`	`instance.query(`
`2754`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`2754`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`2755`	`2755`	`),`
`2756`	`2756`	`)`
`2757`	`2757`
`2758`	`2758`	`assert 0 == int(`
`2759`	`2759`	`instance.query(`
`2760`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`2760`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`2761`	`2761`	`)`
`2762`	`2762`	`)`
`2763`	`2763`	`return int(`
`2764`	`2764`	`instance.query(`
`2765`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`2765`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`2766`	`2766`	`)`
`2767`	`2767`	`)`
`2768`	`2768`
`@@ -3047,24 +3047,24 @@ def check_validity_and_get_prunned_files(select_expression):`
`3047`	`3047`	`print(`
`3048`	`3048`	`"Unprunned: ",`
`3049`	`3049`	`instance.query(`
`3050`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`3050`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`3051`	`3051`	`),`
`3052`	`3052`	`)`
`3053`	`3053`	`print(`
`3054`	`3054`	`"Prunned: ",`
`3055`	`3055`	`instance.query(`
`3056`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`3056`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`3057`	`3057`	`),`
`3058`	`3058`	`)`
`3059`	`3059`
`3060`	`3060`	`assert 0 == int(`
`3061`	`3061`	`instance.query(`
`3062`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
	`3062`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id1}' AND type = 'QueryFinish'"`
`3063`	`3063`	`)`
`3064`	`3064`	`)`
`3065`	`3065`	`return int(`
`3066`	`3066`	`instance.query(`
`3067`		`- f"SELECT ProfileEvents['IcebergMinMaxIndexPrunnedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
	`3067`	`+ f"SELECT ProfileEvents['IcebergMinMaxIndexPrunedFiles'] FROM system.query_log WHERE query_id = '{query_id2}' AND type = 'QueryFinish'"`
`3068`	`3068`	`)`
`3069`	`3069`	`)`
`3070`	`3070`