Skip addMasterIndex/addIndex if the index already exists

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent fff63285fe
commit 95108126f1
  1. 29
      archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt

@ -15,8 +15,10 @@ import org.openrs2.cache.Store
import org.openrs2.cache.VersionTrailer import org.openrs2.cache.VersionTrailer
import org.openrs2.crypto.Whirlpool import org.openrs2.crypto.Whirlpool
import org.openrs2.db.Database import org.openrs2.db.Database
import org.postgresql.util.PSQLState
import java.io.IOException import java.io.IOException
import java.sql.Connection import java.sql.Connection
import java.sql.SQLException
import java.sql.Types import java.sql.Types
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@ -136,26 +138,33 @@ public class CacheImporter @Inject constructor(
} }
} }
// TODO(gpe): skip most of this function if we encounter a conflict?
private fun addMasterIndex(connection: Connection, masterIndex: MasterIndex) { private fun addMasterIndex(connection: Connection, masterIndex: MasterIndex) {
val containerId = addContainer(connection, masterIndex) val containerId = addContainer(connection, masterIndex)
val savepoint = connection.setSavepoint()
connection.prepareStatement( connection.prepareStatement(
""" """
INSERT INTO master_indexes (container_id) INSERT INTO master_indexes (container_id)
VALUES (?) VALUES (?)
ON CONFLICT DO NOTHING
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
stmt.setLong(1, containerId) stmt.setLong(1, containerId)
try {
stmt.execute() stmt.execute()
} catch (ex: SQLException) {
if (ex.sqlState == PSQLState.UNIQUE_VIOLATION.state) {
connection.rollback(savepoint)
return@addMasterIndex
}
throw ex
}
} }
connection.prepareStatement( connection.prepareStatement(
""" """
INSERT INTO master_index_entries (container_id, archive_id, crc32, version) INSERT INTO master_index_entries (container_id, archive_id, crc32, version)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?, ?)
ON CONFLICT DO NOTHING
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
for ((i, entry) in masterIndex.index.entries.withIndex()) { for ((i, entry) in masterIndex.index.entries.withIndex()) {
@ -213,27 +222,34 @@ public class CacheImporter @Inject constructor(
} }
} }
// TODO(gpe): skip most of this function if we encounter a conflict?
private fun addIndex(connection: Connection, index: Index) { private fun addIndex(connection: Connection, index: Index) {
val containerId = addContainer(connection, index) val containerId = addContainer(connection, index)
val savepoint = connection.setSavepoint()
connection.prepareStatement( connection.prepareStatement(
""" """
INSERT INTO indexes (container_id, version) INSERT INTO indexes (container_id, version)
VALUES (?, ?) VALUES (?, ?)
ON CONFLICT DO NOTHING
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
stmt.setLong(1, containerId) stmt.setLong(1, containerId)
stmt.setInt(2, index.index.version) stmt.setInt(2, index.index.version)
try {
stmt.execute() stmt.execute()
} catch (ex: SQLException) {
if (ex.sqlState == PSQLState.UNIQUE_VIOLATION.state) {
connection.rollback(savepoint)
return@addIndex
}
throw ex
}
} }
connection.prepareStatement( connection.prepareStatement(
""" """
INSERT INTO index_groups (container_id, group_id, crc32, whirlpool, version, name_hash) INSERT INTO index_groups (container_id, group_id, crc32, whirlpool, version, name_hash)
VALUES (?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?)
ON CONFLICT DO NOTHING
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
for (group in index.index) { for (group in index.index) {
@ -259,7 +275,6 @@ public class CacheImporter @Inject constructor(
""" """
INSERT INTO index_files (container_id, group_id, file_id, name_hash) INSERT INTO index_files (container_id, group_id, file_id, name_hash)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?, ?)
ON CONFLICT DO NOTHING
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
for (group in index.index) { for (group in index.index) {

Loading…
Cancel
Save