fix possible wrong merging after ATTACH PART for Collapsing and Repla…

…cing engines without version, look ClickHouse/ClickHouse#71009 for details Signed-off-by: Slach <[email protected]>
Altinity · Nov 13, 2024 · 40754f1 · 40754f1
1 parent 10c321f
commit 40754f1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/pkg/clickhouse/clickhouse.go b/pkg/clickhouse/clickhouse.go
@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/Altinity/clickhouse-backup/v2/pkg/filesystemhelper"
 	"os"
 	"path"
 	"path/filepath"
@@ -772,7 +771,7 @@ func (ch *ClickHouse) AttachDataParts(table metadata.TableMetadata, dstTable Tab
 	}
 	for disk := range table.Parts {
 		// https://github.com/ClickHouse/ClickHouse/issues/71009
-		filesystemhelper.SortPartsByMinBlock(table.Parts[disk])
+		metadata.SortPartsByMinBlock(table.Parts[disk])
 		for _, part := range table.Parts[disk] {
 			if !strings.HasSuffix(part.Name, ".proj") {
 				query := fmt.Sprintf("ALTER TABLE `%s`.`%s` ATTACH PART '%s'", table.Database, table.Table, part.Name)

diff --git a/pkg/filesystemhelper/filesystemhelper.go b/pkg/filesystemhelper/filesystemhelper.go
@@ -7,8 +7,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"sort"
-	"strconv"
 	"strings"
 	"sync"
 	"syscall"
@@ -300,26 +298,10 @@ func MoveShadowToBackup(shadowPath, backupPartsPath string, partitionsBackupMap
 		}
 	})
 	// https://github.com/ClickHouse/ClickHouse/issues/71009
-	SortPartsByMinBlock(parts)
+	metadata.SortPartsByMinBlock(parts)
 	return parts, size, err
 }
 
-// SortPartsByMinBlock need to avoid wrong restore for Replacing, Collapsing, https://github.com/ClickHouse/ClickHouse/issues/71009
-func SortPartsByMinBlock(parts []metadata.Part) {
-	sort.Slice(parts, func(i, j int) bool {
-		namePartsI := strings.Split(parts[i].Name, "_")
-		namePartsJ := strings.Split(parts[j].Name, "_")
-		// partitions different
-		if namePartsI[0] != namePartsJ[0] {
-			return namePartsI[0] < namePartsJ[0]
-		}
-		// partition same, min block
-		minBlockI, _ := strconv.Atoi(namePartsI[1])
-		minBlockJ, _ := strconv.Atoi(namePartsJ[1])
-		return minBlockI < minBlockJ
-	})
-}
-
 func addRequiredPartIfNotExists(parts []metadata.Part, relativePath string, tableDiffFromRemote metadata.TableMetadata, disk clickhouse.Disk) ([]metadata.Part, bool, bool) {
 	isRequiredPartFound := false
 	exists := false

diff --git a/pkg/metadata/part_metadata.go b/pkg/metadata/part_metadata.go
@@ -0,0 +1,23 @@
+package metadata
+
+import (
+	"sort"
+	"strconv"
+	"strings"
+)
+
+// SortPartsByMinBlock need to avoid wrong restore for Replacing, Collapsing, https://github.com/ClickHouse/ClickHouse/issues/71009
+func SortPartsByMinBlock(parts []Part) {
+	sort.Slice(parts, func(i, j int) bool {
+		namePartsI := strings.Split(parts[i].Name, "_")
+		namePartsJ := strings.Split(parts[j].Name, "_")
+		// partitions different
+		if namePartsI[0] != namePartsJ[0] {
+			return namePartsI[0] < namePartsJ[0]
+		}
+		// partition same, min block
+		minBlockI, _ := strconv.Atoi(namePartsI[1])
+		minBlockJ, _ := strconv.Atoi(namePartsJ[1])
+		return minBlockI < minBlockJ
+	})
+}