Skip to content

fix: skip action rows with extra_data exceeding MySQL TEXT column limit #371

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
+13 −1
Open

fix: skip action rows with extra_data exceeding MySQL TEXT column limit #371

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
14 changes: 13 additions & 1 deletion 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 @@ -73,6 +73,7 @@ import kotlin.math.ceil
const val MAX_QUERY_RETRIES = 10
const val MIN_RETRY_DELAY = 1000L
const val MAX_RETRY_DELAY = 300_000L
private const val MAX_EXTRA_DATA_BYTES = 65_535

object DatabaseManager {

Expand Down Expand Up @@ -456,7 +457,18 @@ object DatabaseManager {
}

private fun Transaction.insertActions(actions: List<ActionType>) {
Tables.Actions.batchInsert(actions, shouldReturnGeneratedValues = false) { action ->
val (safe, oversized) = actions.partition {
it.extraData == null || it.extraData!!.length <= MAX_EXTRA_DATA_BYTES
}
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}",
)
}
Tables.Actions.batchInsert(safe, 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