Merge cherry-pick #18772

alesapin · alesapin · commit 083eff544c75 · 2021-02-05T17:25:09.000+03:00
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -207,33 +207,33 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
     }
 
     {
-    /** While filling index (index_columns), disable memory tracker.
-     * Because memory is allocated here (maybe in context of INSERT query),
-     *  but then freed in completely different place (while merging parts), where query memory_tracker is not available.
-     * And otherwise it will look like excessively growing memory consumption in context of query.
-     *  (observed in long INSERT SELECTs)
-     */
-    MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
+        /** While filling index (index_columns), disable memory tracker.
+         * Because memory is allocated here (maybe in context of INSERT query),
+         *  but then freed in completely different place (while merging parts), where query memory_tracker is not available.
+         * And otherwise it will look like excessively growing memory consumption in context of query.
+         *  (observed in long INSERT SELECTs)
+         */
+        MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
 
-    /// Write index. The index contains Primary Key value for each `index_granularity` row.
+        /// Write index. The index contains Primary Key value for each `index_granularity` row.
 
-    size_t current_row = getIndexOffset();
-    size_t total_marks = index_granularity.getMarksCount();
+        size_t current_row = getIndexOffset();
+        size_t total_marks = index_granularity.getMarksCount();
 
-    while (index_mark < total_marks && current_row < rows)
-    {
-        if (metadata_snapshot->hasPrimaryKey())
+        while (index_mark < total_marks && current_row < rows)
         {
-            for (size_t j = 0; j < primary_columns_num; ++j)
+            if (metadata_snapshot->hasPrimaryKey())
             {
-                const auto & primary_column = primary_index_block.getByPosition(j);
-                index_columns[j]->insertFrom(*primary_column.column, current_row);
-                primary_column.type->serializeBinary(*primary_column.column, current_row, *index_stream);
+                for (size_t j = 0; j < primary_columns_num; ++j)
+                {
+                    const auto & primary_column = primary_index_block.getByPosition(j);
+                    index_columns[j]->insertFrom(*primary_column.column, current_row);
+                    primary_column.type->serializeBinary(*primary_column.column, current_row, *index_stream);
+                }
             }
-        }
 
-        current_row += index_granularity.getMarkRows(index_mark++);
-    }
+            current_row += index_granularity.getMarkRows(index_mark++);
+        }
     }
 
     /// store last index row to write final mark at the end of column
