ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-28 14:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade global message ids index table

Browse Source
This commit is contained in:
Peter
2019-03-21 01:48:13 +04:00
parent 1dab2acfbf
commit f564c6ad01
6 changed files with 127 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Postbox.xcodeproj/project.pbxproj
View File

@@ -62,6 +62,8 @@
D03121001DA579A0006A2A60 /* PeerNotificationSettingsTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03120FF1DA579A0006A2A60 /* PeerNotificationSettingsTable.swift */; };
D03229EE1E6B33FD0000AF9C /* SqliteInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03229ED1E6B33FD0000AF9C /* SqliteInterface.swift */; };
D03229EF1E6B33FD0000AF9C /* SqliteInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03229ED1E6B33FD0000AF9C /* SqliteInterface.swift */; };
D03387522242E32B007A2CE4 /* PostboxUpgrade_18to19.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03387512242E32A007A2CE4 /* PostboxUpgrade_18to19.swift */; };
D03387532242E32B007A2CE4 /* PostboxUpgrade_18to19.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03387512242E32A007A2CE4 /* PostboxUpgrade_18to19.swift */; };
D033A6F71C73D512006A2EAB /* MessageHistoryUnsentTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D033A6F61C73D512006A2EAB /* MessageHistoryUnsentTable.swift */; };
D033A6F91C73E440006A2EAB /* UnsentMessageHistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D033A6F81C73E440006A2EAB /* UnsentMessageHistoryView.swift */; };
D037178B20D923CA004773C8 /* CachedItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D037178A20D923CA004773C8 /* CachedItemView.swift */; };
@@ -431,6 +433,7 @@
D03120FD1DA562E9006A2A60 /* CachedPeerDataTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CachedPeerDataTable.swift; sourceTree = "<group>"; };
D03120FF1DA579A0006A2A60 /* PeerNotificationSettingsTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeerNotificationSettingsTable.swift; sourceTree = "<group>"; };
D03229ED1E6B33FD0000AF9C /* SqliteInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SqliteInterface.swift; sourceTree = "<group>"; };
D03387512242E32A007A2CE4 /* PostboxUpgrade_18to19.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostboxUpgrade_18to19.swift; sourceTree = "<group>"; };
D033A6F61C73D512006A2EAB /* MessageHistoryUnsentTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageHistoryUnsentTable.swift; sourceTree = "<group>"; };
D033A6F81C73E440006A2EAB /* UnsentMessageHistoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnsentMessageHistoryView.swift; sourceTree = "<group>"; };
D037178A20D923CA004773C8 /* CachedItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedItemView.swift; sourceTree = "<group>"; };
@@ -723,6 +726,7 @@
D048B33C203C838500038D05 /* PostboxUpgrade_15to16.swift */,
D001388520BD942B007C9721 /* PostboxUpgrade_16to17.swift */,
D0119CAC20C9E7A100895300 /* PostboxUpgrade_17to18.swift */,
D03387512242E32A007A2CE4 /* PostboxUpgrade_18to19.swift */,
);
name = Upgrade;
sourceTree = "<group>";
@@ -1299,6 +1303,7 @@
D0F7B1C01E045C62007EB8A5 /* StringIndexTokens.swift in Sources */,
D07047AC1F3DD8D100F6A8D4 /* PendingMessageActionsView.swift in Sources */,
D0F7B1CA1E045C6A007EB8A5 /* MessageHistoryUnsentTable.swift in Sources */,
D03387532242E32B007A2CE4 /* PostboxUpgrade_18to19.swift in Sources */,
D01BAA561ED1D70C00295217 /* ManagedFile.swift in Sources */,
D0BEAF6B1E54B5FB00BD963D /* AccountManagerMetadataTable.swift in Sources */,
D0F02CE01E99223E0065DEE2 /* Upgrades.swift in Sources */,
@@ -1481,6 +1486,7 @@
D0F02CDF1E99223D0065DEE2 /* Upgrades.swift in Sources */,
D08775001E3E3D9F00A97350 /* PreferencesTable.swift in Sources */,
D0BEAF6D1E54B77900BD963D /* AccountManagerRecordTable.swift in Sources */,
D03387522242E32B007A2CE4 /* PostboxUpgrade_18to19.swift in Sources */,
D03120F81DA53FF4006A2A60 /* PeerPresenceTable.swift in Sources */,
D0F9E8731C5A1EE500037222 /* GlobalMessageIdsTable.swift in Sources */,
D0AE3EBC1F68261B0069BC90 /* PeerNotificationSettingsView.swift in Sources */,

1
Postbox/Message.swift
View File

@@ -81,6 +81,7 @@ public struct MessageId: Hashable, Comparable, CustomStringConvertible {
}
}
}
public struct MessageIndex: Comparable, Hashable {
public let id: MessageId
public let timestamp: Int32

2
Postbox/Postbox.swift
View File

@@ -1005,7 +1005,7 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration)
let metadataTable = MetadataTable(valueBox: valueBox, table: MetadataTable.tableSpec(0))
let userVersion: Int32? = metadataTable.userVersion()
let currentUserVersion: Int32 = 18
let currentUserVersion: Int32 = 19
if let userVersion = userVersion {
if userVersion != currentUserVersion {

2
Postbox/PostboxUpgrade_17to18.swift
View File

@@ -4,13 +4,11 @@ private func convertNamespaces(value: ReadBuffer, buffer: WriteBuffer) {
var count: Int32 = 0
value.read(&count, offset: 0, length: 4)
buffer.write(&count, offset: 0, length: 4)
var stateByNamespace: [MessageId.Namespace: PeerReadState] = [:]
for _ in 0 ..< count {
var namespaceId: Int32 = 0
value.read(&namespaceId, offset: 0, length: 4)
buffer.write(&namespaceId, offset: 0, length: 4)
let state: PeerReadState
var kind: Int8 = 0
value.read(&kind, offset: 0, length: 1)
buffer.write(&kind, offset: 0, length: 1)

118
Postbox/PostboxUpgrade_18to19.swift Normal file
View File

@@ -0,0 +1,118 @@
import Foundation
private struct PrivatePeerId: Hashable {
typealias Namespace = Int32
typealias Id = Int32
let namespace: Namespace
let id: Id
init(namespace: Namespace, id: Id) {
self.namespace = namespace
self.id = id
}
init(_ n: Int64) {
self.namespace = Int32((n >> 32) & 0x7fffffff)
self.id = Int32(bitPattern: UInt32(n & 0xffffffff))
}
func toInt64() -> Int64 {
return (Int64(self.namespace) << 32) | Int64(bitPattern: UInt64(UInt32(bitPattern: self.id)))
}
}
func postboxUpgrade_18to19(metadataTable: MetadataTable, valueBox: ValueBox) {
let startTime = CFAbsoluteTimeGetCurrent()
let globalMessageIdsTable = ValueBoxTable(id: 3, keyType: .int64)
let messageHistoryIndexTable = ValueBoxTable(id: 4, keyType: .binary)
valueBox.dropTable(globalMessageIdsTable)
/*var debugPeerIds = Set<PrivatePeerId>()
var debugMessageIds = Set<MessageId>()
valueBox.scan(messageHistoryIndexTable, keys: { key in
let peerId = PrivatePeerId(key.getInt64(0))
debugPeerIds.insert(peerId)
if peerId.namespace == 0 || peerId.namespace == 1 {
if key.getInt32(8) == 0 {
debugMessageIds.insert(MessageId(peerId: PeerId(peerId.toInt64()), namespace: 0, id: key.getInt32(8 + 4)))
}
}
return true
})
var checkPeerIds = Set<PrivatePeerId>()
var checkMessageIds = Set<MessageId>()*/
let absoluteLowerBound = ValueBoxKey(length: 8)
absoluteLowerBound.setInt64(0, value: 0)
let absoluteUpperBound = ValueBoxKey(length: 8)
absoluteUpperBound.setInt64(0, value: Int64.max)
let sharedGlobalIdsKey = ValueBoxKey(length: 8)
let sharedGlobalIdsBuffer = WriteBuffer()
var totalMessageCount = 0
let currentLowerBound: ValueBoxKey = absoluteLowerBound
while true {
var currentPeerId: PrivatePeerId?
valueBox.range(messageHistoryIndexTable, start: currentLowerBound, end: absoluteUpperBound, keys: {
key in
currentPeerId = PrivatePeerId(key.getInt64(0))
return true
}, limit: 1)
if let currentPeerId = currentPeerId {
/*assert(!checkPeerIds.contains(currentPeerId))
checkPeerIds.insert(currentPeerId)*/
if currentPeerId.namespace == 0 || currentPeerId.namespace == 1 { // CloudUser || CloudGroup
let peerCloudLowerBound = ValueBoxKey(length: 8 + 4)
peerCloudLowerBound.setInt64(0, value: currentPeerId.toInt64())
peerCloudLowerBound.setInt32(8, value: 0) // Cloud
let sharedIdPeerId = currentPeerId.toInt64()
valueBox.range(messageHistoryIndexTable, start: peerCloudLowerBound, end: peerCloudLowerBound.successor, keys: { key in
//assert(key.getInt64(0) == currentPeerId.toInt64())
//assert(key.getInt32(8) == 0)
totalMessageCount += 1
let id = key.getInt32(8 + 4)
/*let res = checkMessageIds.insert(MessageId(peerId: PeerId(currentPeerId.toInt64()), namespace: 0, id: id))
assert(res.inserted)*/
sharedGlobalIdsKey.setInt64(0, value: Int64(id))
sharedGlobalIdsBuffer.reset()
var idPeerId: Int64 = sharedIdPeerId
var idNamespace: Int32 = 0
sharedGlobalIdsBuffer.write(&idPeerId, offset: 0, length: 8)
sharedGlobalIdsBuffer.write(&idNamespace, offset: 0, length: 4)
valueBox.set(globalMessageIdsTable, key: sharedGlobalIdsKey, value: sharedGlobalIdsBuffer)
return true
}, limit: 0)
}
currentLowerBound.setInt64(0, value: currentPeerId.toInt64() + 1)
currentLowerBound.setInt32(8, value: 0)
currentLowerBound.setInt32(8 + 4, value: 0)
} else {
break
}
}
/*assert(debugPeerIds == checkPeerIds)
assert(debugMessageIds == checkMessageIds)*/
let endTime = CFAbsoluteTimeGetCurrent()
postboxLog("Upgrade 18->19 (\(totalMessageCount) messages) took \(endTime - startTime) s")
metadataTable.setUserVersion(19)
}

1
Postbox/Upgrades.swift
View File

@@ -12,5 +12,6 @@ func registeredUpgrades() -> [Int32: PostboxUpgradeOperation] {
dict[15] = .inplace(postboxUpgrade_15to16)
dict[16] = .inplace(postboxUpgrade_16to17)
dict[17] = .inplace(postboxUpgrade_17to18)
dict[18] = .inplace(postboxUpgrade_18to19)
return dict
}