Also remove the cached FK for the map-id when we delete it from the db >_>
This commit is contained in:
parent
1336d26b9f
commit
8af13df3f9
|
@ -377,35 +377,41 @@ public class SQLStorage extends Storage {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void purgeMap(String mapId, Function<ProgressInfo, Boolean> onProgress) throws IOException {
|
public void purgeMap(String mapId, Function<ProgressInfo, Boolean> onProgress) throws IOException {
|
||||||
try {
|
synchronized (mapFKs) {
|
||||||
recoveringConnection(connection -> {
|
try {
|
||||||
executeUpdate(connection,
|
recoveringConnection(connection -> {
|
||||||
"DELETE t " +
|
executeUpdate(connection,
|
||||||
"FROM `bluemap_map_tile` t " +
|
"DELETE t " +
|
||||||
" INNER JOIN `bluemap_map` m " +
|
"FROM `bluemap_map_tile` t " +
|
||||||
" ON t.`map` = m.`id` " +
|
" INNER JOIN `bluemap_map` m " +
|
||||||
"WHERE m.`map_id` = ?",
|
" ON t.`map` = m.`id` " +
|
||||||
mapId
|
"WHERE m.`map_id` = ?",
|
||||||
);
|
mapId
|
||||||
|
);
|
||||||
|
|
||||||
executeUpdate(connection,
|
executeUpdate(connection,
|
||||||
"DELETE t " +
|
"DELETE t " +
|
||||||
"FROM `bluemap_map_meta` t " +
|
"FROM `bluemap_map_meta` t " +
|
||||||
" INNER JOIN `bluemap_map` m " +
|
" INNER JOIN `bluemap_map` m " +
|
||||||
" ON t.`map` = m.`id` " +
|
" ON t.`map` = m.`id` " +
|
||||||
"WHERE m.`map_id` = ?",
|
"WHERE m.`map_id` = ?",
|
||||||
mapId
|
mapId
|
||||||
);
|
);
|
||||||
|
|
||||||
executeUpdate(connection,
|
|
||||||
"DELETE " +
|
executeUpdate(connection,
|
||||||
"FROM `bluemap_map` " +
|
"DELETE " +
|
||||||
"WHERE `map_id` = ?",
|
"FROM `bluemap_map` " +
|
||||||
mapId
|
"WHERE `map_id` = ?",
|
||||||
);
|
mapId
|
||||||
}, 2);
|
);
|
||||||
} catch (SQLException ex) {
|
}, 2);
|
||||||
throw new IOException(ex);
|
|
||||||
|
mapFKs.invalidate(mapId);
|
||||||
|
|
||||||
|
} catch (SQLException ex) {
|
||||||
|
throw new IOException(ex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -670,7 +676,9 @@ public class SQLStorage extends Storage {
|
||||||
}
|
}
|
||||||
|
|
||||||
private int loadMapFK(String mapId) throws SQLException, IOException {
|
private int loadMapFK(String mapId) throws SQLException, IOException {
|
||||||
return lookupFK("bluemap_map", "id", "map_id", mapId);
|
synchronized (mapFKs) {
|
||||||
|
return lookupFK("bluemap_map", "id", "map_id", mapId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private int loadMapTileCompressionFK(Compression compression) throws SQLException, IOException {
|
private int loadMapTileCompressionFK(Compression compression) throws SQLException, IOException {
|
||||||
|
|
Loading…
Reference in New Issue