Skip to content

[MINOR][CORE][SQL] Inline argument checks and drop the network.util.JavaUtils dependency in ReadAheadInputStream and VectorizedDeltaBinaryPackedReader #58739

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

Open
david-mollitor-db wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −8
Open

[MINOR][CORE][SQL] Inline argument checks and drop the network.util.JavaUtils dependency in ReadAheadInputStream and VectorizedDeltaBinaryPackedReader #58739

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions core/src/main/java/org/apache/spark/io/ReadAheadInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.spark.internal.SparkLoggerFactory;
import org.apache.spark.internal.LogKeys;
import org.apache.spark.internal.MDC;
import org.apache.spark.network.util.JavaUtils;
import org.apache.spark.util.ThreadUtils;

/**
Expand Down Expand Up @@ -104,8 +103,10 @@ public class ReadAheadInputStream extends InputStream {
*/
public ReadAheadInputStream(
InputStream inputStream, int bufferSizeInBytes) {
JavaUtils.checkArgument(bufferSizeInBytes > 0,
"bufferSizeInBytes should be greater than 0, but the value is " + bufferSizeInBytes);
if (bufferSizeInBytes <= 0) {
throw new IllegalArgumentException(
"bufferSizeInBytes should be greater than 0, but the value is " + bufferSizeInBytes);
}
activeBuffer = ByteBuffer.allocate(bufferSizeInBytes);
readAheadBuffer = ByteBuffer.allocate(bufferSizeInBytes);
this.underlyingInputStream = inputStream;
Expand Down
13 changes: 8 additions & 5 deletions ...org/apache/spark/sql/execution/datasources/parquet/VectorizedDeltaBinaryPackedReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.parquet.column.values.bitpacking.Packer;
import org.apache.parquet.io.ParquetDecodingException;

import org.apache.spark.network.util.JavaUtils;
import org.apache.spark.sql.catalyst.util.RebaseDateTime;
import org.apache.spark.sql.execution.datasources.DataSourceUtils;
import org.apache.spark.sql.execution.vectorized.WritableColumnVector;
Expand Down Expand Up @@ -89,8 +88,10 @@ public class VectorizedDeltaBinaryPackedReader extends VectorizedReaderBase {

@Override
public void initFromPage(int valueCount, ByteBufferInputStream in) throws IOException {
JavaUtils.checkArgument(valueCount >= 1,
"Page must have at least one value, but it has " + valueCount);
if (valueCount < 1) {
throw new IllegalArgumentException(
"Page must have at least one value, but it has " + valueCount);
}
this.in = in;
// Read the header
this.blockSizeInValues = BytesUtils.readUnsignedVarInt(in);
Expand All @@ -105,8 +106,10 @@ public void initFromPage(int valueCount, ByteBufferInputStream in) throws IOExce
+ miniBlockNumInABlock + " (block size in values: " + blockSizeInValues + ")");
}
double miniSize = (double) blockSizeInValues / miniBlockNumInABlock;
JavaUtils.checkArgument(miniSize % 8 == 0,
"miniBlockSize must be multiple of 8, but it's " + miniSize);
if (miniSize % 8 != 0) {
throw new IllegalArgumentException(
"miniBlockSize must be multiple of 8, but it's " + miniSize);
}
this.miniBlockSizeInValues = (int) miniSize;
// True value count. May be less than valueCount because of nulls
this.totalValueCount = BytesUtils.readUnsignedVarInt(in);
Expand Down