Skip to content

HDDS-10040. Bump commons-compress to 1.25.0 #5897

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
adoroszlai merged 2 commits into from
Jan 2, 2024
Merged

HDDS-10040. Bump commons-compress to 1.25.0 #5897

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
b5b6ebf
[Java] Dependabot Package Upgrade: Bump org.apache.commons:commons-co…
dependabot[bot] Jan 1, 2024
fbb4aad
fix compile error
adoroszlai Jan 1, 2024
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
29 changes: 13 additions & 16 deletions ...-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/TarContainerPacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand All @@ -42,6 +40,7 @@
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.io.FileUtils;
Expand Down Expand Up @@ -124,7 +123,7 @@ private void extractEntry(ArchiveEntry entry, InputStream input, long size,
Files.createDirectories(parent);
}

try (OutputStream fileOutput = new FileOutputStream(path.toFile());
try (OutputStream fileOutput = Files.newOutputStream(path);
OutputStream output = new BufferedOutputStream(fileOutput)) {
int bufferSize = 1024;
byte[] buffer = new byte[bufferSize + 1];
Expand Down Expand Up @@ -157,7 +156,7 @@ public void pack(Container<KeyValueContainerData> container,

KeyValueContainerData containerData = container.getContainerData();

try (ArchiveOutputStream archiveOutput = tar(compress(output))) {
try (ArchiveOutputStream<TarArchiveEntry> archiveOutput = tar(compress(output))) {
includeFile(container.getContainerFile(), CONTAINER_FILE_NAME,
archiveOutput);

Expand All @@ -172,7 +171,7 @@ public void pack(Container<KeyValueContainerData> container,
@Override
public byte[] unpackContainerDescriptor(InputStream input)
throws IOException {
try (ArchiveInputStream archiveInput = untar(decompress(input))) {
try (ArchiveInputStream<TarArchiveEntry> archiveInput = untar(decompress(input))) {

ArchiveEntry entry = archiveInput.getNextEntry();
while (entry != null) {
Expand Down Expand Up @@ -219,9 +218,7 @@ public static Path getDbPath(Path baseDir,

public static Path getChunkPath(Path baseDir,
KeyValueContainerData containerData) {
Path chunkDir = KeyValueContainerLocationUtil.getChunksLocationPath(
baseDir.toString()).toPath();
return chunkDir;
return KeyValueContainerLocationUtil.getChunksLocationPath(baseDir.toString()).toPath();
}

private byte[] readEntry(InputStream input, final long size)
Expand All @@ -240,11 +237,11 @@ private byte[] readEntry(InputStream input, final long size)
}

private void includePath(Path dir, String subdir,
ArchiveOutputStream archiveOutput) throws IOException {
ArchiveOutputStream<TarArchiveEntry> archiveOutput) throws IOException {

// Add a directory entry before adding files, in case the directory is
// empty.
ArchiveEntry entry = archiveOutput.createArchiveEntry(dir.toFile(), subdir);
TarArchiveEntry entry = archiveOutput.createArchiveEntry(dir.toFile(), subdir);
archiveOutput.putArchiveEntry(entry);
archiveOutput.closeArchiveEntry();

Expand All @@ -258,20 +255,20 @@ private void includePath(Path dir, String subdir,
}

static void includeFile(File file, String entryName,
ArchiveOutputStream archiveOutput) throws IOException {
ArchiveEntry entry = archiveOutput.createArchiveEntry(file, entryName);
ArchiveOutputStream<TarArchiveEntry> archiveOutput) throws IOException {
TarArchiveEntry entry = archiveOutput.createArchiveEntry(file, entryName);
archiveOutput.putArchiveEntry(entry);
try (InputStream input = new FileInputStream(file)) {
try (InputStream input = Files.newInputStream(file.toPath())) {
IOUtils.copy(input, archiveOutput);
}
archiveOutput.closeArchiveEntry();
}

private static ArchiveInputStream untar(InputStream input) {
private static ArchiveInputStream<TarArchiveEntry> untar(InputStream input) {
return new TarArchiveInputStream(input);
}

private static ArchiveOutputStream tar(OutputStream output) {
private static ArchiveOutputStream<TarArchiveEntry> tar(OutputStream output) {
TarArchiveOutputStream os = new TarArchiveOutputStream(output);
os.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
return os;
Expand All @@ -290,7 +287,7 @@ OutputStream compress(OutputStream output) throws IOException {
private byte[] innerUnpack(InputStream input, Path dbRoot, Path chunksRoot)
throws IOException {
byte[] descriptorFileContent = null;
try (ArchiveInputStream archiveInput = untar(decompress(input))) {
try (ArchiveInputStream<TarArchiveEntry> archiveInput = untar(decompress(input))) {
ArchiveEntry entry = archiveInput.getNextEntry();
while (entry != null) {
String name = entry.getName();
Expand Down
12 changes: 7 additions & 5 deletions ...ce/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
package org.apache.hadoop.ozone.container.replication;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Semaphore;
import org.apache.commons.compress.archivers.ArchiveEntry;

import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
Expand Down Expand Up @@ -146,11 +148,11 @@ private File containerTarFile(
File tarFile = new File(tempDir,
ContainerUtils.getContainerTarName(containerId));
try (FileOutputStream output = new FileOutputStream(tarFile)) {
TarArchiveOutputStream archive = new TarArchiveOutputStream(output);
ArchiveEntry entry = archive.createArchiveEntry(yamlFile,
ArchiveOutputStream<TarArchiveEntry> archive = new TarArchiveOutputStream(output);
TarArchiveEntry entry = archive.createArchiveEntry(yamlFile,
"container.yaml");
archive.putArchiveEntry(entry);
try (InputStream input = new FileInputStream(yamlFile)) {
try (InputStream input = Files.newInputStream(yamlFile.toPath())) {
IOUtils.copy(input, archive);
}
archive.closeArchiveEntry();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<commons-cli.version>1.6.0</commons-cli.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.21</commons-compress.version>
<commons-compress.version>1.25.0</commons-compress.version>
<commons-configuration2.version>2.1.1</commons-configuration2.version>
<zstd-jni.version>1.5.2-5</zstd-jni.version>
<commons-daemon.version>1.0.13</commons-daemon.version>
Expand Down