Skip to content

Add String cache for BsonArray indexes. #1664

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
merged 6 commits into from
Apr 2, 2025
Merged

Add String cache for BsonArray indexes. #1664

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ef0223
Add String cache for BsonArray indexes.
vbabanin Mar 29, 2025
e2d44de
Merge branch 'main' into string-cache
vbabanin Mar 29, 2025
5f1eb46
Add additional comments to a test for clarity.
vbabanin Mar 29, 2025
7e4d589
Fix static checks.
vbabanin Apr 1, 2025
8998112
Merge branch 'main' into string-cache
vbabanin Apr 1, 2025
fd61c35
Update bson/src/main/org/bson/BsonBinaryWriter.java
vbabanin Apr 2, 2025
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
15 changes: 14 additions & 1 deletion bson/src/main/org/bson/BsonBinaryWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,16 @@ public class BsonBinaryWriter extends AbstractBsonWriter {

private final BsonOutput bsonOutput;
private final Stack<Integer> maxDocumentSizeStack = new Stack<>();
private static final int ARRAY_INDEXES_CACHE_SIZE = 1 << 8;
private static final String[] ARRAY_INDEXES_CACHE = new String[ARRAY_INDEXES_CACHE_SIZE];
private Mark mark;

static {
for (int i = 0; i < ARRAY_INDEXES_CACHE_SIZE; i++) {
ARRAY_INDEXES_CACHE[i] = Integer.toString(i);
}
}

/**
* Construct an instance.
*
Expand Down Expand Up @@ -397,7 +405,12 @@ public void reset() {

private void writeCurrentName() {
if (getContext().getContextType() == BsonContextType.ARRAY) {
bsonOutput.writeCString(Integer.toString(getContext().index++));
int index = getContext().index++;
if (index >= ARRAY_INDEXES_CACHE_SIZE) {
bsonOutput.writeCString(Integer.toString(index));
} else {
bsonOutput.writeCString(ARRAY_INDEXES_CACHE[index]);
}
} else {
bsonOutput.writeCString(getName());
}
Expand Down
38 changes: 31 additions & 7 deletions bson/src/test/unit/org/bson/BsonBinaryWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.List;

import static java.util.Arrays.asList;
Expand All @@ -49,7 +50,7 @@ public class BsonBinaryWriterTest {
@BeforeEach
public void setup() {
buffer = new BasicOutputBuffer();
writer = new BsonBinaryWriter(new BsonWriterSettings(100), new BsonBinaryWriterSettings(1024), buffer);
writer = new BsonBinaryWriter(new BsonWriterSettings(100), new BsonBinaryWriterSettings(12904), buffer);
}

@AfterEach
Expand All @@ -61,7 +62,7 @@ public void tearDown() {
public void shouldThrowWhenMaxDocumentSizeIsExceeded() {
try {
writer.writeStartDocument();
writer.writeBinaryData("b", new BsonBinary(new byte[1024]));
writer.writeBinaryData("b", new BsonBinary(new byte[12904]));
writer.writeEndDocument();
fail();
} catch (BsonMaximumSizeExceededException e) {
Expand Down Expand Up @@ -197,16 +198,39 @@ public void testWriteArray() {
}

@Test
public void testWriteArrayElements() {
public void testWriteArrayElements() throws IOException {
ByteArrayOutputStream expectedOutput = new ByteArrayOutputStream();
expectedOutput.write(new byte[]{
88, 11, 0, 0, //document length
4, // array type
97, 49, 0, // "a1" name + null terminator
79, 11, 0, 0}); // array length


writer.writeStartDocument();
writer.writeStartArray("a1");
writer.writeBoolean(true);
writer.writeBoolean(false);
int arrayIndex = 0;
while (arrayIndex < 500) {
writer.writeBoolean(true);

expectedOutput.write(BsonType.BOOLEAN.getValue());
expectedOutput.write(Integer.toString(arrayIndex++).getBytes(StandardCharsets.UTF_8));
expectedOutput.write(0); // null terminator
expectedOutput.write(1); // boolean value

writer.writeBoolean(false);

expectedOutput.write(BsonType.BOOLEAN.getValue());
expectedOutput.write(Integer.toString(arrayIndex++).getBytes(StandardCharsets.UTF_8));
expectedOutput.write(0); // null terminator
expectedOutput.write(0); // boolean value
}
writer.writeEndArray();
expectedOutput.write(0); // end of array
writer.writeEndDocument();
byte[] expectedValues = {22, 0, 0, 0, 4, 97, 49, 0, 13, 0, 0, 0, 8, 48, 0, 1, 8, 49, 0, 0, 0, 0};
assertArrayEquals(expectedValues, buffer.toByteArray());
expectedOutput.write(0); // end of a document

assertArrayEquals(expectedOutput.toByteArray(), buffer.toByteArray());
}

@Test
Expand Down