Fix code formatting.
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvEnumerator.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvEnumerator.java
index 8e66618..2e49235 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvEnumerator.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvEnumerator.java
@@ -17,10 +17,10 @@
*/
package net.hydromatic.optiq.impl.csv;
-import au.com.bytecode.opencsv.CSVReader;
-
import net.hydromatic.linq4j.Enumerator;
+import au.com.bytecode.opencsv.CSVReader;
+
import java.io.*;
/** Enumerator that reads from a CSV file. */
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
index 38dd4eb..aeb64dc 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
@@ -50,8 +50,7 @@
Schema parentSchema,
File directoryFile,
Expression expression,
- boolean smart)
- {
+ boolean smart) {
super(parentSchema, expression);
this.directoryFile = directoryFile;
this.smart = smart;
@@ -81,8 +80,7 @@
} else {
table = new CsvTable(this, tableName, file, rowType, fieldTypes);
}
- list.add(
- new TableInSchemaImpl(this, tableName, TableType.TABLE, table));
+ list.add(new TableInSchemaImpl(this, tableName, TableType.TABLE, table));
}
return list;
}
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSmartTable.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSmartTable.java
index e0ef384..af3e8a6 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSmartTable.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSmartTable.java
@@ -37,8 +37,7 @@
public RelNode toRel(
RelOptTable.ToRelContext context,
- RelOptTable relOptTable)
- {
+ RelOptTable relOptTable) {
// Request all fields.
final int fieldCount = relOptTable.getRowType().getFieldCount();
final int[] fields = CsvEnumerator.identityList(fieldCount);
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvTable.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvTable.java
index aaa8101..f225b78 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvTable.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvTable.java
@@ -84,10 +84,14 @@
}
public Expression getExpression() {
- return Expressions.convert_(Expressions.call(schema.getExpression(),
- "getTable",
- Expressions.<Expression>list().append(Expressions.constant(tableName)).append(
- Expressions.constant(getElementType()))), CsvTable.class);
+ return Expressions.convert_(
+ Expressions.call(
+ schema.getExpression(),
+ "getTable",
+ Expressions.<Expression>list()
+ .append(Expressions.constant(tableName))
+ .append(Expressions.constant(getElementType()))),
+ CsvTable.class);
}
public Iterator<Object[]> iterator() {
@@ -111,8 +115,7 @@
public RelNode toRel(
RelOptTable.ToRelContext context,
- RelOptTable relOptTable)
- {
+ RelOptTable relOptTable) {
return new JavaRules.EnumerableTableAccessRel(
context.getCluster(),
context.getCluster().traitSetOf(EnumerableConvention.ARRAY),
diff --git a/src/test/java/net/hydromatic/optiq/test/CsvTest.java b/src/test/java/net/hydromatic/optiq/test/CsvTest.java
index b83c43b..637bd8b 100644
--- a/src/test/java/net/hydromatic/optiq/test/CsvTest.java
+++ b/src/test/java/net/hydromatic/optiq/test/CsvTest.java
@@ -17,9 +17,10 @@
*/
package net.hydromatic.optiq.test;
-import junit.framework.TestCase;
import net.hydromatic.linq4j.function.Function1;
+import junit.framework.TestCase;
+
import java.io.PrintStream;
import java.sql.*;
import java.util.Properties;