You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by bl...@apache.org on 2012/01/27 03:38:59 UTC
svn commit: r1236496 - in /incubator/sqoop/trunk/src:
java/org/apache/sqoop/cli/ java/org/apache/sqoop/hive/
java/org/apache/sqoop/mapreduce/ java/org/apache/sqoop/mapreduce/db/
java/org/apache/sqoop/orm/ java/org/apache/sqoop/tool/ test/ test/com/clou...
Author: blee
Date: Fri Jan 27 02:38:58 2012
New Revision: 1236496
URL: http://svn.apache.org/viewvc?rev=1236496&view=rev
Log:
SQOOP-432. Enforce writing space after if statement
Modified:
incubator/sqoop/trunk/src/java/org/apache/sqoop/cli/SqoopParser.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/hive/TableDefWriter.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/DataDrivenImportJob.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java
incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/ImportTool.java
incubator/sqoop/trunk/src/test/checkstyle.xml
incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/cli/SqoopParser.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/cli/SqoopParser.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/cli/SqoopParser.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/cli/SqoopParser.java Fri Jan 27 02:38:58 2012
@@ -106,7 +106,7 @@ public class SqoopParser extends GnuPars
private String stripMatchedQuotes(String in) {
if (null == in || "\"".equals(in)) {
return in; // single quote stays as-is.
- } else if(in.startsWith("\"") && in.endsWith("\"")) {
+ } else if (in.startsWith("\"") && in.endsWith("\"")) {
// Strip this pair of matched quotes.
return in.substring(1, in.length() - 1);
} else {
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/hive/TableDefWriter.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/hive/TableDefWriter.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/hive/TableDefWriter.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/hive/TableDefWriter.java Fri Jan 27 02:38:58 2012
@@ -142,13 +142,13 @@ public class TableDefWriter {
for(Object column : userMapping.keySet()) {
boolean found = false;
for(String c : colNames) {
- if(c.equals(column)) {
+ if (c.equals(column)) {
found = true;
break;
}
}
- if(!found) {
+ if (!found) {
throw new IllegalArgumentException("No column by the name " + column
+ "found while importing data");
}
@@ -164,7 +164,9 @@ public class TableDefWriter {
Integer colType = columnTypes.get(col);
String hiveColType = userMapping.getProperty(col);
- if(hiveColType == null) { hiveColType = connManager.toHiveType(colType); }
+ if (hiveColType == null) {
+ hiveColType = connManager.toHiveType(colType);
+ }
if (null == hiveColType) {
throw new IOException("Hive does not support the SQL type for column "
+ col);
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/DataDrivenImportJob.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/DataDrivenImportJob.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/DataDrivenImportJob.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/DataDrivenImportJob.java Fri Jan 27 02:38:58 2012
@@ -154,7 +154,7 @@ public class DataDrivenImportJob extends
// If user specified boundary query on the command line propagate it to
// the job
- if(options.getBoundaryQuery() != null) {
+ if (options.getBoundaryQuery() != null) {
DataDrivenDBInputFormat.setBoundingQuery(job.getConfiguration(),
options.getBoundaryQuery());
}
@@ -166,7 +166,7 @@ public class DataDrivenImportJob extends
String inputBoundingQuery = options.getBoundaryQuery();
- if(inputBoundingQuery == null) {
+ if (inputBoundingQuery == null) {
inputBoundingQuery =
mgr.getInputBoundsQuery(splitByCol, sanitizedQuery);
if (inputBoundingQuery == null) {
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java Fri Jan 27 02:38:58 2012
@@ -177,7 +177,7 @@ public class DBConfiguration {
Class.forName(conf.get(DBConfiguration.DRIVER_CLASS_PROPERTY));
- if(conf.get(DBConfiguration.USERNAME_PROPERTY) == null) {
+ if (conf.get(DBConfiguration.USERNAME_PROPERTY) == null) {
return DriverManager.getConnection(
conf.get(DBConfiguration.URL_PROPERTY));
} else {
@@ -237,7 +237,7 @@ public class DBConfiguration {
}
public void setInputOrderBy(String orderby) {
- if(orderby != null && orderby.length() >0) {
+ if (orderby != null && orderby.length() >0) {
conf.set(DBConfiguration.INPUT_ORDER_BY_PROPERTY, orderby);
}
}
@@ -247,7 +247,7 @@ public class DBConfiguration {
}
public void setInputQuery(String query) {
- if(query != null && query.length() >0) {
+ if (query != null && query.length() >0) {
conf.set(DBConfiguration.INPUT_QUERY, query);
}
}
@@ -257,7 +257,7 @@ public class DBConfiguration {
}
public void setInputCountQuery(String query) {
- if(query != null && query.length() > 0) {
+ if (query != null && query.length() > 0) {
conf.set(DBConfiguration.INPUT_COUNT_QUERY, query);
}
}
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBInputFormat.java Fri Jan 27 02:38:58 2012
@@ -289,7 +289,7 @@ extends InputFormat<LongWritable, T> imp
* subclasses can override this for custom behaviour.*/
protected String getCountQuery() {
- if(dbConf.getInputCountQuery() != null) {
+ if (dbConf.getInputCountQuery() != null) {
return dbConf.getInputCountQuery();
}
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBOutputFormat.java Fri Jan 27 02:38:58 2012
@@ -70,7 +70,7 @@ public class DBOutputFormat<K extends DB
* array of nulls.
*/
public String constructQuery(String table, String[] fieldNames) {
- if(fieldNames == null) {
+ if (fieldNames == null) {
throw new IllegalArgumentException("Field names may not be null");
}
@@ -91,7 +91,7 @@ public class DBOutputFormat<K extends DB
for (int i = 0; i < fieldNames.length; i++) {
query.append("?");
- if(i != fieldNames.length - 1) {
+ if (i != fieldNames.length - 1) {
query.append(",");
}
}
@@ -108,7 +108,7 @@ public class DBOutputFormat<K extends DB
String tableName = dbConf.getOutputTableName();
String[] fieldNames = dbConf.getOutputFieldNames();
- if(fieldNames == null) {
+ if (fieldNames == null) {
fieldNames = new String[dbConf.getOutputFieldCount()];
}
@@ -135,7 +135,7 @@ public class DBOutputFormat<K extends DB
*/
public static void setOutput(Job job, String tableName,
String... fieldNames) throws IOException {
- if(fieldNames.length > 0 && fieldNames[0] != null) {
+ if (fieldNames.length > 0 && fieldNames[0] != null) {
DBConfiguration dbConf = setOutput(job, tableName);
dbConf.setOutputFieldNames(fieldNames);
} else {
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DBRecordReader.java Fri Jan 27 02:38:58 2012
@@ -118,7 +118,7 @@ public class DBRecordReader<T extends DB
// Default codepath for MySQL, HSQLDB, etc.
// Relies on LIMIT/OFFSET for splits.
- if(dbConf.getInputQuery() == null) {
+ if (dbConf.getInputQuery() == null) {
query.append("SELECT ");
for (int i = 0; i < fieldNames.length; i++) {
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/DataDrivenDBRecordReader.java Fri Jan 27 02:38:58 2012
@@ -85,7 +85,7 @@ public class DataDrivenDBRecordReader<T
conditionClauses.append(" ) AND ( ").append(dataSplit.getUpperClause());
conditionClauses.append(" )");
- if(dbConf.getInputQuery() == null) {
+ if (dbConf.getInputQuery() == null) {
// We need to generate the entire query.
query.append("SELECT ");
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/mapreduce/db/OracleDBRecordReader.java Fri Jan 27 02:38:58 2012
@@ -62,7 +62,7 @@ extends DBRecordReader<T> {
String [] fieldNames = getFieldNames();
// Oracle-specific codepath to use rownum instead of LIMIT/OFFSET.
- if(dbConf.getInputQuery() == null) {
+ if (dbConf.getInputQuery() == null) {
query.append("SELECT ");
for (int i = 0; i < fieldNames.length; i++) {
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/AvroSchemaGenerator.java Fri Jan 27 02:38:58 2012
@@ -114,13 +114,13 @@ public class AvroSchemaGenerator {
}
private Type toAvroType(String type) {
- if(type.equalsIgnoreCase("INTEGER")) { return Type.INT; }
- if(type.equalsIgnoreCase("LONG")) { return Type.LONG; }
- if(type.equalsIgnoreCase("BOOLEAN")) { return Type.BOOLEAN; }
- if(type.equalsIgnoreCase("FLOAT")) { return Type.FLOAT; }
- if(type.equalsIgnoreCase("DOUBLE")) { return Type.DOUBLE; }
- if(type.equalsIgnoreCase("STRING")) { return Type.STRING; }
- if(type.equalsIgnoreCase("BYTES")) { return Type.BYTES; }
+ if (type.equalsIgnoreCase("INTEGER")) { return Type.INT; }
+ if (type.equalsIgnoreCase("LONG")) { return Type.LONG; }
+ if (type.equalsIgnoreCase("BOOLEAN")) { return Type.BOOLEAN; }
+ if (type.equalsIgnoreCase("FLOAT")) { return Type.FLOAT; }
+ if (type.equalsIgnoreCase("DOUBLE")) { return Type.DOUBLE; }
+ if (type.equalsIgnoreCase("STRING")) { return Type.STRING; }
+ if (type.equalsIgnoreCase("BYTES")) { return Type.BYTES; }
// Mapping was not found
throw new IllegalArgumentException("Cannot convert to AVRO type " + type);
@@ -138,7 +138,7 @@ public class AvroSchemaGenerator {
// Try to apply any user specified mapping
Type targetType;
- if(columnName != null && mappingJava.containsKey(columnName)) {
+ if (columnName != null && mappingJava.containsKey(columnName)) {
targetType = toAvroType((String)mappingJava.get(columnName));
} else {
targetType = toAvroType(sqlType);
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/orm/ClassWriter.java Fri Jan 27 02:38:58 2012
@@ -242,9 +242,9 @@ public class ClassWriter {
private String toJavaType(String columnName, int sqlType) {
Properties mapping = options.getMapColumnJava();
- if(mapping.containsKey(columnName)) {
+ if (mapping.containsKey(columnName)) {
String type = mapping.getProperty(columnName);
- if(LOG.isDebugEnabled()) {
+ if (LOG.isDebugEnabled()) {
LOG.info("Overriding type of column " + columnName + " to " + type);
}
return type;
@@ -1069,7 +1069,7 @@ public class ClassWriter {
String identifier = cleanedColNames[i];
// Name can't be blank
- if(identifier.isEmpty()) {
+ if (identifier.isEmpty()) {
throw new IllegalArgumentException("We found column without column "
+ "name. Please verify that you've entered all column names "
+ "in your query if using free form query import (consider "
@@ -1097,9 +1097,9 @@ public class ClassWriter {
// Check that all explicitly mapped columns are present in result set
Properties mapping = options.getMapColumnJava();
- if(mapping != null && !mapping.isEmpty()) {
+ if (mapping != null && !mapping.isEmpty()) {
for(Object column : mapping.keySet()) {
- if(!uniqColNames.contains((String)column)) {
+ if (!uniqColNames.contains((String)column)) {
throw new IllegalArgumentException("No column by the name " + column
+ "found while importing data");
}
Modified: incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/ImportTool.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/ImportTool.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/ImportTool.java (original)
+++ incubator/sqoop/trunk/src/java/org/apache/sqoop/tool/ImportTool.java Fri Jan 27 02:38:58 2012
@@ -726,7 +726,7 @@ public class ImportTool extends com.clou
out.setSqlQuery(in.getOptionValue(SQL_QUERY_ARG));
}
- if(in.hasOption(SQL_QUERY_BOUNDARY)) {
+ if (in.hasOption(SQL_QUERY_BOUNDARY)) {
out.setBoundaryQuery(in.getOptionValue(SQL_QUERY_BOUNDARY));
}
}
Modified: incubator/sqoop/trunk/src/test/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/test/checkstyle.xml?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/test/checkstyle.xml (original)
+++ incubator/sqoop/trunk/src/test/checkstyle.xml Fri Jan 27 02:38:58 2012
@@ -122,6 +122,9 @@
<module name="GenericWhitespace"/>
<module name="EmptyForIteratorPad"/>
<module name="MethodParamPad"/>
+ <module name="WhitespaceAround">
+ <property name="tokens" value="LITERAL_IF" />
+ </module>
<module name="NoWhitespaceAfter">
<property name="tokens"
value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
Modified: incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java?rev=1236496&r1=1236495&r2=1236496&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java (original)
+++ incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java Fri Jan 27 02:38:58 2012
@@ -74,7 +74,7 @@ public class TestAvroImport extends Impo
args.add("--split-by");
args.add("INTFIELD1");
args.add("--as-avrodatafile");
- if(extraArgs != null) {
+ if (extraArgs != null) {
args.addAll(Arrays.asList(extraArgs));
}