You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by bo...@apache.org on 2018/07/27 09:29:32 UTC
sqoop git commit: SQOOP-3350: Fix tests which use warehouse-dir as
target-dir
Repository: sqoop
Updated Branches:
refs/heads/trunk a06f2f3a8 -> 1213b7725
SQOOP-3350: Fix tests which use warehouse-dir as target-dir
(Szabolcs Vasas via Boglarka Egyed)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/1213b772
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/1213b772
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/1213b772
Branch: refs/heads/trunk
Commit: 1213b7725a65e561d8db071141e04944c85d1f94
Parents: a06f2f3
Author: Boglarka Egyed <bo...@apache.org>
Authored: Fri Jul 27 11:27:18 2018 +0200
Committer: Boglarka Egyed <bo...@apache.org>
Committed: Fri Jul 27 11:27:18 2018 +0200
----------------------------------------------------------------------
src/test/org/apache/sqoop/TestFreeFormQueryImport.java | 5 ++---
.../sqoop/manager/mysql/MySqlColumnEscapeImportTest.java | 5 ++---
.../sqoop/manager/oracle/OracleColumnEscapeImportTest.java | 5 ++---
.../sqoop/manager/oracle/OracleIncrementalImportTest.java | 8 +++-----
.../oracle/OracleSpecialCharacterTableImportTest.java | 5 ++---
.../org/apache/sqoop/manager/oracle/OracleSplitterTest.java | 6 +++---
6 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/TestFreeFormQueryImport.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/TestFreeFormQueryImport.java b/src/test/org/apache/sqoop/TestFreeFormQueryImport.java
index 2df4352..d39faee 100644
--- a/src/test/org/apache/sqoop/TestFreeFormQueryImport.java
+++ b/src/test/org/apache/sqoop/TestFreeFormQueryImport.java
@@ -90,7 +90,7 @@ public class TestFreeFormQueryImport extends ImportJobTestCase {
args.add("--connect");
args.add(getConnectString());
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--split-by");
args.add(splitByCol);
args.add("--num-mappers");
@@ -134,8 +134,7 @@ public class TestFreeFormQueryImport extends ImportJobTestCase {
runImport(getArgv(tableName1 + "." + getColName(0), query));
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath(), "part-m-00000");
String expectedVal = "1,foo";
BufferedReader reader = null;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/manager/mysql/MySqlColumnEscapeImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/manager/mysql/MySqlColumnEscapeImportTest.java b/src/test/org/apache/sqoop/manager/mysql/MySqlColumnEscapeImportTest.java
index 734499e..eaab8c5 100644
--- a/src/test/org/apache/sqoop/manager/mysql/MySqlColumnEscapeImportTest.java
+++ b/src/test/org/apache/sqoop/manager/mysql/MySqlColumnEscapeImportTest.java
@@ -87,7 +87,7 @@ public class MySqlColumnEscapeImportTest extends ImportJobTestCase {
args.add(mySQLTestUtils.getUserName());
mySQLTestUtils.addPasswordIfIsSet(args);
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--num-mappers");
args.add("1");
args.add("--table");
@@ -105,8 +105,7 @@ public class MySqlColumnEscapeImportTest extends ImportJobTestCase {
String[] args = getArgv();
runImport(args);
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath(), "part-m-00000");
String output = Files.toString(new File(filePath.toString()), Charsets.UTF_8);
assertEquals("hello, world", output.trim());
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java
index d4146dc..684586c 100644
--- a/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java
@@ -87,7 +87,7 @@ public class OracleColumnEscapeImportTest extends ImportJobTestCase {
args.add("--password");
args.add(OracleUtils.ORACLE_USER_PASS);
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--num-mappers");
args.add("1");
args.add("--query");
@@ -104,8 +104,7 @@ public class OracleColumnEscapeImportTest extends ImportJobTestCase {
String[] args = getArgv();
runImport(args);
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath(), "part-m-00000");
String output = Files.toString(new File(filePath.toString()), Charsets.UTF_8);
assertEquals("hello, world!", output.trim());
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java
index 4dde3d6..8e6ccc9 100644
--- a/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java
@@ -109,7 +109,7 @@ public class OracleIncrementalImportTest extends ImportJobTestCase {
args.add("--connect");
args.add(getConnectString());
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--num-mappers");
args.add("1");
args.add("--split-by");
@@ -153,8 +153,7 @@ public class OracleIncrementalImportTest extends ImportJobTestCase {
String[] args = getArgv(tableName, connPropsFileName, getColName(2));
runImport(args);
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath().toString(), "part-m-00000");
String output = readLineFromPath(filePath);
String expectedVal = "2,new_data,2000-11-11";
assertEquals("Incremental import result expected a different string",
@@ -181,8 +180,7 @@ public class OracleIncrementalImportTest extends ImportJobTestCase {
String[] args = getArgv(tableName, connPropsFileName, getColName(2));
runImport(args);
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath(), "part-m-00000");
String output = readLineFromPath(filePath);
String expectedVal = "2,new_data,2000-11-11 23:23:23.0";
assertEquals("Incremental import result expected a different string",
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java
index 453ad82..6539e5a 100644
--- a/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java
@@ -98,7 +98,7 @@ public class OracleSpecialCharacterTableImportTest extends ImportJobTestCase {
args.add("--password");
args.add(OracleUtils.ORACLE_USER_PASS);
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--num-mappers");
args.add("1");
args.add("--table");
@@ -120,8 +120,7 @@ public class OracleSpecialCharacterTableImportTest extends ImportJobTestCase {
String[] args = getArgv();
runImport(args);
- Path warehousePath = new Path(this.getWarehouseDir());
- Path filePath = new Path(warehousePath, "part-m-00000");
+ Path filePath = new Path(getTablePath(), "part-m-00000");
String output = Files.toString(new File(filePath.toString()), Charsets.UTF_8);
assertEquals("hello, world!", output.trim());
http://git-wip-us.apache.org/repos/asf/sqoop/blob/1213b772/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java
index 33b7d74..c2f9532 100644
--- a/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java
+++ b/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java
@@ -91,7 +91,7 @@ public class OracleSplitterTest extends ImportJobTestCase {
args.add("--connect");
args.add(getConnectString());
args.add("--target-dir");
- args.add(getWarehouseDir());
+ args.add(getTablePath().toString());
args.add("--num-mappers");
args.add("2");
args.add("--split-by");
@@ -127,13 +127,13 @@ public class OracleSplitterTest extends ImportJobTestCase {
List<String> lines;
// First row should be in the first file
- file = new File(this.getWarehouseDir(), "part-m-00000");
+ file = new File(getTablePath().toString(), "part-m-00000");
lines = FileUtils.readLines(file, "UTF-8");
assertEquals(1, lines.size());
assertEquals("1,old_data,1999-01-01 11:11:11.0", lines.get(0));
// With second line in the second file
- file = new File(this.getWarehouseDir(), "part-m-00001");
+ file = new File(getTablePath().toString(), "part-m-00001");
lines = FileUtils.readLines(file, "UTF-8");
assertEquals(1, lines.size());
assertEquals("2,new_data,2000-11-11 23:23:23.0", lines.get(0));