You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2015/08/25 18:01:30 UTC
sqoop git commit: SQOOP-2528: Sqoop2: findbugs: Fix warning in test
module
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 afa865e3b -> 3864ccf03
SQOOP-2528: Sqoop2: findbugs: Fix warning in test module
(Colin Ma via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/3864ccf0
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/3864ccf0
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/3864ccf0
Branch: refs/heads/sqoop2
Commit: 3864ccf036e092fd8b46f0403b19f0bff515990e
Parents: afa865e
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Tue Aug 25 09:00:40 2015 -0700
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Tue Aug 25 09:00:40 2015 -0700
----------------------------------------------------------------------
.../org/apache/sqoop/test/asserts/HdfsAsserts.java | 14 +++++++-------
.../sqoop/test/hadoop/HadoopRealClusterRunner.java | 13 +++++++------
.../org/apache/sqoop/test/hive/HiveServerRunner.java | 10 ++++++++--
.../apache/sqoop/test/hive/MetastoreServerRunner.java | 10 ++++++++--
.../sqoop/test/infrastructure/SqoopTestCase.java | 2 +-
.../sqoop/test/testcases/ConnectorTestCase.java | 2 +-
.../apache/sqoop/test/testng/SqoopTestListener.java | 14 ++++++++++++--
.../org/apache/sqoop/test/utils/CompressionUtils.java | 13 ++++++++-----
.../java/org/apache/sqoop/test/utils/HdfsUtils.java | 14 ++++++++------
9 files changed, 60 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/asserts/HdfsAsserts.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/asserts/HdfsAsserts.java b/test/src/main/java/org/apache/sqoop/test/asserts/HdfsAsserts.java
index e53a76f..913cdbe 100644
--- a/test/src/main/java/org/apache/sqoop/test/asserts/HdfsAsserts.java
+++ b/test/src/main/java/org/apache/sqoop/test/asserts/HdfsAsserts.java
@@ -28,6 +28,7 @@ import org.apache.sqoop.test.utils.HdfsUtils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
@@ -57,15 +58,14 @@ public class HdfsAsserts {
Path[] files = HdfsUtils.getOutputMapreduceFiles(fs, directory);
for(Path file : files) {
- BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(file)));
-
- String line;
- while ((line = br.readLine()) != null) {
- if (!setLines.remove(line)) {
- notFound.add(line);
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(fs.open(file), Charset.forName("UTF-8")))) {
+ String line;
+ while ((line = br.readLine()) != null) {
+ if (!setLines.remove(line)) {
+ notFound.add(line);
+ }
}
}
- br.close();
}
if(!setLines.isEmpty() || !notFound.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/hadoop/HadoopRealClusterRunner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/hadoop/HadoopRealClusterRunner.java b/test/src/main/java/org/apache/sqoop/test/hadoop/HadoopRealClusterRunner.java
index eabdf0b..0816067 100644
--- a/test/src/main/java/org/apache/sqoop/test/hadoop/HadoopRealClusterRunner.java
+++ b/test/src/main/java/org/apache/sqoop/test/hadoop/HadoopRealClusterRunner.java
@@ -50,12 +50,7 @@ public class HadoopRealClusterRunner extends HadoopRunner {
LOG.debug("Config path is: " + configPath);
File dir = new File(configPath);
- String [] files = dir.list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.endsWith("-site.xml");
- }
- });
+ String [] files = dir.list(new HRCRRilenameFilter());
if(files == null) {
throw new FileNotFoundException("Hadoop config files not found: " + configPath);
@@ -81,4 +76,10 @@ public class HadoopRealClusterRunner extends HadoopRunner {
}
+ private static class HRCRRilenameFilter implements FilenameFilter {
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.endsWith("-site.xml");
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/hive/HiveServerRunner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/hive/HiveServerRunner.java b/test/src/main/java/org/apache/sqoop/test/hive/HiveServerRunner.java
index 8b355bd..1cdb0d2 100644
--- a/test/src/main/java/org/apache/sqoop/test/hive/HiveServerRunner.java
+++ b/test/src/main/java/org/apache/sqoop/test/hive/HiveServerRunner.java
@@ -23,7 +23,9 @@ import org.apache.log4j.Logger;
import org.apache.sqoop.common.test.utils.NetworkUtils;
import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
/**
* Hive server runner for testing purpose.
@@ -129,7 +131,11 @@ public abstract class HiveServerRunner {
private void printConfig() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- config.logVars(new PrintStream(baos));
- LOG.debug("Hive server runner configuration:\n" + baos.toString());
+ try {
+ config.logVars(new PrintStream(baos.toString("UTF-8"), "UTF-8"));
+ LOG.debug("Hive server runner configuration:\n" + baos.toString("UTF-8"));
+ } catch (UnsupportedEncodingException|FileNotFoundException e) {
+ LOG.warn("Error to print the Hive server runner configuration.", e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/hive/MetastoreServerRunner.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/hive/MetastoreServerRunner.java b/test/src/main/java/org/apache/sqoop/test/hive/MetastoreServerRunner.java
index 32a6b35..8a822b5 100644
--- a/test/src/main/java/org/apache/sqoop/test/hive/MetastoreServerRunner.java
+++ b/test/src/main/java/org/apache/sqoop/test/hive/MetastoreServerRunner.java
@@ -23,7 +23,9 @@ import org.apache.log4j.Logger;
import org.apache.sqoop.common.test.utils.NetworkUtils;
import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
import java.util.UUID;
/**
@@ -131,7 +133,11 @@ public abstract class MetastoreServerRunner {
private void printConfig() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- config.logVars(new PrintStream(baos));
- LOG.debug("Hive server runner configuration:\n" + baos.toString());
+ try {
+ config.logVars(new PrintStream(baos.toString("UTF-8"), "UTF-8"));
+ LOG.debug("Hive server runner configuration:\n" + baos.toString("UTF-8"));
+ } catch (UnsupportedEncodingException |FileNotFoundException e) {
+ LOG.warn("Error to print the Hive server runner configuration.", e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java b/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java
index 5cae43b..82043ea 100644
--- a/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java
+++ b/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java
@@ -74,7 +74,7 @@ public class SqoopTestCase implements ITest {
/**
* Default submission callbacks that are printing various status about the submission.
*/
- protected static SubmissionCallback DEFAULT_SUBMISSION_CALLBACKS = new SubmissionCallback() {
+ protected static final SubmissionCallback DEFAULT_SUBMISSION_CALLBACKS = new SubmissionCallback() {
@Override
public void submitted(MSubmission submission) {
LOG.info("Submission submitted: " + submission);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java b/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
index 622c3af..e3e7bfe 100644
--- a/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
+++ b/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
@@ -55,7 +55,7 @@ abstract public class ConnectorTestCase extends TomcatTestCase {
/**
* Default submission callbacks that are printing various status about the submission.
*/
- protected static SubmissionCallback DEFAULT_SUBMISSION_CALLBACKS = new SubmissionCallback() {
+ protected static final SubmissionCallback DEFAULT_SUBMISSION_CALLBACKS = new SubmissionCallback() {
@Override
public void submitted(MSubmission submission) {
LOG.info("Submission submitted: " + submission);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/testng/SqoopTestListener.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/testng/SqoopTestListener.java b/test/src/main/java/org/apache/sqoop/test/testng/SqoopTestListener.java
index c86a765..b9c1406 100644
--- a/test/src/main/java/org/apache/sqoop/test/testng/SqoopTestListener.java
+++ b/test/src/main/java/org/apache/sqoop/test/testng/SqoopTestListener.java
@@ -18,12 +18,14 @@
package org.apache.sqoop.test.testng;
import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
import org.testng.ITestResult;
import org.testng.TestListenerAdapter;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
/**
* Sqoop specific listener that will print name of each particular test that being run.
@@ -31,14 +33,22 @@ import java.io.PrintStream;
* Particularly suitable for integration tests that generally takes long time to finish.
*/
public class SqoopTestListener extends TestListenerAdapter {
-
+ private static final Logger LOG = Logger.getLogger(SqoopTestListener.class);
/**
* Sqoop tests are generally running with redirectTestOutputToFile=true which means
* that System.out is redirected to file. That is unpleasant as output user is suppose
* to see is not available on the console. Hence instead of System.out we're using
* directly the STDOUT file descriptor.
*/
- static PrintStream ps = new PrintStream(new FileOutputStream(FileDescriptor.out));
+ static PrintStream ps;
+
+ static {
+ try {
+ ps = new PrintStream(new FileOutputStream(FileDescriptor.out), false, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ LOG.warn("Error when initialize the SqoopTestListener.", e);
+ }
+ }
@Override
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/utils/CompressionUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/utils/CompressionUtils.java b/test/src/main/java/org/apache/sqoop/test/utils/CompressionUtils.java
index d7255c3..766e2fc 100644
--- a/test/src/main/java/org/apache/sqoop/test/utils/CompressionUtils.java
+++ b/test/src/main/java/org/apache/sqoop/test/utils/CompressionUtils.java
@@ -59,17 +59,20 @@ public class CompressionUtils {
LOG.info("Untaring file: " + entry.getName());
if (entry.isDirectory()) {
- (new File( HdfsUtils.joinPathFragments(targetDirectory, entry.getName()))).mkdirs();
+ File targetFile = new File( HdfsUtils.joinPathFragments(targetDirectory, entry.getName()));
+ if (!targetFile.mkdirs()) {
+ LOG.warn("Failed to create folder:" + targetFile.getAbsolutePath());
+ }
} else {
int count;
byte data[] = new byte[BUFFER_SIZE];
FileOutputStream fos = new FileOutputStream(HdfsUtils.joinPathFragments(targetDirectory, entry.getName()));
- BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE);
- while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) {
- dest.write(data, 0, count);
+ try (BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE)) {
+ while ((count = in.read(data, 0, BUFFER_SIZE)) != -1) {
+ dest.write(data, 0, count);
+ }
}
- dest.close();
}
}
in.close();
http://git-wip-us.apache.org/repos/asf/sqoop/blob/3864ccf0/test/src/main/java/org/apache/sqoop/test/utils/HdfsUtils.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/utils/HdfsUtils.java b/test/src/main/java/org/apache/sqoop/test/utils/HdfsUtils.java
index 7f83b2d..610156e 100644
--- a/test/src/main/java/org/apache/sqoop/test/utils/HdfsUtils.java
+++ b/test/src/main/java/org/apache/sqoop/test/utils/HdfsUtils.java
@@ -32,6 +32,7 @@ import java.io.BufferedWriter;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
import java.util.LinkedList;
/**
@@ -43,7 +44,7 @@ public class HdfsUtils {
private static final char PATH_SEPARATOR = '/';
- public static PathFilter filterHiddenFiles = new PathFilter() {
+ public static final PathFilter filterHiddenFiles = new PathFilter() {
@Override
public boolean accept(Path path) {
String fileName = path.getName();
@@ -77,12 +78,13 @@ public class HdfsUtils {
* @throws IOException
*/
public static void createFile(FileSystem fs, String path, String ...lines) throws IOException {
- BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fs.create(new Path(path), true)));
- for (String line : lines) {
- writer.write(line);
- writer.newLine();
+ try (BufferedWriter writer = new BufferedWriter(
+ new OutputStreamWriter(fs.create(new Path(path), true), Charset.forName("UTF-8")))) {
+ for (String line : lines) {
+ writer.write(line);
+ writer.newLine();
+ }
}
- writer.close();
}
/**