Skip to content

Update to Hadoop 2.9.2 #33

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Hadoop 2.9.2 #33

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
0fbf86a
Update to Hadoop 2.9.2
luohao Jan 9, 2019
6a921dd
skip zstd in unit tests
luohao Jan 9, 2019
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.facebook.presto.hadoop</groupId>
<artifactId>hadoop-apache2</artifactId>
<version>2.7.4-6-SNAPSHOT</version>
<version>2.9.2-1-SNAPSHOT</version>

<name>hadoop-apache2</name>
<description>Shaded version of Apache Hadoop 2.x for Presto</description>
Expand Down Expand Up @@ -41,8 +41,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.targetJdk>1.7</project.build.targetJdk>
<shadeBase>com.facebook.presto.hadoop.\$internal</shadeBase>
<dep.slf4j.version>1.7.13</dep.slf4j.version>
<dep.hadoop.version>2.7.4</dep.hadoop.version>
<dep.slf4j.version>1.7.25</dep.slf4j.version>
<dep.hadoop.version>2.9.2</dep.hadoop.version>
</properties>

<dependencies>
Expand Down
16 changes: 15 additions & 1 deletion src/main/java/com/facebook/presto/hadoop/HadoopNative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;

import static org.apache.hadoop.io.compress.CompressionCodecFactory.getCodecClasses;

Expand Down Expand Up @@ -59,11 +61,23 @@ public static synchronized void requireHadoopNative()
}
}

public static List<Class<? extends CompressionCodec>> getCodecs(Configuration conf)
{
// Skip zstd for now, we rely on it being pre-installed rather than included in presto-hadoop-apache2
List<Class<? extends CompressionCodec>> codecs = new ArrayList<>();
for (Class<? extends CompressionCodec> clazz : getCodecClasses(conf)) {
if (clazz.getName() != "org.apache.hadoop.io.compress.ZStandardCodec") {
codecs.add(clazz);
}
}
return codecs;
}

private static void loadAllCodecs()
{
Configuration conf = new Configuration();
CompressionCodecFactory factory = new CompressionCodecFactory(conf);
for (Class<? extends CompressionCodec> clazz : getCodecClasses(conf)) {
for (Class<? extends CompressionCodec> clazz : getCodecs(conf)) {
CompressionCodec codec = factory.getCodecByClassName(clazz.getName());
if (codec == null) {
throw new RuntimeException("failed to load codec: " + clazz.getName());
Expand Down
Binary file modified src/main/resources/nativelib/Linux-amd64/libhadoop.so
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/nativelib/Mac_OS_X-x86_64/libhadoop.dylib
View file
Open in desktop
Binary file not shown.
7 changes: 2 additions & 5 deletions src/test/java/com/facebook/presto/hadoop/TestHadoopNative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.compress.CompressionCodec;
import org.apache.hadoop.io.compress.CompressionCodecFactory;
import org.apache.hadoop.io.compress.bzip2.Bzip2Factory;
import org.apache.hadoop.io.compress.zlib.ZlibFactory;
import org.apache.hadoop.util.NativeCodeLoader;
import org.testng.annotations.Test;
Expand All @@ -27,8 +26,8 @@
import java.io.InputStream;
import java.io.OutputStream;

import static com.facebook.presto.hadoop.HadoopNative.getCodecs;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.io.compress.CompressionCodecFactory.getCodecClasses;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
Expand All @@ -43,7 +42,6 @@ public void testNative()
assertTrue(NativeCodeLoader.isNativeCodeLoaded());
assertTrue(NativeCodeLoader.buildSupportsSnappy());
assertTrue(ZlibFactory.isNativeZlibLoaded(new Configuration()));
assertTrue(Bzip2Factory.isNativeBzip2Loaded(new Configuration()));
}

@Test
Expand All @@ -54,7 +52,7 @@ public void testCodecRoundTrip()

Configuration conf = new Configuration();
CompressionCodecFactory factory = new CompressionCodecFactory(conf);
for (Class<? extends CompressionCodec> clazz : getCodecClasses(conf)) {
for (Class<? extends CompressionCodec> clazz : getCodecs(conf)) {
CompressionCodec codec = factory.getCodecByClassName(clazz.getName());
assertNotNull(codec, clazz.getName());

Expand All @@ -70,7 +68,6 @@ private static byte[] compress(CompressionCodec codec, byte[] input)
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
try (OutputStream out = codec.createOutputStream(bytes)) {
out.write(input);
out.close();
}
return bytes.toByteArray();
}
Expand Down