github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-04 14:19:04 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2950: Sqoop trunk has consistent UT failures - need fixing

Browse Source 
(Venkat Ranganathan via Venkat Ranganathan)
This commit is contained in:
Venkat Ranganathan 2016-06-13 17:29:02 +05:30
parent b302d89fae
commit c339b23b6c
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/com/cloudera/sqoop/TestAvroExport.java
View File

@ -240,11 +240,11 @@ private void createTable(ColumnGenerator... extraColumns)
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("CREATE TABLE "); sb.append("CREATE TABLE ");
sb.append(getTableName()); sb.append(getTableName());
sb.append(" (\"id\" INT NOT NULL PRIMARY KEY, \"msg\" VARCHAR(64)"); sb.append(" (id INT NOT NULL PRIMARY KEY, msg VARCHAR(64)");
int colNum = 0; int colNum = 0;
for (ColumnGenerator gen : extraColumns) { for (ColumnGenerator gen : extraColumns) {
if (gen.getColumnType() != null) { if (gen.getColumnType() != null) {
sb.append(", \"" + forIdx(colNum++) + "\" " + gen.getColumnType()); sb.append(", " + forIdx(colNum++) + " " + gen.getColumnType());
} }
} }
sb.append(")"); sb.append(")");
@ -301,7 +301,7 @@ private void assertColValForRowId(int id, String colName, Object expectedVal)
LOG.info("Verifying column " + colName + " has value " + expectedVal); LOG.info("Verifying column " + colName + " has value " + expectedVal);
PreparedStatement statement = conn.prepareStatement( PreparedStatement statement = conn.prepareStatement(
"SELECT \"" + colName + "\" FROM " + getTableName() + " WHERE \"id\" = " + id, "SELECT " + colName + " FROM " + getTableName() + " WHERE ID = " + id,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
Object actualVal = null; Object actualVal = null;
try { try {
@ -511,7 +511,7 @@ public void testSpecifiedColumnsAsAvroFields() throws IOException, SQLException
}; };
createAvroFile(0, TOTAL_RECORDS, gens); createAvroFile(0, TOTAL_RECORDS, gens);
createTable(gens); createTable(gens);
runExport(getArgv(true, 10, 10, newStrArray(null, "-m", "" + 1, "--columns", "id,msg,col1,col2"))); runExport(getArgv(true, 10, 10, newStrArray(null, "-m", "" + 1, "--columns", "ID,MSG,COL1,COL2")));
verifyExport(TOTAL_RECORDS); verifyExport(TOTAL_RECORDS);
assertColValForRowId(0, "col0", null); assertColValForRowId(0, "col0", null);
assertColValForRowId(0, "col1", 111); assertColValForRowId(0, "col1", 111);

4
src/test/com/cloudera/sqoop/TestAvroImport.java
View File

@ -228,10 +228,10 @@ public void testNonstandardCharactersInColumnName() throws IOException {
List<Field> fields = schema.getFields(); List<Field> fields = schema.getFields();
assertEquals(types.length, fields.size()); assertEquals(types.length, fields.size());
checkField(fields.get(0), "AVRO_1", Type.INT); checkField(fields.get(0), "AVRO\uC3A11", Type.INT);
GenericRecord record1 = reader.next(); GenericRecord record1 = reader.next();
assertEquals("AVRO_1", 1987, record1.get("AVRO_1")); assertEquals("AVRO\uC3A11", 1987, record1.get("AVRO\uC3A11"));
} }
public void testNonIdentCharactersInColumnName() throws IOException { public void testNonIdentCharactersInColumnName() throws IOException {

2
src/test/com/cloudera/sqoop/TestExport.java
View File

@ -249,7 +249,7 @@ private void createSequenceFile(int fileNum, int numRecords, String className)
* @return the name of the column * @return the name of the column
*/ */
protected String forIdx(int idx) { protected String forIdx(int idx) {
return "col" + idx; return "COL" + idx;
} }
/** /**

4
src/test/com/cloudera/sqoop/TestParquetExport.java
View File

@ -217,7 +217,7 @@ private void createTable(ColumnGenerator... extraColumns)
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("CREATE TABLE "); sb.append("CREATE TABLE ");
sb.append(getTableName()); sb.append(getTableName());
sb.append(" (\"id\" INT NOT NULL PRIMARY KEY, \"msg\" VARCHAR(64)"); sb.append(" (\"ID\" INT NOT NULL PRIMARY KEY, \"MSG\" VARCHAR(64)");
int colNum = 0; int colNum = 0;
for (ColumnGenerator gen : extraColumns) { for (ColumnGenerator gen : extraColumns) {
if (gen.getColumnType() != null) { if (gen.getColumnType() != null) {
@ -277,7 +277,7 @@ private void assertColValForRowId(int id, String colName, Object expectedVal)
LOG.info("Verifying column " + colName + " has value " + expectedVal); LOG.info("Verifying column " + colName + " has value " + expectedVal);
PreparedStatement statement = conn.prepareStatement( PreparedStatement statement = conn.prepareStatement(
"SELECT \"" + colName + "\" FROM " + getTableName() + " WHERE \"id\" = " + id, "SELECT \"" + colName + "\" FROM " + getTableName() + " WHERE \"ID\" = " + id,
ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
Object actualVal = null; Object actualVal = null;
try { try {

5
src/test/org/apache/sqoop/TestExportUsingProcedure.java
View File

@ -235,11 +235,10 @@ private static void insertFunction(int id, String msg,
StringBuilder sql = new StringBuilder("insert into "); StringBuilder sql = new StringBuilder("insert into ");
sql.append(instanceForProcedure.getTableName()); sql.append(instanceForProcedure.getTableName());
sql.append("(\"id\", \"msg\""); sql.append("(id, msg");
for (int i = 0; i < instanceForProcedure.names.length; ++i) { for (int i = 0; i < instanceForProcedure.names.length; ++i) {
sql.append(", \""); sql.append(",");
sql.append(instanceForProcedure.names[i]); sql.append(instanceForProcedure.names[i]);
sql.append("\"");
} }
sql.append(") values ("); sql.append(") values (");
for (int i = 0; i < instanceForProcedure.names.length + 2; ++i) { for (int i = 0; i < instanceForProcedure.names.length + 2; ++i) {