fix #1093, add ClicHouse 25.2 to CI/CD

Signed-off-by: Slach <[email protected]>

Author: Slach

.github/workflows/build.yaml

@@ -106,6 +106,7 @@ jobs:
           - '23.8'
           - '24.3'
           - '24.8'
+          - '25.2'
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -215,6 +216,7 @@ jobs:
           - '23.8'
           - '24.3'
           - '24.8'
+          - '25.2'
     steps:
       - name: Checkout project
         uses: actions/checkout@v4

ChangeLog.md

@@ -1,3 +1,6 @@
+# v2.6.7
+- improve workaround for `metdata_path` field change behavior in 25.1+, look details in https://github.com/ClickHouse/ClickHouse/issues/76546, fix [1093](https://github.com/Altinity/clickhouse-backup/issues/1093)
+
 # v2.6.6
 
 IMPROVEMENTS

pkg/backup/restore.go

@@ -1468,7 +1468,7 @@ func (b *Backuper) restoreDataRegularByParts(ctx context.Context, backupName str
 	log.Info().Str("duration", utils.HumanizeDuration(time.Since(start))).Str("size", utils.FormatBytes(uint64(size))).Msg("download object_disks finish")
 	// Skip ATTACH PART for Replicated*MergeTree tables if replicatedCopyToDetached is true
 	if !replicatedCopyToDetached || !strings.Contains(dstTable.Engine, "Replicated") {
-		if err := b.ch.AttachDataParts(table, dstTable, disks); err != nil {
+		if err := b.ch.AttachDataParts(table, dstTable); err != nil {
 			return fmt.Errorf("can't attach data parts for table '%s.%s': %v", table.Database, table.Table, err)
 		}
 	} else {

pkg/clickhouse/clickhouse.go

@@ -259,7 +259,11 @@ func (ch *ClickHouse) getMetadataPath(ctx context.Context) (string, error) {
 		return "", fmt.Errorf("can't get metadata_path from system.tables or system.databases")
 	}
 	metadataPath := strings.Split(result[0].MetadataPath, "/")
-	if strings.Contains(result[0].MetadataPath, "/store/") {
+	// https://github.com/ClickHouse/ClickHouse/issues/76546
+	if ch.version >= 25000000 && strings.HasSuffix(result[0].MetadataPath, "/store/") {
+		result[0].MetadataPath = path.Join(metadataPath[:len(metadataPath)-2]...)
+		result[0].MetadataPath = path.Join(result[0].MetadataPath, "metadata")
+	} else if strings.Contains(result[0].MetadataPath, "/store/") {
 		result[0].MetadataPath = path.Join(metadataPath[:len(metadataPath)-4]...)
 		result[0].MetadataPath = path.Join(result[0].MetadataPath, "metadata")
 	} else {
@@ -763,7 +767,7 @@ func (ch *ClickHouse) FreezeTable(ctx context.Context, table *Table, name string
 }
 
 // AttachDataParts - execute ALTER TABLE ... ATTACH PART command for specific table
-func (ch *ClickHouse) AttachDataParts(table metadata.TableMetadata, dstTable Table, disks []Disk) error {
+func (ch *ClickHouse) AttachDataParts(table metadata.TableMetadata, dstTable Table) error {
 	if dstTable.Database != "" && dstTable.Database != table.Database {
 		table.Database = dstTable.Database
 	}