Skip to content

Symbol table tweaks #8907

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

Merged
headius merged 1 commit into from
Jul 10, 2025
Merged

Symbol table tweaks #8907

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: 5 additions & 9 deletions core/src/main/java/org/jruby/RubySymbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,24 +1023,20 @@ public static final class SymbolTable {

private final ReentrantLock tableLock = new ReentrantLock();
private volatile SymbolEntry[] symbolTable;
private Map<String, CompoundSymbol> compoundSymbolTable = new ConcurrentHashMap<>();
private final Map<String, CompoundSymbol> compoundSymbolTable = new ConcurrentHashMap<>();
private int size;
private int threshold;
private final float loadFactor;
private final Ruby runtime;
private final RubySymbol encodingSymbolE;
private final RubySymbol encodingSymbolK;
private final RubySymbol encodingSymbol;

public SymbolTable(Ruby runtime) {
this.runtime = runtime;
this.loadFactor = DEFAULT_LOAD_FACTOR;
this.threshold = (int)(DEFAULT_INITIAL_CAPACITY * DEFAULT_LOAD_FACTOR);
this.symbolTable = new SymbolEntry[DEFAULT_INITIAL_CAPACITY];
this.encodingSymbolE = createSymbol(MarshalCommon.SYMBOL_ENCODING_SPECIAL, false);
this.encodingSymbolK = createSymbol(MarshalCommon.SYMBOL_RUBY2_KEYWORDS_HASH_SPECIAL, false);
this.encodingSymbol = createSymbol(MarshalCommon.SYMBOL_ENCODING, false);
reset();
this.encodingSymbolE = createSymbol(MarshalCommon.SYMBOL_ENCODING_SPECIAL, true);
this.encodingSymbolK = createSymbol(MarshalCommon.SYMBOL_RUBY2_KEYWORDS_HASH_SPECIAL, true);
this.encodingSymbol = createSymbol(MarshalCommon.SYMBOL_ENCODING, true);
}

// note all fields are final -- rehash creates new entries when necessary.
Expand Down Expand Up @@ -1452,7 +1448,7 @@ private SymbolEntry[] rehash() {

int newCapacity = oldCapacity << 1;
SymbolEntry[] newTable = new SymbolEntry[newCapacity];
threshold = (int)(newCapacity * loadFactor);
threshold = (int)(newCapacity * DEFAULT_LOAD_FACTOR);
int sizeMask = newCapacity - 1;
SymbolEntry e;
for (int i = oldCapacity; --i >= 0; ) {
Expand Down