Skip to content
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

Jump to bottom

Improves performance by representing the LST using a Map instead of SymbolTable in IonManagedWriter_1_1. #854

Merged
merged 1 commit into from
May 14, 2024
Merged

Improves performance by representing the LST using a Map instead of SymbolTable in IonManagedWriter_1_1. #854

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
23 changes: 14 additions & 9 deletions src/main/java/com/amazon/ion/impl/bin/IonManagedWriter_1_1.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@ internal class IonManagedWriter_1_1(
private val onClose: () -> Unit,
) : _Private_IonManagedWriter, AbstractIonWriter(WriteValueOptimization.NONE) {

private val systemSymbolTableMap = hashMapOf<String, Int>()

init {
// Since this is Ion 1.1, we must always start with the IVM.
systemData.writeIVM()
var id = 1
Symbols.systemSymbolTable().iterateDeclaredSymbolNames().forEach {
systemSymbolTableMap[it] = id++
}
}

companion object {
Expand Down Expand Up @@ -104,16 +110,16 @@ internal class IonManagedWriter_1_1(
/** TODO: Document what this is for... */
private var canAppendToLocalSymbolTable: Boolean = false
/** The symbol table for the prior encoding context */
private var symbolTable: SymbolTable = Symbols.systemSymbolTable()
private var symbolTable: HashMap<String, Int> = HashMap(systemSymbolTableMap)
/** Max symbol ID of the prior encoding context. */
private var priorMaxId: Int = symbolTable.maxId
private var priorMaxId: Int = symbolTable.size
/** Symbols to be interned since the prior encoding context. */
private var newSymbols = arrayListOf<String>()

private fun intern(text: String): Int {
// Check the current symbol table
var sid = symbolTable.findSymbol(text)
if (sid != SymbolTable.UNKNOWN_SYMBOL_ID) return sid
var sid = symbolTable[text]
if (sid != null) return sid
// Check the to-be-appended symbols
sid = newSymbols.indexOf(text)
if (sid != SymbolTable.UNKNOWN_SYMBOL_ID) return sid + priorMaxId + 1
Expand Down Expand Up @@ -146,18 +152,17 @@ internal class IonManagedWriter_1_1(
stepOut()
}

symbolTable = LocalSymbolTable.DEFAULT_LST_FACTORY.newLocalSymtab(symbolTable).apply {
newSymbols.forEach { [email protected](it) }
}
var id = symbolTable.size + 1
newSymbols.forEach { symbolTable[it] = id++ }

newSymbols.clear()
canAppendToLocalSymbolTable = true
}

private fun resetLocalSymbolTable() {
if (depth != 0) throw IllegalStateException("Cannot reset the encoding context while stepped in any value.")
symbolTable = Symbols.systemSymbolTable()
priorMaxId = symbolTable.maxId
symbolTable = HashMap(systemSymbolTableMap)
priorMaxId = symbolTable.size
canAppendToLocalSymbolTable = false
}

Expand Down
Loading