Skip to content

feat: Use storage to open ByteBufferBackedInputStream #14359

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

Closed
CTTY wants to merge 1 commit into from
Closed

feat: Use storage to open ByteBufferBackedInputStream #14359

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
5 changes: 2 additions & 3 deletions hudi-common/src/main/java/org/apache/hudi/io/storage/HFileReaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.ValidationUtils;
import org.apache.hudi.common.util.hash.MurmurHash;
import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;
import org.apache.hudi.io.hfile.CachingHFileReaderImpl;
Expand Down Expand Up @@ -110,11 +109,11 @@ private SeekableDataInputStream createInputStream(long fileSize) throws IOExcept
buffer = new byte[(int) storage.getPathInfo(path).getLength()];
stream.readFully(buffer);
}
return new ByteArraySeekableDataInputStream(new ByteBufferBackedInputStream(buffer));
return new ByteArraySeekableDataInputStream(storage.openByteArray(buffer));
}
return storage.openSeekable(fileSource.asLeft(), false);
}
return new ByteArraySeekableDataInputStream(new ByteBufferBackedInputStream(fileSource.asRight()));
return new ByteArraySeekableDataInputStream(storage.openByteArray(fileSource.asRight()));
}

public static Builder builder() {
Expand Down
3 changes: 2 additions & 1 deletion hudi-common/src/main/java/org/apache/hudi/parquet/io/ByteBufferBackedInputFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package org.apache.hudi.parquet.io;

import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;

import org.apache.parquet.io.DelegatingSeekableInputStream;
import org.apache.parquet.io.InputFile;
Expand All @@ -27,6 +27,7 @@
/**
* Implementation of {@link InputFile} backed by {@code byte[]} buffer
*/
@Deprecated
public class ByteBufferBackedInputFile implements InputFile {
private final byte[] buffer;
private final int offset;
Expand Down
2 changes: 1 addition & 1 deletion ...-common/src/test/java/org/apache/hudi/common/table/log/block/TestHoodieAvroDataBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.apache.hudi.common.table.log.block.HoodieLogBlock.HeaderMetadataType;
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.collection.ClosableIterator;
import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.exception.HoodieIOException;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;
Expand Down
2 changes: 1 addition & 1 deletion hudi-common/src/test/java/org/apache/hudi/common/table/log/block/TestHoodieLogBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.apache.hudi.common.model.HoodieLogFile;
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;
import org.apache.hudi.storage.HoodieStorage;
Expand Down
2 changes: 1 addition & 1 deletion ...l/io/TestByteBufferBackedInputStream.java → ...i/io/TestByteBufferBackedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hudi.common.util.io;
package org.apache.hudi.io;

import org.junit.jupiter.api.Test;

Expand Down
2 changes: 0 additions & 2 deletions hudi-io/src/main/java/org/apache/hudi/io/ByteArraySeekableDataInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

package org.apache.hudi.io;

import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;

import java.io.IOException;

/**
Expand Down
2 changes: 1 addition & 1 deletion .../util/io/ByteBufferBackedInputStream.java → .../hudi/io/ByteBufferBackedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hudi.common.util.io;
package org.apache.hudi.io;

import javax.annotation.Nonnull;

Expand Down
9 changes: 9 additions & 0 deletions hudi-io/src/main/java/org/apache/hudi/storage/HoodieStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.hudi.PublicAPIMethod;
import org.apache.hudi.common.util.Option;
import org.apache.hudi.exception.HoodieIOException;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.SeekableDataInputStream;

import org.slf4j.Logger;
Expand Down Expand Up @@ -437,6 +438,14 @@ public SeekableDataInputStream openSeekable(StoragePath path, boolean wrapStream
return openSeekable(path, getDefaultBlockSize(path), wrapStream);
}

/**
* todo doc
*/
@PublicAPIMethod(maturity = ApiMaturityLevel.EVOLVING)
public ByteBufferBackedInputStream openByteArray(byte[] array) {
return new ByteBufferBackedInputStream(array);
}

/**
* Lists the file info of the direct files/directories in the given list of paths,
* if the paths are directory.
Expand Down
2 changes: 1 addition & 1 deletion hudi-io/src/test/java/org/apache/hudi/io/hfile/TestHFileCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.hudi.io.hfile;

import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;
import org.apache.hudi.io.util.IOUtils;
Expand Down
2 changes: 1 addition & 1 deletion hudi-io/src/test/java/org/apache/hudi/io/hfile/TestHFileReadCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.hudi.io.hfile;

import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;
import org.apache.hudi.io.util.IOUtils;
Expand Down
2 changes: 1 addition & 1 deletion hudi-io/src/test/java/org/apache/hudi/io/hfile/TestHFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.hudi.io.hfile;

import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;

import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion hudi-io/src/test/java/org/apache/hudi/io/hfile/TestHFileWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.hudi.io.hfile;

import org.apache.hudi.common.util.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteBufferBackedInputStream;
import org.apache.hudi.io.ByteArraySeekableDataInputStream;
import org.apache.hudi.io.SeekableDataInputStream;

Expand Down
Loading