Skip to content

fix: skip action rows with blank player name to prevent write-queue s… #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netcrafts wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −10
Open

fix: skip action rows with blank player name to prevent write-queue s… #389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions src/main/kotlin/com/github/quiltservertools/ledger/database/DatabaseManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,18 +464,27 @@ object DatabaseManager {
}

private fun Transaction.insertActions(actions: List<ActionType>) {
val (safe, oversized) = actions.partition {
it.extraData == null || it.extraData!!.length <= MAX_EXTRA_DATA_BYTES
val (valid, invalid) = actions.partition {
(it.extraData == null || it.extraData!!.length <= MAX_EXTRA_DATA_BYTES) &&
(it.sourceProfile == null || it.sourceProfile!!.name.isNotBlank())
}
oversized.forEach { action ->
logWarn(
"Skipping action log: extra_data too large (${action.extraData!!.length} chars) " +
"for action ${action.identifier} at " +
"[${action.world} ${action.pos.x} ${action.pos.y} ${action.pos.z}] " +
"by ${action.sourceProfile?.name ?: action.sourceName}",
)
invalid.forEach { action ->
if (action.sourceProfile != null && action.sourceProfile!!.name.isBlank()) {
logWarn(
"Skipping action log: sourceProfile has blank name (UUID=${action.sourceProfile!!.id}) " +
"for action ${action.identifier} at " +
"[${action.world} ${action.pos.x} ${action.pos.y} ${action.pos.z}]",
)
} else {
logWarn(
"Skipping action log: extra_data too large (${action.extraData!!.length} chars) " +
"for action ${action.identifier} at " +
"[${action.world} ${action.pos.x} ${action.pos.y} ${action.pos.z}] " +
"by ${action.sourceProfile?.name ?: action.sourceName}",
)
}
}
Tables.Actions.batchInsert(safe, shouldReturnGeneratedValues = false) { action ->
Tables.Actions.batchInsert(valid, shouldReturnGeneratedValues = false) { action ->
this[Tables.Actions.actionIdentifier] = getOrCreateActionId(action.identifier)
this[Tables.Actions.timestamp] = action.timestamp
this[Tables.Actions.x] = action.pos.x
Expand Down
Loading