From 4a5faebca130ce86c007eac71f12c324a19cb414 Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Sat, 27 Jun 2026 17:09:03 +0800 Subject: [PATCH] [swcomp] Remove support for old save file format --- Sources/swcomp/Benchmarks/OldSaveFile.swift | 26 --------------------- Sources/swcomp/Benchmarks/SaveFile.swift | 19 --------------- 2 files changed, 45 deletions(-) delete mode 100644 Sources/swcomp/Benchmarks/OldSaveFile.swift diff --git a/Sources/swcomp/Benchmarks/OldSaveFile.swift b/Sources/swcomp/Benchmarks/OldSaveFile.swift deleted file mode 100644 index dbaba7a3..00000000 --- a/Sources/swcomp/Benchmarks/OldSaveFile.swift +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2026 Timofey Solomko -// Licensed under MIT License -// -// See LICENSE for license information - -import Foundation - -struct OldSaveFile: Codable { - - struct Run: Codable { - - var metadataUUID: UUID - var results: [BenchmarkResult] - - } - - var metadatas: [UUID: BenchmarkMetadata] - var runs: [Run] - - static func load(from path: String) throws -> OldSaveFile { - let decoder = JSONDecoder() - let data = try Data(contentsOf: URL(fileURLWithPath: path)) - return try decoder.decode(OldSaveFile.self, from: data) - } - -} diff --git a/Sources/swcomp/Benchmarks/SaveFile.swift b/Sources/swcomp/Benchmarks/SaveFile.swift index 2226d052..bbe5e5ba 100644 --- a/Sources/swcomp/Benchmarks/SaveFile.swift +++ b/Sources/swcomp/Benchmarks/SaveFile.swift @@ -18,20 +18,6 @@ struct SaveFile: Codable { var formatVersion = 2 var runs: [Run] - init(_ oldSaveFile: OldSaveFile) { - var d = [UUID: [BenchmarkResult]]() - for run in oldSaveFile.runs { - d[run.metadataUUID] = (d[run.metadataUUID] ?? [BenchmarkResult]()) + run.results - } - - self.runs = [Run]() - for (uuid, results) in d { - guard let metadata = oldSaveFile.metadatas[uuid] - else { swcompExit(.benchmarkOldFormatNoUUIDMetadata(uuid)) } - self.runs.append(Run(uuid: uuid, metadata: metadata, results: results.sorted(by: { $0.id < $1.id }))) - } - } - init(runs: [SaveFile.Run]) { self.runs = runs } @@ -47,11 +33,6 @@ struct SaveFile: Codable { else { swcompExit(.benchmarkUnsupportedFormatVersion(intFormatVersion)) } let decoder = JSONDecoder() return try decoder.decode(SaveFile.self, from: data) - } else if generalDict["metadatas"] != nil && generalDict["runs"] != nil { - let decoder = JSONDecoder() - let oldSaveFile = try decoder.decode(OldSaveFile.self, from: data) - print("WARNING: Old save file format detected. Its support will be removed in the future. Use \'benchmark convert' to upgrade.") - return SaveFile(oldSaveFile) } else { swcompExit(.benchmarkUnrecognizedSaveFile) }