Skip to content

Iteratively skip containers in Ion Text reader #535

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
popematt merged 2 commits into from
Jul 20, 2023
Merged

Iteratively skip containers in Ion Text reader #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e9acde
Iteratively skip containers in Ion Text reader
popematt Jul 19, 2023
5c576d8
Reduce allocations by moving arraylist into class, and fix preformanc…
popematt Jul 20, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/ion-java-performance-regression-detector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: 11

- name: Checkout ion-java from the new commit.
Expand Down
26 changes: 22 additions & 4 deletions src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
import com.amazon.ion.util.IonTextUtils;
import java.io.IOException;
import java.util.ArrayList;

/**
* Tokenizer for the Ion text parser in IonTextIterator. This
Expand Down Expand Up @@ -107,6 +108,10 @@ public Appendable append(char c) throws IOException
*/
private int _base64_prefetch_stack;

// This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
// Used for tracking terminator characters when skipping a container
private final ArrayList<Integer> containerSkipTerminatorStack = new ArrayList<>(CONTAINER_STACK_INITIAL_CAPACITY);

/**
* IonTokenReader constructor requires a UnifiedInputStream
Expand Down Expand Up @@ -1206,6 +1211,11 @@ protected void skip_over_sexp() throws IOException
private void skip_over_container(int terminator) throws IOException
{
assert( terminator == '}' || terminator == ']' || terminator == ')' );

// In theory, this should be empty at the start and end of every call to this
// method, but we'll clear it here anyway just in case.
containerSkipTerminatorStack.clear();

int c;

for (;;) {
Expand All @@ -1217,7 +1227,12 @@ private void skip_over_container(int terminator) throws IOException
case ']':
case ')':
if (c == terminator) { // no point is checking this on every char
return;
if (containerSkipTerminatorStack.isEmpty()) {
return;
} else {
// Pop one off the stack to continue
terminator = containerSkipTerminatorStack.remove(containerSkipTerminatorStack.size() - 1);
}
}
break;
case '"':
Expand All @@ -1233,10 +1248,12 @@ private void skip_over_container(int terminator) throws IOException
}
break;
case '(':
skip_over_container(')');
containerSkipTerminatorStack.add(terminator);
terminator = ')';
break;
case '[':
skip_over_container(']');
containerSkipTerminatorStack.add(terminator);
terminator = ']';
break;
case '{':
// this consumes lobs as well since the double
Expand Down Expand Up @@ -1273,7 +1290,8 @@ else if (c == '}') {
}
else {
unread_char(c);
skip_over_container('}');
containerSkipTerminatorStack.add(terminator);
terminator = '}';
}
break;
default:
Expand Down