FrankChen021 commented on a change in pull request #10383:
URL: https://github.com/apache/druid/pull/10383#discussion_r494728667
##########
File path: core/src/main/java/org/apache/druid/data/input/impl/JsonReader.java
##########
@@ -33,13 +40,98 @@
import java.io.IOException;
import java.util.Collections;
-import java.util.List;
+import java.util.Iterator;
import java.util.Map;
+import java.util.NoSuchElementException;
-public class JsonReader extends TextReader
+/**
+ * <pre>
+ * In constract to {@link JsonLineReader} which processes input text line by
line independently,
+ * this class tries to parse the input text as a whole to an array of objects.
+ *
+ * The input text can be:
+ * 1. a JSON string of an object in a line or multiple lines(such as
pretty-printed JSON text)
+ * 2. multiple JSON object strings concated by white space character(s)
+ *
+ * For case 2, what should be noticed is that if an exception is thrown when
parsing one JSON string,
+ * the rest JSON text will all be ignored
+ *
+ * For more information, see: https://github.com/apache/druid/pull/10383
+ * </pre>
+ */
+public class JsonReader implements InputEntityReader
Review comment:
> The sampler currently assumes that there is only one JSON object in an
input chunk which could have either an array or a nested object.
That's the root cause why `ExceptionThrowingIterator` is extracted and
`JsonReader` inherits from InputEntityReader directly.
Your suggestion provides a new and simple way to deal with it. I'll test the
code later.
##########
File path: core/src/main/java/org/apache/druid/data/input/impl/JsonReader.java
##########
@@ -33,13 +40,98 @@
import java.io.IOException;
import java.util.Collections;
-import java.util.List;
+import java.util.Iterator;
import java.util.Map;
+import java.util.NoSuchElementException;
-public class JsonReader extends TextReader
+/**
+ * <pre>
+ * In constract to {@link JsonLineReader} which processes input text line by
line independently,
+ * this class tries to parse the input text as a whole to an array of objects.
+ *
+ * The input text can be:
+ * 1. a JSON string of an object in a line or multiple lines(such as
pretty-printed JSON text)
+ * 2. multiple JSON object strings concated by white space character(s)
+ *
+ * For case 2, what should be noticed is that if an exception is thrown when
parsing one JSON string,
+ * the rest JSON text will all be ignored
+ *
+ * For more information, see: https://github.com/apache/druid/pull/10383
+ * </pre>
+ */
+public class JsonReader implements InputEntityReader
Review comment:
> The sampler currently assumes that there is only one JSON object in an
input chunk which could have either an array or a nested object.
That's the root cause why `ExceptionThrowingIterator` is extracted and
`JsonReader` inherits from `InputEntityReader` directly.
Your suggestion provides a new and simple way to deal with it. I'll test the
code later.
##########
File path:
core/src/main/java/org/apache/druid/data/input/ExceptionThrowingIterator.java
##########
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.data.input;
+
+import org.apache.druid.java.util.common.parsers.CloseableIterator;
+
+public class ExceptionThrowingIterator<T> implements CloseableIterator<T>
+{
+ private final RuntimeException exception;
+
+ private boolean thrown = false;
+
+ public ExceptionThrowingIterator(Throwable exception)
+ {
+ this.exception = exception instanceof RuntimeException
+ ? (RuntimeException) exception
+ : new RuntimeException(exception);
+ }
+
+ @Override
+ public boolean hasNext()
+ {
+ return !thrown;
+ }
+
+ @Override
+ public T next()
+ {
+ thrown = true;
Review comment:
I don't know why SpotBugs didn't report the problem before this class is
extracted. But if we adopt the solution that makes `JsonReader` inherit
`IntermediateRowParsingReader` as you suggest, this modification should be
rollback and I'll check it again if the report of this bug is still there
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
