.../src/java/org/apache/hadoop/hive/accumulo/Utils.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java index 407ecbd..a759757 100644 --- a/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java +++ b/accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/Utils.java @@ -39,6 +39,7 @@ import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; +import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -121,7 +122,7 @@ private static Path findOrCreateJar(Class my_class, FileSystem fs, return null; } - log.debug(String.format("For class %s, using jar %s", my_class.getName(), jar)); + log.debug("For class {}, using jar {}", my_class.getName(), jar); return new Path(jar).makeQualified(fs); } @@ -208,9 +209,9 @@ private static String getJar(Class my_class) { String hadoopJarFinder = "org.apache.hadoop.util.JarFinder"; Class jarFinder = null; try { - log.debug("Looking for " + hadoopJarFinder + "."); + log.debug("Looking for: {}", hadoopJarFinder); jarFinder = JavaUtils.loadClass(hadoopJarFinder); - log.debug(hadoopJarFinder + " found."); + log.debug("Found: {}", hadoopJarFinder); Method getJar = jarFinder.getMethod("getJar", Class.class); ret = (String) getJar.invoke(null, my_class); } catch (ClassNotFoundException e) { @@ -280,12 +281,7 @@ public static String jarFinderGetJar(Class klass) { private static void copyToZipStream(InputStream is, ZipEntry entry, ZipOutputStream zos) throws IOException { zos.putNextEntry(entry); - byte[] arr = new byte[4096]; - int read = is.read(arr); - while (read > -1) { - zos.write(arr, 0, read); - read = is.read(arr); - } + IOUtils.copy(is, zos); is.close(); zos.closeEntry(); }