KAREARL
/
openrs2
forked from openrs2/openrs2
0
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Add archive/index sizes and completion percentages to legacy cache pages

Browse Source 
Signed-off-by: Graham <gpe@openrs2.org>
master
Graham 3 years ago
parent aa316e273d
commit 0158bc937b
2 changed files with 121 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 94
      archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt
  2. 58
      archive/src/main/resources/org/openrs2/archive/templates/caches/show.html

94
archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt vendored
Unescape View File

@ -77,12 +77,12 @@ public class CacheExporter @Inject constructor(
public val diskStoreValid: Boolean = blocks <= DiskStore.MAX_BLOCK public val diskStoreValid: Boolean = blocks <= DiskStore.MAX_BLOCK
} }
public data class Index( public data class Archive(
val resolved: Boolean, val resolved: Boolean,
val stats: IndexStats? val stats: ArchiveStats?
) )
public data class IndexStats( public data class ArchiveStats(
val validGroups: Long, val validGroups: Long,
val groups: Long, val groups: Long,
val validKeys: Long, val validKeys: Long,
@ -107,6 +107,21 @@ public class CacheExporter @Inject constructor(
} }
} }
public data class IndexStats(
val validFiles: Long,
val files: Long,
val size: Long,
val blocks: Long
) {
public val allFilesValid: Boolean = files == validFiles
public val validFilesFraction: Double = if (files == 0L) {
1.0
} else {
validFiles.toDouble() / files
}
}
public data class Build(val major: Int, val minor: Int?) : Comparable<Build> { public data class Build(val major: Int, val minor: Int?) : Comparable<Build> {
override fun compareTo(other: Build): Int { override fun compareTo(other: Build): Int {
return compareValuesBy(this, other, Build::major, Build::minor) return compareValuesBy(this, other, Build::major, Build::minor)
@ -158,7 +173,8 @@ public class CacheExporter @Inject constructor(
val sources: List<Source>, val sources: List<Source>,
val updates: List<String>, val updates: List<String>,
val stats: Stats?, val stats: Stats?,
val indexes: List<Index>, val archives: List<Archive>,
val indexes: List<IndexStats>?,
val masterIndex: Js5MasterIndex?, val masterIndex: Js5MasterIndex?,
val checksumTable: ChecksumTable? val checksumTable: ChecksumTable?
) )
@ -410,43 +426,81 @@ public class CacheExporter @Inject constructor(
} }
} }
val indexes = mutableListOf<Index>() val archives = mutableListOf<Archive>()
connection.prepareStatement( connection.prepareStatement(
""" """
SELECT c.id IS NOT NULL, s.valid_groups, s.groups, s.valid_keys, s.keys, s.size, s.blocks SELECT a.archive_id, c.id IS NOT NULL, s.valid_groups, s.groups, s.valid_keys, s.keys, s.size, s.blocks
FROM master_index_archives a FROM master_index_archives a
LEFT JOIN resolve_index((SELECT id FROM scopes WHERE name = ?), a.archive_id, a.crc32, a.version) c ON TRUE LEFT JOIN resolve_index((SELECT id FROM scopes WHERE name = ?), a.archive_id, a.crc32, a.version) c ON TRUE
LEFT JOIN index_stats s ON s.container_id = c.id LEFT JOIN index_stats s ON s.container_id = c.id
WHERE a.master_index_id = ? WHERE a.master_index_id = ?
ORDER BY a.archive_id ASC UNION ALL
SELECT a.archive_id, b.id IS NOT NULL, NULL, NULL, NULL, NULL, length(b.data), group_blocks(a.archive_id, length(b.data))
FROM crc_table_archives a
LEFT JOIN resolve_archive(a.archive_id, a.crc32) b ON TRUE
WHERE a.crc_table_id = ?
ORDER BY archive_id ASC
""".trimIndent() """.trimIndent()
).use { stmt -> ).use { stmt ->
stmt.setString(1, scope) stmt.setString(1, scope)
stmt.setInt(2, id) stmt.setInt(2, id)
stmt.setInt(3, id)
stmt.executeQuery().use { rows -> stmt.executeQuery().use { rows ->
while (rows.next()) { while (rows.next()) {
val resolved = rows.getBoolean(1) val resolved = rows.getBoolean(2)
val validGroups = rows.getLong(2) val size = rows.getLong(7)
val indexStats = if (!rows.wasNull()) { val archiveStats = if (!rows.wasNull()) {
val groups = rows.getLong(3) val validGroups = rows.getLong(3)
val validKeys = rows.getLong(4) val groups = rows.getLong(4)
val keys = rows.getLong(5) val validKeys = rows.getLong(5)
val size = rows.getLong(6) val keys = rows.getLong(6)
val blocks = rows.getLong(7) val blocks = rows.getLong(8)
IndexStats(validGroups, groups, validKeys, keys, size, blocks) ArchiveStats(validGroups, groups, validKeys, keys, size, blocks)
} else { } else {
null null
} }
indexes += Index(resolved, indexStats) archives += Archive(resolved, archiveStats)
}
}
}
val indexes = if (checksumTable != null && archives[5].resolved) {
connection.prepareStatement(
"""
SELECT s.valid_files, s.files, s.size, s.blocks
FROM crc_table_archives a
JOIN resolve_archive(a.archive_id, a.crc32) b ON TRUE
JOIN version_list_stats s ON s.blob_id = b.id
WHERE a.crc_table_id = ? AND a.archive_id = 5
ORDER BY s.index_id ASC
""".trimIndent()
).use { stmt ->
stmt.setInt(1, id)
stmt.executeQuery().use { rows ->
val indexes = mutableListOf<IndexStats>()
while (rows.next()) {
val validFiles = rows.getLong(1)
val files = rows.getLong(2)
val size = rows.getLong(3)
val blocks = rows.getLong(4)
indexes += IndexStats(validFiles, files, size, blocks)
} }
indexes
} }
} }
} else {
null
}
Cache(id, sources, updates, stats, indexes, masterIndex, checksumTable) Cache(id, sources, updates, stats, archives, indexes, masterIndex, checksumTable)
} }
} }
@ -487,7 +541,7 @@ public class CacheExporter @Inject constructor(
val name = StringBuilder("$game-$environment-$language") val name = StringBuilder("$game-$environment-$language")
val builds = rows.getArray(4).array as Array<*> val builds = rows.getArray(4).array as Array<*>
for (build in builds.mapNotNull { o -> Build.fromPgObject(o as PGobject) }.toSortedSet()) { for (build in builds.mapNotNull { o -> CacheExporter.Build.fromPgObject(o as PGobject) }.toSortedSet()) {
name.append("-b") name.append("-b")
name.append(build) name.append(build)
} }

58
archive/src/main/resources/org/openrs2/archive/templates/caches/show.html
Unescape View File

@ -130,28 +130,28 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="entry, it : ${cache.masterIndex.entries}" th:with="index=${cache.indexes[it.index]}"> <tr th:each="entry, it : ${cache.masterIndex.entries}" th:with="archive=${cache.archives[it.index]}">
<td th:text="${it.index}" class="text-right">0</td> <td th:text="${it.index}" class="text-right">0</td>
<td th:text="${#numbers.formatInteger(entry.version, 1, 'COMMA')}" class="text-right">0</td> <td th:text="${#numbers.formatInteger(entry.version, 1, 'COMMA')}" class="text-right">0</td>
<td class="text-right"> <td class="text-right">
<code th:text="${entry.checksum}">0</code> <code th:text="${entry.checksum}">0</code>
</td> </td>
<div th:switch="true" th:remove="tag"> <div th:switch="true" th:remove="tag">
<div th:case="${index.stats != null}" th:remove="tag"> <div th:case="${archive.stats != null}" th:remove="tag">
<td th:classappend="${index.stats.allGroupsValid}? 'table-success' : 'table-warning'" class="text-right"> <td th:classappend="${archive.stats.allGroupsValid}? 'table-success' : 'table-warning'" class="text-right">
<span th:text="${#numbers.formatInteger(index.stats.validGroups, 1, 'COMMA')} + '&nbsp;/&nbsp;' + ${#numbers.formatInteger(index.stats.groups, 1, 'COMMA')}"></span> <span th:text="${#numbers.formatInteger(archive.stats.validGroups, 1, 'COMMA')} + '&nbsp;/&nbsp;' + ${#numbers.formatInteger(archive.stats.groups, 1, 'COMMA')}"></span>
<br /> <br />
<span th:text="'(' + ${#numbers.formatPercent(index.stats.validGroupsFraction, 1, 2)} + ')'"></span> <span th:text="'(' + ${#numbers.formatPercent(archive.stats.validGroupsFraction, 1, 2)} + ')'"></span>
</td> </td>
<td th:classappend="${index.stats.allKeysValid}? 'table-success' : 'table-warning'" class="text-right"> <td th:classappend="${archive.stats.allKeysValid}? 'table-success' : 'table-warning'" class="text-right">
<span th:text="${#numbers.formatInteger(index.stats.validKeys, 1, 'COMMA')} + '&nbsp;/&nbsp;' + ${#numbers.formatInteger(index.stats.keys, 1, 'COMMA')}"></span> <span th:text="${#numbers.formatInteger(archive.stats.validKeys, 1, 'COMMA')} + '&nbsp;/&nbsp;' + ${#numbers.formatInteger(archive.stats.keys, 1, 'COMMA')}"></span>
<br /> <br />
<span th:text="'(' + ${#numbers.formatPercent(index.stats.validKeysFraction, 1, 2)} + ')'"></span> <span th:text="'(' + ${#numbers.formatPercent(archive.stats.validKeysFraction, 1, 2)} + ')'"></span>
</td> </td>
<!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/--> <!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/-->
<td th:text="${#byteunits.format(index.stats.size)}" class="text-right">0 B</td> <td th:text="${#byteunits.format(archive.stats.size)}" class="text-right">0 B</td>
</div> </div>
<div th:case="${index.resolved}" th:remove="tag"> <div th:case="${archive.resolved}" th:remove="tag">
<td class="text-center" colspan="3">Calculating...</td> <td class="text-center" colspan="3">Calculating...</td>
</div> </div>
<div th:case="${entry.checksum != 0 || entry.version != 0}" th:remove="tag"> <div th:case="${entry.checksum != 0 || entry.version != 0}" th:remove="tag">
@ -176,19 +176,55 @@
<tr> <tr>
<th>Archive</th> <th>Archive</th>
<th>Checksum</th> <th>Checksum</th>
<th>Size<sup><a href="/caches#size">2</a></sup></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="entry, it : ${cache.checksumTable.entries}"> <tr th:each="entry, it : ${cache.checksumTable.entries}" th:with="archive=${cache.archives[it.index]}">
<td th:text="${it.index}" class="text-right">0</td> <td th:text="${it.index}" class="text-right">0</td>
<td class="text-right"> <td class="text-right">
<code th:text="${entry}">0</code> <code th:text="${entry}">0</code>
</td> </td>
<div th:switch="true" th:remove="tag">
<!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/-->
<td th:case="${archive.stats != null}" th:text="${#byteunits.format(archive.stats.size)}" class="text-right">0 B</td>
<td th:case="${archive.resolved}" class="text-center">Calculating...</td>
<td th:case="${entry != 0}" class="text-center table-danger">Missing</td>
<td th:case="true" class="text-center text-muted">N/A</td>
</div>
</tr>
</tbody>
</table>
</div>
<div th:if="${cache.indexes}" th:remove="tag">
<h2>Version list</h2>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<thead class="table-dark">
<tr>
<th>Index</th>
<th>Files</th>
<th>Size<sup><a href="/caches#size">2</a></sup></th>
</tr>
</thead>
<tbody>
<tr th:each="index, it : ${cache.indexes}">
<td th:text="${it.index + 1}" class="text-right">0</td>
<td th:classappend="${index.allFilesValid}? 'table-success' : 'table-warning'" class="text-right">
<span th:text="${#numbers.formatInteger(index.validFiles, 1, 'COMMA')} + '&nbsp;/&nbsp;' + ${#numbers.formatInteger(index.files, 1, 'COMMA')}"></span>
<br />
<span th:text="'(' + ${#numbers.formatPercent(index.validFilesFraction, 1, 2)} + ')'"></span>
</td>
<!--/*@thymesVar id="#byteunits" type="org.openrs2.archive.web.ByteUnits"*/-->
<td th:text="${#byteunits.format(index.size)}" class="text-right">0 B</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div>
</main> </main>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save