You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2017/08/24 19:05:20 UTC
[06/11] calcite git commit: [CALCITE-1963] Upgrade checkstyle,
and fix code to comply
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java b/core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java
index 0e0d234..a6b8db4 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelTestBase.java
@@ -422,7 +422,7 @@ public abstract class SqlToRelTestBase {
private static class DelegatingRelOptTable implements RelOptTable {
private final RelOptTable parent;
- public DelegatingRelOptTable(RelOptTable parent) {
+ DelegatingRelOptTable(RelOptTable parent) {
this.parent = parent;
}
@@ -491,8 +491,7 @@ public abstract class SqlToRelTestBase {
private final boolean enableTrim;
private final boolean enableExpand;
private final SqlConformance conformance;
- private final Function<RelDataTypeFactory, Prepare.CatalogReader>
- catalogReaderFactory;
+ private final Function<RelDataTypeFactory, Prepare.CatalogReader> catalogReaderFactory;
private final Function<RelOptCluster, RelOptCluster> clusterFactory;
private RelDataTypeFactory typeFactory;
public final SqlToRelConverter.Config config;
@@ -788,7 +787,7 @@ public abstract class SqlToRelTestBase {
/** Validator for testing. */
private static class FarragoTestValidator extends SqlValidatorImpl {
- public FarragoTestValidator(
+ FarragoTestValidator(
SqlOperatorTable opTab,
SqlValidatorCatalogReader catalogReader,
RelDataTypeFactory typeFactory,
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/SqlValidatorFeatureTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorFeatureTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorFeatureTest.java
index 0e67640..1aae8b3 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlValidatorFeatureTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorFeatureTest.java
@@ -127,7 +127,7 @@ public class SqlValidatorFeatureTest extends SqlValidatorTestCase {
/** Factory for tester objects. */
private class FeatureTesterFactory extends DelegatingSqlTestFactory {
- public FeatureTesterFactory() {
+ FeatureTesterFactory() {
super(DefaultSqlTestFactory.INSTANCE);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/SqlValidatorMatchTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorMatchTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorMatchTest.java
index efdd965..5ab86a2 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlValidatorMatchTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorMatchTest.java
@@ -45,34 +45,34 @@ public class SqlValidatorMatchTest extends SqlValidatorTestCase {
@Test public void testMatchRecognizeDefines() throws Exception {
final String sql = "select *\n"
- + " from emp match_recognize (\n"
- + " pattern (strt down+ up+)\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > PREV(up.sal)\n"
- + " ) mr";
+ + " from emp match_recognize (\n"
+ + " pattern (strt down+ up+)\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > PREV(up.sal)\n"
+ + " ) mr";
sql(sql).ok();
}
@Test public void testMatchRecognizeDefines2() throws Exception {
final String sql = "select *\n"
- + " from t match_recognize (\n"
- + " pattern (strt down+ up+)\n"
- + " define\n"
- + " down as down.price < PREV(down.price),\n"
- + " ^down as up.price > PREV(up.price)^\n"
- + " ) mr";
+ + " from t match_recognize (\n"
+ + " pattern (strt down+ up+)\n"
+ + " define\n"
+ + " down as down.price < PREV(down.price),\n"
+ + " ^down as up.price > PREV(up.price)^\n"
+ + " ) mr";
sql(sql).fails("Pattern variable 'DOWN' has already been defined");
}
@Test public void testMatchRecognizeDefines3() throws Exception {
final String sql = "select *\n"
- + " from emp match_recognize (\n"
- + " pattern (strt down+up+)\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > PREV(up.sal)\n"
- + " ) mr";
+ + " from emp match_recognize (\n"
+ + " pattern (strt down+up+)\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > PREV(up.sal)\n"
+ + " ) mr";
sql(sql).ok();
}
@@ -197,51 +197,51 @@ public class SqlValidatorMatchTest extends SqlValidatorTestCase {
@Test public void testMatchRecognizeSubset() throws Exception {
final String sql = "select *\n"
- + "from emp match_recognize (\n"
- + " pattern (strt down+ up+)\n"
- + " subset stdn = (^strt1^, down)\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > prev(up.sal)\n"
- + " ) mr";
+ + "from emp match_recognize (\n"
+ + " pattern (strt down+ up+)\n"
+ + " subset stdn = (^strt1^, down)\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > prev(up.sal)\n"
+ + " ) mr";
sql(sql)
.fails("Unknown pattern 'STRT1'");
}
@Test public void testMatchRecognizeSubset2() throws Exception {
final String sql = "select *\n"
- + "from emp match_recognize (\n"
- + " pattern (strt down+ up+)\n"
- + " subset ^strt^ = (strt, down)\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > prev(up.sal)\n"
- + " ) mr";
+ + "from emp match_recognize (\n"
+ + " pattern (strt down+ up+)\n"
+ + " subset ^strt^ = (strt, down)\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > prev(up.sal)\n"
+ + " ) mr";
sql(sql)
.fails("Pattern variable 'STRT' has already been defined");
}
@Test public void testMatchRecognizeWithin() throws Exception {
final String sql = "select *\n"
- + "from emp match_recognize (\n"
- + " pattern (strt down+ up+) within ^interval '3:10' minute to second^\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > prev(up.sal)\n"
- + " ) mr";
+ + "from emp match_recognize (\n"
+ + " pattern (strt down+ up+) within ^interval '3:10' minute to second^\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > prev(up.sal)\n"
+ + " ) mr";
sql(sql)
.fails("Must contain an ORDER BY clause when WITHIN is used");
}
@Test public void testMatchRecognizeWithin2() throws Exception {
final String sql = "select *\n"
- + "from emp match_recognize (\n"
- + " order by sal\n"
- + " pattern (strt down+ up+) within ^interval '3:10' minute to second^\n"
- + " define\n"
- + " down as down.sal < PREV(down.sal),\n"
- + " up as up.sal > prev(up.sal)\n"
- + " ) mr";
+ + "from emp match_recognize (\n"
+ + " order by sal\n"
+ + " pattern (strt down+ up+) within ^interval '3:10' minute to second^\n"
+ + " define\n"
+ + " down as down.sal < PREV(down.sal),\n"
+ + " up as up.sal > prev(up.sal)\n"
+ + " ) mr";
sql(sql)
.fails("First column of ORDER BY must be of type TIMESTAMP");
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
index ab54857..f8c644b 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
@@ -7083,8 +7083,8 @@ public class SqlValidatorTest extends SqlValidatorTestCase {
// Other operators with similar syntax
String[] ops = {
- "overlaps", "contains", "equals", "precedes", "succeeds",
- "immediately precedes", "immediately succeeds"
+ "overlaps", "contains", "equals", "precedes", "succeeds",
+ "immediately precedes", "immediately succeeds"
};
for (String op : ops) {
checkExpType("period (date '1-2-3', date '1-2-3')\n"
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/StreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/StreamTest.java b/core/src/test/java/org/apache/calcite/test/StreamTest.java
index eb604e7..d425f30 100644
--- a/core/src/test/java/org/apache/calcite/test/StreamTest.java
+++ b/core/src/test/java/org/apache/calcite/test/StreamTest.java
@@ -411,11 +411,11 @@ public class StreamTest {
public static ImmutableList<Object[]> getRowList() {
final Object[][] rows = {
- {ts(10, 15, 0), 1, "paint", 10},
- {ts(10, 24, 15), 2, "paper", 5},
- {ts(10, 24, 45), 3, "brush", 12},
- {ts(10, 58, 0), 4, "paint", 3},
- {ts(11, 10, 0), 5, "paint", 3}
+ {ts(10, 15, 0), 1, "paint", 10},
+ {ts(10, 24, 15), 2, "paper", 5},
+ {ts(10, 24, 45), 3, "brush", 12},
+ {ts(10, 58, 0), 4, "paint", 3},
+ {ts(11, 10, 0), 5, "paint", 3}
};
return ImmutableList.copyOf(rows);
}
@@ -529,9 +529,9 @@ public class StreamTest {
public Table create(SchemaPlus schema, String name,
Map<String, Object> operand, RelDataType rowType) {
final Object[][] rows = {
- {"paint", 1},
- {"paper", 0},
- {"brush", 1}
+ {"paint", 1},
+ {"paper", 0},
+ {"brush", 1}
};
return new ProductsTable(ImmutableList.copyOf(rows));
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommand.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommand.java
index 5915ee9..cd3c92a 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommand.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommand.java
@@ -78,7 +78,7 @@ public interface ConcurrentTestCommand {
* Indicates that a command should have failed, but instead succeeded, which
* is a test error
*/
- public static class ShouldHaveFailedException extends RuntimeException {
+ class ShouldHaveFailedException extends RuntimeException {
private final String description;
public ShouldHaveFailedException(String description) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandExecutor.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandExecutor.java
index 62e2b1c..6125780 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandExecutor.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandExecutor.java
@@ -281,7 +281,7 @@ class ConcurrentTestCommandExecutor extends Thread {
private int numThreads;
private int numWaiting;
- public Sync(int numThreads) {
+ Sync(int numThreads) {
assert numThreads > 0;
this.numThreads = numThreads;
this.numWaiting = 0;
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandGenerator.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandGenerator.java
index b9e332d..e1c2e4d 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandGenerator.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandGenerator.java
@@ -78,8 +78,7 @@ public class ConcurrentTestCommandGenerator {
* Maps Integer thread IDs to a TreeMap. The TreeMap vaules map an Integer
* execution order to a {@link ConcurrentTestCommand}.
*/
- private TreeMap<Integer, TreeMap<Integer, ConcurrentTestCommand>>
- threadMap;
+ private TreeMap<Integer, TreeMap<Integer, ConcurrentTestCommand>> threadMap;
/**
* Maps Integer thread IDs to thread names.
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandScript.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandScript.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandScript.java
index 67b790a..d455927 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandScript.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestCommandScript.java
@@ -122,92 +122,92 @@ public class ConcurrentTestCommandScript
private static final String EOF = null;
private static final StateAction[] STATE_TABLE = {
- new StateAction(
- PRE_SETUP_STATE,
- new StateDatum[]{
- new StateDatum(VAR, PRE_SETUP_STATE),
- new StateDatum(LOCKSTEP, PRE_SETUP_STATE),
- new StateDatum(NOLOCKSTEP, PRE_SETUP_STATE),
- new StateDatum(ENABLED, PRE_SETUP_STATE),
- new StateDatum(DISABLED, PRE_SETUP_STATE),
- new StateDatum(PLUGIN, PRE_SETUP_STATE),
- new StateDatum(SETUP, SETUP_STATE),
- new StateDatum(CLEANUP, CLEANUP_STATE),
- new StateDatum(THREAD, THREAD_STATE)
- }),
-
- new StateAction(
- SETUP_STATE,
- new StateDatum[]{
- new StateDatum(END, POST_SETUP_STATE),
- new StateDatum(SQL, SETUP_STATE),
- new StateDatum(INCLUDE, SETUP_STATE),
- }),
-
- new StateAction(
- POST_SETUP_STATE,
- new StateDatum[]{
- new StateDatum(CLEANUP, CLEANUP_STATE),
- new StateDatum(THREAD, THREAD_STATE)
- }),
-
- new StateAction(
- CLEANUP_STATE,
- new StateDatum[]{
- new StateDatum(END, POST_CLEANUP_STATE),
- new StateDatum(SQL, CLEANUP_STATE),
- new StateDatum(INCLUDE, CLEANUP_STATE),
- }),
-
- new StateAction(
- POST_CLEANUP_STATE,
- new StateDatum[]{
- new StateDatum(THREAD, THREAD_STATE)
- }),
-
- new StateAction(
- THREAD_STATE,
- new StateDatum[]{
- new StateDatum(REPEAT, REPEAT_STATE),
- new StateDatum(SYNC, THREAD_STATE),
- new StateDatum(TIMEOUT, THREAD_STATE),
- new StateDatum(ROWLIMIT, THREAD_STATE),
- new StateDatum(PREPARE, THREAD_STATE),
- new StateDatum(PRINT, THREAD_STATE),
- new StateDatum(FETCH, THREAD_STATE),
- new StateDatum(CLOSE, THREAD_STATE),
- new StateDatum(SLEEP, THREAD_STATE),
- new StateDatum(SQL, THREAD_STATE),
- new StateDatum(ECHO, THREAD_STATE),
- new StateDatum(ERR, THREAD_STATE),
- new StateDatum(SHELL, THREAD_STATE),
- new StateDatum(END, POST_THREAD_STATE)
- }),
-
- new StateAction(
- REPEAT_STATE,
- new StateDatum[]{
- new StateDatum(SYNC, REPEAT_STATE),
- new StateDatum(TIMEOUT, REPEAT_STATE),
- new StateDatum(ROWLIMIT, REPEAT_STATE),
- new StateDatum(PREPARE, REPEAT_STATE),
- new StateDatum(PRINT, REPEAT_STATE),
- new StateDatum(FETCH, REPEAT_STATE),
- new StateDatum(CLOSE, REPEAT_STATE),
- new StateDatum(SLEEP, REPEAT_STATE),
- new StateDatum(SQL, REPEAT_STATE),
- new StateDatum(ECHO, REPEAT_STATE),
- new StateDatum(ERR, REPEAT_STATE),
- new StateDatum(SHELL, REPEAT_STATE),
- new StateDatum(END, THREAD_STATE)
- }),
-
- new StateAction(
- POST_THREAD_STATE,
- new StateDatum[]{
- new StateDatum(THREAD, THREAD_STATE),
- new StateDatum(EOF, EOF_STATE)
- })
+ new StateAction(
+ PRE_SETUP_STATE,
+ new StateDatum[]{
+ new StateDatum(VAR, PRE_SETUP_STATE),
+ new StateDatum(LOCKSTEP, PRE_SETUP_STATE),
+ new StateDatum(NOLOCKSTEP, PRE_SETUP_STATE),
+ new StateDatum(ENABLED, PRE_SETUP_STATE),
+ new StateDatum(DISABLED, PRE_SETUP_STATE),
+ new StateDatum(PLUGIN, PRE_SETUP_STATE),
+ new StateDatum(SETUP, SETUP_STATE),
+ new StateDatum(CLEANUP, CLEANUP_STATE),
+ new StateDatum(THREAD, THREAD_STATE)
+ }),
+
+ new StateAction(
+ SETUP_STATE,
+ new StateDatum[]{
+ new StateDatum(END, POST_SETUP_STATE),
+ new StateDatum(SQL, SETUP_STATE),
+ new StateDatum(INCLUDE, SETUP_STATE),
+ }),
+
+ new StateAction(
+ POST_SETUP_STATE,
+ new StateDatum[]{
+ new StateDatum(CLEANUP, CLEANUP_STATE),
+ new StateDatum(THREAD, THREAD_STATE)
+ }),
+
+ new StateAction(
+ CLEANUP_STATE,
+ new StateDatum[]{
+ new StateDatum(END, POST_CLEANUP_STATE),
+ new StateDatum(SQL, CLEANUP_STATE),
+ new StateDatum(INCLUDE, CLEANUP_STATE),
+ }),
+
+ new StateAction(
+ POST_CLEANUP_STATE,
+ new StateDatum[]{
+ new StateDatum(THREAD, THREAD_STATE)
+ }),
+
+ new StateAction(
+ THREAD_STATE,
+ new StateDatum[]{
+ new StateDatum(REPEAT, REPEAT_STATE),
+ new StateDatum(SYNC, THREAD_STATE),
+ new StateDatum(TIMEOUT, THREAD_STATE),
+ new StateDatum(ROWLIMIT, THREAD_STATE),
+ new StateDatum(PREPARE, THREAD_STATE),
+ new StateDatum(PRINT, THREAD_STATE),
+ new StateDatum(FETCH, THREAD_STATE),
+ new StateDatum(CLOSE, THREAD_STATE),
+ new StateDatum(SLEEP, THREAD_STATE),
+ new StateDatum(SQL, THREAD_STATE),
+ new StateDatum(ECHO, THREAD_STATE),
+ new StateDatum(ERR, THREAD_STATE),
+ new StateDatum(SHELL, THREAD_STATE),
+ new StateDatum(END, POST_THREAD_STATE)
+ }),
+
+ new StateAction(
+ REPEAT_STATE,
+ new StateDatum[]{
+ new StateDatum(SYNC, REPEAT_STATE),
+ new StateDatum(TIMEOUT, REPEAT_STATE),
+ new StateDatum(ROWLIMIT, REPEAT_STATE),
+ new StateDatum(PREPARE, REPEAT_STATE),
+ new StateDatum(PRINT, REPEAT_STATE),
+ new StateDatum(FETCH, REPEAT_STATE),
+ new StateDatum(CLOSE, REPEAT_STATE),
+ new StateDatum(SLEEP, REPEAT_STATE),
+ new StateDatum(SQL, REPEAT_STATE),
+ new StateDatum(ECHO, REPEAT_STATE),
+ new StateDatum(ERR, REPEAT_STATE),
+ new StateDatum(SHELL, REPEAT_STATE),
+ new StateDatum(END, THREAD_STATE)
+ }),
+
+ new StateAction(
+ POST_THREAD_STATE,
+ new StateDatum[]{
+ new StateDatum(THREAD, THREAD_STATE),
+ new StateDatum(EOF, EOF_STATE)
+ })
};
private static final int FETCH_LEN = FETCH.length();
@@ -750,13 +750,13 @@ public class ConcurrentTestCommandScript
private final Pattern symbolPattern =
Pattern.compile("\\$((\\$)|([A-Za-z]\\w*)|\\{([A-Za-z]\\w*)\\})");
- public VariableTable() {
+ VariableTable() {
map = new HashMap<>();
}
/** Exception. */
public class Excn extends IllegalArgumentException {
- public Excn(String msg) {
+ Excn(String msg) {
super(msg);
}
}
@@ -854,13 +854,13 @@ public class ConcurrentTestCommandScript
public final String var;
public final String val;
- public Binding(String var, String val) {
+ Binding(String var, String val) {
this.var = var;
this.val = val;
}
// @param phrase has form VAR=VAL
- public Binding(String phrase) {
+ Binding(String phrase) {
String[] parts = splitBinding.split(phrase);
assert parts.length == 2;
this.var = parts[0];
@@ -872,7 +872,7 @@ public class ConcurrentTestCommandScript
// last @var.
private final List<Binding> deferredBindings = new ArrayList<>();
- public CommandParser() {
+ CommandParser() {
state = PRE_SETUP_STATE;
threadId = nextThreadId = 1;
order = 1;
@@ -2067,7 +2067,7 @@ public class ConcurrentTestCommandScript
List<String> bindings; // VAR=VAL
List<String> files; // FILE
- public Tool() {
+ Tool() {
bindings = new ArrayList<>();
files = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
index f2ee5a7..4c48d35 100644
--- a/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
+++ b/core/src/test/java/org/apache/calcite/test/concurrent/ConcurrentTestTimedCommandGenerator.java
@@ -104,6 +104,8 @@ public class ConcurrentTestTimedCommandGenerator
/**
* TimedIterator is an Iterator that repeats a given collection's elements
* until <code>System.currentTimeMillis() ≥ endTimeMillis</code>.
+ *
+ * @param <E> element type
*/
private class TimedIterator<E> implements Iterator<E> {
private final List<E> commands;
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
index 0efd0e4..b82ba9a 100644
--- a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
+++ b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
@@ -967,7 +967,7 @@ public class PlannerTest {
private class MockJdbcTableScan extends TableScan
implements JdbcRel {
- public MockJdbcTableScan(RelOptCluster cluster, RelOptTable table,
+ MockJdbcTableScan(RelOptCluster cluster, RelOptTable table,
JdbcConvention jdbcConvention) {
super(cluster, cluster.traitSetOf(jdbcConvention), table);
}
@@ -1067,9 +1067,9 @@ public class PlannerTest {
.add("tpch", new ReflectiveSchema(new TpchSchema()));
String query = "select t.psPartkey from \n"
- + "(select ps.psPartkey from `tpch`.`partsupp` ps \n"
- + "order by ps.psPartkey, ps.psSupplyCost) t \n"
- + "order by t.psPartkey";
+ + "(select ps.psPartkey from `tpch`.`partsupp` ps \n"
+ + "order by ps.psPartkey, ps.psSupplyCost) t \n"
+ + "order by t.psPartkey";
List<RelTraitDef> traitDefs = new ArrayList<>();
traitDefs.add(ConventionTraitDef.INSTANCE);
@@ -1077,11 +1077,11 @@ public class PlannerTest {
final SqlParser.Config parserConfig =
SqlParser.configBuilder().setLex(Lex.MYSQL).build();
FrameworkConfig config = Frameworks.newConfigBuilder()
- .parserConfig(parserConfig)
- .defaultSchema(schema)
- .traitDefs(traitDefs)
- .programs(Programs.ofRules(Programs.RULE_SET))
- .build();
+ .parserConfig(parserConfig)
+ .defaultSchema(schema)
+ .traitDefs(traitDefs)
+ .programs(Programs.ofRules(Programs.RULE_SET))
+ .build();
String plan;
try (Planner p = Frameworks.getPlanner(config)) {
SqlNode n = p.parse(query);
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/util/Smalls.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/util/Smalls.java b/core/src/test/java/org/apache/calcite/util/Smalls.java
index 0df6610..b3e64ca 100644
--- a/core/src/test/java/org/apache/calcite/util/Smalls.java
+++ b/core/src/test/java/org/apache/calcite/util/Smalls.java
@@ -508,15 +508,25 @@ public class Smalls {
private MultipleFunction() {}
// Three overloads
- public static String fun1(String x) { return x.toLowerCase(Locale.ROOT); }
- public static int fun1(int x) { return x * 2; }
- public static int fun1(int x, int y) { return x + y; }
+ public static String fun1(String x) {
+ return x.toLowerCase(Locale.ROOT);
+ }
+ public static int fun1(int x) {
+ return x * 2;
+ }
+ public static int fun1(int x, int y) {
+ return x + y;
+ }
// Another method
- public static int fun2(int x) { return x * 3; }
+ public static int fun2(int x) {
+ return x * 3;
+ }
// Non-static method cannot be used because constructor is private
- public int nonStatic(int x) { return x * 3; }
+ public int nonStatic(int x) {
+ return x * 3;
+ }
}
/** UDF class that provides user-defined functions for each data type. */
@@ -596,7 +606,11 @@ public class Smalls {
}
}
- /** A generic interface for defining user defined aggregate functions */
+ /** A generic interface for defining user defined aggregate functions
+ *
+ * @param <A> accumulator type
+ * @param <V> value type
+ * @param <R> result type */
private interface MyGenericAggFunction<A, V, R> {
A init();
@@ -841,7 +855,7 @@ public class Smalls {
@SuppressWarnings("unused")
public final WideProductSale[] prod = {
- new WideProductSale(100, 10)
+ new WideProductSale(100, 10)
};
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/test/java/org/apache/calcite/util/UtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/util/UtilTest.java b/core/src/test/java/org/apache/calcite/util/UtilTest.java
index 34b61d6..080ad4c 100644
--- a/core/src/test/java/org/apache/calcite/util/UtilTest.java
+++ b/core/src/test/java/org/apache/calcite/util/UtilTest.java
@@ -215,7 +215,7 @@ public class UtilTest {
new String(bytes1, "EUC-JP"),
0));
byte[] bytes2 = {
- 64, 32, 43, -45, -23, 0, 43, 54, 119, -32, -56, -34
+ 64, 32, 43, -45, -23, 0, 43, 54, 119, -32, -56, -34
};
assertEquals(
"ID$0$_30c__3617__2117__2d15__7fde__a48f_",
@@ -535,19 +535,19 @@ public class UtilTest {
*/
@Test public void testDiffLines() {
String[] before = {
- "Get a dose of her in jackboots and kilt",
- "She's killer-diller when she's dressed to the hilt",
- "She's the kind of a girl that makes The News of The World",
- "Yes you could say she was attractively built.",
- "Yeah yeah yeah."
+ "Get a dose of her in jackboots and kilt",
+ "She's killer-diller when she's dressed to the hilt",
+ "She's the kind of a girl that makes The News of The World",
+ "Yes you could say she was attractively built.",
+ "Yeah yeah yeah."
};
String[] after = {
- "Get a dose of her in jackboots and kilt",
- "(they call her \"Polythene Pam\")",
- "She's killer-diller when she's dressed to the hilt",
- "She's the kind of a girl that makes The Sunday Times",
- "seem more interesting.",
- "Yes you could say she was attractively built."
+ "Get a dose of her in jackboots and kilt",
+ "(they call her \"Polythene Pam\")",
+ "She's killer-diller when she's dressed to the hilt",
+ "She's the kind of a girl that makes The Sunday Times",
+ "seem more interesting.",
+ "Yes you could say she was attractively built."
};
String diff =
DiffTestCase.diffLines(
@@ -830,18 +830,18 @@ public class UtilTest {
*/
@Test public void testParseLocale() {
Locale[] locales = {
- Locale.CANADA,
- Locale.CANADA_FRENCH,
- Locale.getDefault(),
- Locale.US,
- Locale.TRADITIONAL_CHINESE,
+ Locale.CANADA,
+ Locale.CANADA_FRENCH,
+ Locale.getDefault(),
+ Locale.US,
+ Locale.TRADITIONAL_CHINESE,
};
for (Locale locale : locales) {
assertEquals(locale, Util.parseLocale(locale.toString()));
}
// Example locale names in Locale.toString() javadoc.
String[] localeNames = {
- "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC"
+ "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC"
};
for (String localeName : localeNames) {
assertEquals(localeName, Util.parseLocale(localeName).toString());
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java
----------------------------------------------------------------------
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java
index ce8b88b..3be8d20 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java
@@ -595,7 +595,9 @@ class DruidConnectionImpl implements DruidConnection {
}
/** An {@link Enumerator} that gets its rows from a {@link BlockingQueue}.
- * There are other fields to signal errors and end-of-data. */
+ * There are other fields to signal errors and end-of-data.
+ *
+ * @param <E> element type */
private static class BlockingQueueEnumerator<E> implements Enumerator<E> {
final BlockingQueue<E> queue = new ArrayBlockingQueue<>(1000);
final AtomicBoolean done = new AtomicBoolean(false);
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
----------------------------------------------------------------------
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
index ec50127..343f03e 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
@@ -388,13 +388,13 @@ public class DruidRules {
final List<RexNode> aboveNodes = new ArrayList<>();
for (RexNode node : nodes) {
aboveNodes.add(
- node.accept(
- new RexShuttle() {
- @Override public RexNode visitInputRef(RexInputRef ref) {
- final int index = positions.indexOf(ref.getIndex());
- return rexBuilder.makeInputRef(belowTypes.get(index), index);
- }
- }));
+ node.accept(
+ new RexShuttle() {
+ @Override public RexNode visitInputRef(RexInputRef ref) {
+ final int index = positions.indexOf(ref.getIndex());
+ return rexBuilder.makeInputRef(belowTypes.get(index), index);
+ }
+ }));
}
return Pair.of(aboveNodes, belowNodes);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/druid/src/main/java/org/apache/calcite/adapter/druid/QueryType.java
----------------------------------------------------------------------
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/QueryType.java b/druid/src/main/java/org/apache/calcite/adapter/druid/QueryType.java
index b487a38..a460e6a 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/QueryType.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/QueryType.java
@@ -25,7 +25,7 @@ public enum QueryType {
private final String queryName;
- private QueryType(String queryName) {
+ QueryType(String queryName) {
this.queryName = queryName;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
----------------------------------------------------------------------
diff --git a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
index fd64309..bd4ff19 100644
--- a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
+++ b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
@@ -3174,15 +3174,15 @@ public class DruidAdapterIT {
@Test public void testSelectStarWithRollUp() {
final String sql = "select * from \"wiki\" limit 5";
sql(sql, WIKI)
- // make sure user_id column is not present
- .queryContains(
- druidChecker("{'queryType':'select','dataSource':'wikiticker',"
- + "'descending':false,'intervals':['1900-01-09T00:00:00.000/2992-01-10T00:00:00.000'],"
- + "'dimensions':['channel','cityName','comment','countryIsoCode','countryName',"
- + "'isAnonymous','isMinor','isNew','isRobot','isUnpatrolled','metroCode',"
- + "'namespace','page','regionIsoCode','regionName'],'metrics':['count','added',"
- + "'deleted','delta'],'granularity':'all','pagingSpec':{'threshold':5,'fromNext'"
- + ":true},'context':{'druid.query.fetch':true}}"));
+ // make sure user_id column is not present
+ .queryContains(
+ druidChecker("{'queryType':'select','dataSource':'wikiticker',"
+ + "'descending':false,'intervals':['1900-01-09T00:00:00.000/2992-01-10T00:00:00.000'],"
+ + "'dimensions':['channel','cityName','comment','countryIsoCode','countryName',"
+ + "'isAnonymous','isMinor','isNew','isRobot','isUnpatrolled','metroCode',"
+ + "'namespace','page','regionIsoCode','regionName'],'metrics':['count','added',"
+ + "'deleted','delta'],'granularity':'all','pagingSpec':{'threshold':5,'fromNext'"
+ + ":true},'context':{'druid.query.fetch':true}}"));
}
/**
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchFilter.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchFilter.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchFilter.java
index ef22fa2..8e923a1 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchFilter.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchFilter.java
@@ -65,9 +65,10 @@ public class ElasticsearchFilter extends Filter implements ElasticsearchRel {
@Override public void implement(Implementor implementor) {
implementor.visitChild(0, getInput());
- Translator translator = new Translator(ElasticsearchRules
- .elasticsearchFieldNames(getRowType()));
- String match = translator.translateMatch(condition);
+ final List<String> fieldNames =
+ ElasticsearchRules.elasticsearchFieldNames(getRowType());
+ final Translator translator = new Translator(fieldNames);
+ final String match = translator.translateMatch(condition);
implementor.add(match);
}
@@ -77,7 +78,7 @@ public class ElasticsearchFilter extends Filter implements ElasticsearchRel {
static class Translator {
final JsonBuilder builder = new JsonBuilder();
final Multimap<String, Pair<String, RexLiteral>> multimap =
- HashMultimap.create();
+ HashMultimap.create();
final Map<String, RexLiteral> eqMap = new LinkedHashMap<>();
private final List<String> fieldNames;
@@ -160,7 +161,7 @@ public class ElasticsearchFilter extends Filter implements ElasticsearchRel {
filters.add(map);
}
for (Map.Entry<String, Collection<Pair<String, RexLiteral>>> entry
- : multimap.asMap().entrySet()) {
+ : multimap.asMap().entrySet()) {
Map<String, Object> map2 = builder.map();
Map<String, Object> map = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchProject.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchProject.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchProject.java
index c2c09a5..660e268 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchProject.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchProject.java
@@ -57,9 +57,9 @@ public class ElasticsearchProject extends Project implements ElasticsearchRel {
implementor.visitChild(0, getInput());
final ElasticsearchRules.RexToElasticsearchTranslator translator =
- new ElasticsearchRules.RexToElasticsearchTranslator(
- (JavaTypeFactory) getCluster().getTypeFactory(),
- ElasticsearchRules.elasticsearchFieldNames(getInput().getRowType()));
+ new ElasticsearchRules.RexToElasticsearchTranslator(
+ (JavaTypeFactory) getCluster().getTypeFactory(),
+ ElasticsearchRules.elasticsearchFieldNames(getInput().getRowType()));
final List<String> findItems = new ArrayList<>();
final List<String> scriptFieldItems = new ArrayList<>();
@@ -71,10 +71,10 @@ public class ElasticsearchProject extends Project implements ElasticsearchRel {
findItems.add(ElasticsearchRules.quote(name));
} else if (expr.matches("\"literal\":.+")) {
scriptFieldItems.add(ElasticsearchRules.quote(name) + ":{\"script\": "
- + expr.split(":")[1] + "}");
+ + expr.split(":")[1] + "}");
} else {
scriptFieldItems.add(ElasticsearchRules.quote(name) + ":{\"script\":\"_source."
- + expr.replaceAll("\"", "") + "\"}");
+ + expr.replaceAll("\"", "") + "\"}");
}
}
final String findString = Util.toString(findItems, "", ", ", "");
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
index 3fc0fd2..ba2978d 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchRules.java
@@ -51,9 +51,9 @@ import java.util.List;
*/
class ElasticsearchRules {
static final RelOptRule[] RULES = {
- ElasticsearchSortRule.INSTANCE,
- ElasticsearchFilterRule.INSTANCE,
- ElasticsearchProjectRule.INSTANCE
+ ElasticsearchSortRule.INSTANCE,
+ ElasticsearchFilterRule.INSTANCE,
+ ElasticsearchProjectRule.INSTANCE
};
private ElasticsearchRules() {}
@@ -69,9 +69,9 @@ class ElasticsearchRules {
final RexNode op1 = call.getOperands().get(1);
if (op0 instanceof RexInputRef
- && ((RexInputRef) op0).getIndex() == 0
- && op1 instanceof RexLiteral
- && ((RexLiteral) op1).getValue2() instanceof String) {
+ && ((RexInputRef) op0).getIndex() == 0
+ && op1 instanceof RexLiteral
+ && ((RexLiteral) op1).getValue2() instanceof String) {
return (String) ((RexLiteral) op1).getValue2();
}
return null;
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchema.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchema.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchema.java
index d74f3f5..960b387 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchema.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchSchema.java
@@ -87,8 +87,9 @@ public class ElasticsearchSchema extends AbstractSchema {
final ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
try {
- GetMappingsResponse response = client.admin().indices().getMappings(
- new GetMappingsRequest().indices(index)).get();
+ GetMappingsResponse response = client.admin().indices()
+ .getMappings(new GetMappingsRequest().indices(index))
+ .get();
ImmutableOpenMap<String, MappingMetaData> mapping = response.getMappings().get(index);
for (ObjectObjectCursor<String, MappingMetaData> c: mapping) {
builder.put(c.key, new ElasticsearchTable(client, index, c.key));
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
index f3dbca5..5e9043c 100644
--- a/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
+++ b/elasticsearch/src/main/java/org/apache/calcite/adapter/elasticsearch/ElasticsearchTable.java
@@ -116,6 +116,8 @@ public class ElasticsearchTable extends AbstractQueryableTable implements Transl
/**
* Implementation of {@link org.apache.calcite.linq4j.Queryable} based on
* a {@link org.apache.calcite.adapter.elasticsearch.ElasticsearchTable}.
+ *
+ * @param <T> element type
*/
public static class ElasticsearchQueryable<T> extends AbstractTableQueryable<T> {
public ElasticsearchQueryable(QueryProvider queryProvider, SchemaPlus schema,
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchAdapterIT.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchAdapterIT.java b/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchAdapterIT.java
index da4192f..89660a5 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchAdapterIT.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/test/ElasticsearchAdapterIT.java
@@ -192,10 +192,10 @@ public class ElasticsearchAdapterIT {
@Test public void testInPlan() {
final String[] searches = {
- "\"query\" : {\"constant_score\":{\"filter\":{\"bool\":{\"should\":"
+ "\"query\" : {\"constant_score\":{\"filter\":{\"bool\":{\"should\":"
+ "[{\"bool\":{\"must\":[{\"term\":{\"pop\":20012}}]}},{\"bool\":{\"must\":[{\"term\":"
+ "{\"pop\":15590}}]}}]}}}}",
- "\"fields\" : [\"city\", \"pop\", \"state\", \"id\"], \"script_fields\": {\"longitude\":{\"script\":\"_source.loc[0]\"}, \"latitude\":{\"script\":\"_source.loc[1]\"}}"
+ "\"fields\" : [\"city\", \"pop\", \"state\", \"id\"], \"script_fields\": {\"longitude\":{\"script\":\"_source.loc[0]\"}, \"latitude\":{\"script\":\"_source.loc[1]\"}}"
};
CalciteAssert.that()
.enable(enabled())
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvEnumerator.java
----------------------------------------------------------------------
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvEnumerator.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvEnumerator.java
index b6dd314..afc3601 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvEnumerator.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvEnumerator.java
@@ -60,19 +60,19 @@ class CsvEnumerator<E> implements Enumerator<E> {
FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", gmt);
}
- public CsvEnumerator(Source source, AtomicBoolean cancelFlag,
+ CsvEnumerator(Source source, AtomicBoolean cancelFlag,
List<CsvFieldType> fieldTypes) {
this(source, cancelFlag, fieldTypes, identityList(fieldTypes.size()));
}
- public CsvEnumerator(Source source, AtomicBoolean cancelFlag,
+ CsvEnumerator(Source source, AtomicBoolean cancelFlag,
List<CsvFieldType> fieldTypes, int[] fields) {
//noinspection unchecked
this(source, cancelFlag, false, null,
(RowConverter<E>) converter(fieldTypes, fields));
}
- public CsvEnumerator(Source source, AtomicBoolean cancelFlag, boolean stream,
+ CsvEnumerator(Source source, AtomicBoolean cancelFlag, boolean stream,
String[] filterValues, RowConverter<E> rowConverter) {
this.cancelFlag = cancelFlag;
this.rowConverter = rowConverter;
@@ -133,9 +133,9 @@ class CsvEnumerator<E> implements Enumerator<E> {
fieldType = CsvFieldType.of(typeString);
if (fieldType == null) {
System.out.println("WARNING: Found unknown type: "
- + typeString + " in file: " + source.path()
- + " for column: " + name
- + ". Will assume the type of column is string");
+ + typeString + " in file: " + source.path()
+ + " for column: " + name
+ + ". Will assume the type of column is string");
}
} else {
name = string;
@@ -240,7 +240,9 @@ class CsvEnumerator<E> implements Enumerator<E> {
return integers;
}
- /** Row converter. */
+ /** Row converter.
+ *
+ * @param <E> element type */
abstract static class RowConverter<E> {
abstract E convertRow(String[] rows);
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvFieldType.java
----------------------------------------------------------------------
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvFieldType.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvFieldType.java
index cc9cd76..66adfc6 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvFieldType.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvFieldType.java
@@ -47,8 +47,7 @@ enum CsvFieldType {
private final Class clazz;
private final String simpleName;
- private static final Map<String, CsvFieldType> MAP =
- new HashMap<String, CsvFieldType>();
+ private static final Map<String, CsvFieldType> MAP = new HashMap<>();
static {
for (CsvFieldType value : values()) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/example/csv/src/main/java/org/apache/calcite/adapter/csv/JsonEnumerator.java
----------------------------------------------------------------------
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/JsonEnumerator.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/JsonEnumerator.java
index d4c6084..ecf660f 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/JsonEnumerator.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/JsonEnumerator.java
@@ -30,7 +30,7 @@ import java.util.List;
class JsonEnumerator implements Enumerator<Object[]> {
private final Enumerator<Object> enumerator;
- public JsonEnumerator(Source source) {
+ JsonEnumerator(Source source) {
try {
final ObjectMapper mapper = new ObjectMapper();
mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
----------------------------------------------------------------------
diff --git a/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java b/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
index 00c59ee..785688b 100644
--- a/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
+++ b/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
@@ -699,10 +699,10 @@ public class CsvTest {
+ " ]\n"
+ "}\n";
final String[] strings = {
- "DEPTNO:int,NAME:string",
- "10,\"Sales\"",
- "20,\"Marketing\"",
- "30,\"Engineering\""
+ "DEPTNO:int,NAME:string",
+ "10,\"Sales\"",
+ "20,\"Marketing\"",
+ "30,\"Engineering\""
};
try (final Connection connection =
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/example/function/src/main/java/org/apache/calcite/example/maze/Maze.java
----------------------------------------------------------------------
diff --git a/example/function/src/main/java/org/apache/calcite/example/maze/Maze.java b/example/function/src/main/java/org/apache/calcite/example/maze/Maze.java
index 08e9fd4..eb738fa 100644
--- a/example/function/src/main/java/org/apache/calcite/example/maze/Maze.java
+++ b/example/function/src/main/java/org/apache/calcite/example/maze/Maze.java
@@ -39,7 +39,7 @@ class Maze {
private final boolean horizontal = false;
private final boolean spiral = false;
- public Maze(int width, int height) {
+ Maze(int width, int height) {
this.width = width;
this.height = height;
this.regions = new int[width * height];
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java
----------------------------------------------------------------------
diff --git a/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java b/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java
index 9b191cb..8d31770 100644
--- a/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java
+++ b/file/src/test/java/org/apache/calcite/adapter/file/SqlTest.java
@@ -238,11 +238,11 @@ public class SqlTest {
@Test public void testCsvSalesEmps() throws SQLException {
final String sql = "select * from sales.emps";
final String[] lines = {
- "EMPNO=100; NAME=Fred; DEPTNO=10; GENDER=; CITY=; EMPID=30; AGE=25; SLACKER=true; MANAGER=false; JOINEDAT=1996-08-03",
- "EMPNO=110; NAME=Eric; DEPTNO=20; GENDER=M; CITY=San Francisco; EMPID=3; AGE=80; SLACKER=null; MANAGER=false; JOINEDAT=2001-01-01",
- "EMPNO=110; NAME=John; DEPTNO=40; GENDER=M; CITY=Vancouver; EMPID=2; AGE=null; SLACKER=false; MANAGER=true; JOINEDAT=2002-05-03",
- "EMPNO=120; NAME=Wilma; DEPTNO=20; GENDER=F; CITY=; EMPID=1; AGE=5; SLACKER=null; MANAGER=true; JOINEDAT=2005-09-07",
- "EMPNO=130; NAME=Alice; DEPTNO=40; GENDER=F; CITY=Vancouver; EMPID=2; AGE=null; SLACKER=false; MANAGER=true; JOINEDAT=2007-01-01",
+ "EMPNO=100; NAME=Fred; DEPTNO=10; GENDER=; CITY=; EMPID=30; AGE=25; SLACKER=true; MANAGER=false; JOINEDAT=1996-08-03",
+ "EMPNO=110; NAME=Eric; DEPTNO=20; GENDER=M; CITY=San Francisco; EMPID=3; AGE=80; SLACKER=null; MANAGER=false; JOINEDAT=2001-01-01",
+ "EMPNO=110; NAME=John; DEPTNO=40; GENDER=M; CITY=Vancouver; EMPID=2; AGE=null; SLACKER=false; MANAGER=true; JOINEDAT=2002-05-03",
+ "EMPNO=120; NAME=Wilma; DEPTNO=20; GENDER=F; CITY=; EMPID=1; AGE=5; SLACKER=null; MANAGER=true; JOINEDAT=2005-09-07",
+ "EMPNO=130; NAME=Alice; DEPTNO=40; GENDER=F; CITY=Vancouver; EMPID=2; AGE=null; SLACKER=false; MANAGER=true; JOINEDAT=2007-01-01",
};
sql("sales-csv", sql).returns(lines).ok();
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
index d29ef1d..646d95b 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
@@ -655,8 +655,8 @@ public abstract class EnumerableDefaults {
* specified key selector function and projects the elements for
* each group by using a specified function.
*/
- public static <TSource, TKey, TElement> Enumerable<Grouping<TKey, TElement>>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TElement> Enumerable<Grouping<TKey, TElement>> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
Function1<TSource, TElement> elementSelector) {
return enumerable.toLookup(keySelector, elementSelector);
}
@@ -667,8 +667,8 @@ public abstract class EnumerableDefaults {
* comparer and each group's elements are projected by using a
* specified function.
*/
- public static <TSource, TKey, TElement> Enumerable<Grouping<TKey, TElement>>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TElement> Enumerable<Grouping<TKey, TElement>> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
Function1<TSource, TElement> elementSelector,
EqualityComparer<TKey> comparer) {
return enumerable.toLookup(keySelector, elementSelector, comparer);
@@ -679,8 +679,8 @@ public abstract class EnumerableDefaults {
* specified key selector function and creates a result value from
* each group and its key.
*/
- public static <TSource, TKey, TResult> Enumerable<TResult>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TResult> Enumerable<TResult> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
final Function2<TKey, Enumerable<TSource>, TResult> resultSelector) {
return enumerable.toLookup(keySelector)
.select(new Function1<Grouping<TKey, TSource>, TResult>() {
@@ -696,8 +696,8 @@ public abstract class EnumerableDefaults {
* each group and its key. The keys are compared by using a
* specified comparer.
*/
- public static <TSource, TKey, TResult> Enumerable<TResult>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TResult> Enumerable<TResult> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
final Function2<TKey, Enumerable<TSource>, TResult> resultSelector,
EqualityComparer<TKey> comparer) {
return enumerable.toLookup(keySelector, comparer)
@@ -753,8 +753,8 @@ public abstract class EnumerableDefaults {
* Creates a result value from each accumulator and its key using a
* specified function.
*/
- public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
Function0<TAccumulate> accumulatorInitializer,
Function2<TAccumulate, TSource, TAccumulate> accumulatorAdder,
final Function2<TKey, TAccumulate, TResult> resultSelector) {
@@ -772,9 +772,8 @@ public abstract class EnumerableDefaults {
* <p>This method exists to support SQL {@code GROUPING SETS}.
* It does not correspond to any method in {@link Enumerable}.
*/
- public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult>
- groupByMultiple(Enumerable<TSource> enumerable,
- List<Function1<TSource, TKey>> keySelectors,
+ public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult> groupByMultiple(
+ Enumerable<TSource> enumerable, List<Function1<TSource, TKey>> keySelectors,
Function0<TAccumulate> accumulatorInitializer,
Function2<TAccumulate, TSource, TAccumulate> accumulatorAdder,
final Function2<TKey, TAccumulate, TResult> resultSelector) {
@@ -795,8 +794,8 @@ public abstract class EnumerableDefaults {
* specified function. Key values are compared by using a
* specified comparer.
*/
- public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult>
- groupBy(Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
+ public static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult> groupBy(
+ Enumerable<TSource> enumerable, Function1<TSource, TKey> keySelector,
Function0<TAccumulate> accumulatorInitializer,
Function2<TAccumulate, TSource, TAccumulate> accumulatorAdder,
Function2<TKey, TAccumulate, TResult> resultSelector,
@@ -816,8 +815,8 @@ public abstract class EnumerableDefaults {
resultSelector);
}
- private static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult>
- groupBy_(final Map<TKey, TAccumulate> map, Enumerable<TSource> enumerable,
+ private static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult> groupBy_(
+ final Map<TKey, TAccumulate> map, Enumerable<TSource> enumerable,
Function1<TSource, TKey> keySelector,
Function0<TAccumulate> accumulatorInitializer,
Function2<TAccumulate, TSource, TAccumulate> accumulatorAdder,
@@ -843,9 +842,8 @@ public abstract class EnumerableDefaults {
return new LookupResultEnumerable<>(map, resultSelector);
}
- private static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult>
- groupByMultiple_(final Map<TKey, TAccumulate> map,
- Enumerable<TSource> enumerable,
+ private static <TSource, TKey, TAccumulate, TResult> Enumerable<TResult> groupByMultiple_(
+ final Map<TKey, TAccumulate> map, Enumerable<TSource> enumerable,
List<Function1<TSource, TKey>> keySelectors,
Function0<TAccumulate> accumulatorInitializer,
Function2<TAccumulate, TSource, TAccumulate> accumulatorAdder,
@@ -873,8 +871,8 @@ public abstract class EnumerableDefaults {
return new LookupResultEnumerable<>(map, resultSelector);
}
- private static <TSource, TKey, TResult> Enumerable<TResult>
- groupBy_(final Set<TKey> map, Enumerable<TSource> enumerable,
+ private static <TSource, TKey, TResult> Enumerable<TResult> groupBy_(
+ final Set<TKey> map, Enumerable<TSource> enumerable,
Function1<TSource, TKey> keySelector,
final Function1<TKey, TResult> resultSelector) {
try (Enumerator<TSource> os = enumerable.enumerator()) {
@@ -1390,8 +1388,8 @@ public abstract class EnumerableDefaults {
}
/** Joins two inputs that are sorted on the key. */
- public static <TSource, TInner, TKey extends Comparable<TKey>, TResult>
- Enumerable<TResult> mergeJoin(final Enumerable<TSource> outer,
+ public static <TSource, TInner, TKey extends Comparable<TKey>, TResult> Enumerable<TResult>
+ mergeJoin(final Enumerable<TSource> outer,
final Enumerable<TInner> inner,
final Function1<TSource, TKey> outerKeySelector,
final Function1<TInner, TKey> innerKeySelector,
@@ -1675,14 +1673,14 @@ public abstract class EnumerableDefaults {
}
@SuppressWarnings("unchecked")
- private static <TSource extends Comparable<TSource>>
- Function2<TSource, TSource, TSource> minFunction() {
+ private static <TSource extends Comparable<TSource>> Function2<TSource, TSource, TSource>
+ minFunction() {
return (Function2<TSource, TSource, TSource>) Extensions.COMPARABLE_MIN;
}
@SuppressWarnings("unchecked")
- private static <TSource extends Comparable<TSource>>
- Function2<TSource, TSource, TSource> maxFunction() {
+ private static <TSource extends Comparable<TSource>> Function2<TSource, TSource, TSource>
+ maxFunction() {
return (Function2<TSource, TSource, TSource>) Extensions.COMPARABLE_MAX;
}
@@ -1844,8 +1842,7 @@ public abstract class EnumerableDefaults {
* Sorts the elements of a sequence in descending
* order according to a key.
*/
- public static <TSource, TKey extends Comparable> Enumerable<TSource>
- orderByDescending(
+ public static <TSource, TKey extends Comparable> Enumerable<TSource> orderByDescending(
Enumerable<TSource> source, Function1<TSource, TKey> keySelector) {
return orderBy(source, keySelector, Collections.<TKey>reverseOrder());
}
@@ -2521,8 +2518,7 @@ public abstract class EnumerableDefaults {
* Performs a subsequent ordering of the elements in a sequence according
* to a key.
*/
- public static <TSource, TKey> OrderedEnumerable<TSource>
- createOrderedEnumerable(
+ public static <TSource, TKey> OrderedEnumerable<TSource> createOrderedEnumerable(
OrderedEnumerable<TSource> source, Function1<TSource, TKey> keySelector,
Comparator<TKey> comparator, boolean descending) {
throw Extensions.todo();
@@ -2532,8 +2528,7 @@ public abstract class EnumerableDefaults {
* Performs a subsequent ordering of the elements in a sequence in
* ascending order according to a key.
*/
- public static <TSource, TKey extends Comparable<TKey>>
- OrderedEnumerable<TSource> thenBy(
+ public static <TSource, TKey extends Comparable<TKey>> OrderedEnumerable<TSource> thenBy(
OrderedEnumerable<TSource> source, Function1<TSource, TKey> keySelector) {
return createOrderedEnumerable(source, keySelector,
Extensions.<TKey>comparableComparator(), false);
@@ -2554,7 +2549,7 @@ public abstract class EnumerableDefaults {
* descending order according to a key.
*/
public static <TSource, TKey extends Comparable<TKey>>
- OrderedEnumerable<TSource> thenByDescending(
+ OrderedEnumerable<TSource> thenByDescending(
OrderedEnumerable<TSource> source, Function1<TSource, TKey> keySelector) {
return createOrderedEnumerable(source, keySelector,
Extensions.<TKey>comparableComparator(), true);
@@ -2929,7 +2924,9 @@ public abstract class EnumerableDefaults {
return sink;
}
- /** Enumerable that implements take-while. */
+ /** Enumerable that implements take-while.
+ *
+ * @param <TSource> element type */
static class TakeWhileEnumerator<TSource> implements Enumerator<TSource> {
private final Enumerator<TSource> enumerator;
private final Predicate2<TSource, Integer> predicate;
@@ -2937,7 +2934,7 @@ public abstract class EnumerableDefaults {
boolean done = false;
int n = -1;
- public TakeWhileEnumerator(Enumerator<TSource> enumerator,
+ TakeWhileEnumerator(Enumerator<TSource> enumerator,
Predicate2<TSource, Integer> predicate) {
this.enumerator = enumerator;
this.predicate = predicate;
@@ -2970,7 +2967,9 @@ public abstract class EnumerableDefaults {
}
}
- /** Enumerable that implements take-while. */
+ /** Enumerable that implements take-while.
+ *
+ * @param <TSource> element type */
static class TakeWhileLongEnumerator<TSource> implements Enumerator<TSource> {
private final Enumerator<TSource> enumerator;
private final Predicate2<TSource, Long> predicate;
@@ -2978,7 +2977,7 @@ public abstract class EnumerableDefaults {
boolean done = false;
long n = -1;
- public TakeWhileLongEnumerator(Enumerator<TSource> enumerator,
+ TakeWhileLongEnumerator(Enumerator<TSource> enumerator,
Predicate2<TSource, Long> predicate) {
this.enumerator = enumerator;
this.predicate = predicate;
@@ -3011,7 +3010,9 @@ public abstract class EnumerableDefaults {
}
}
- /** Enumerator that implements skip-while. */
+ /** Enumerator that implements skip-while.
+ *
+ * @param <TSource> element type */
static class SkipWhileEnumerator<TSource> implements Enumerator<TSource> {
private final Enumerator<TSource> enumerator;
private final Predicate2<TSource, Integer> predicate;
@@ -3019,7 +3020,7 @@ public abstract class EnumerableDefaults {
boolean started = false;
int n = -1;
- public SkipWhileEnumerator(Enumerator<TSource> enumerator,
+ SkipWhileEnumerator(Enumerator<TSource> enumerator,
Predicate2<TSource, Integer> predicate) {
this.enumerator = enumerator;
this.predicate = predicate;
@@ -3055,12 +3056,14 @@ public abstract class EnumerableDefaults {
}
}
- /** Enumerator that casts each value. */
+ /** Enumerator that casts each value.
+ *
+ * @param <T> element type */
static class CastingEnumerator<T> implements Enumerator<T> {
private final Enumerator<?> enumerator;
private final Class<T> clazz;
- public CastingEnumerator(Enumerator<?> enumerator, Class<T> clazz) {
+ CastingEnumerator(Enumerator<?> enumerator, Class<T> clazz) {
this.enumerator = enumerator;
this.clazz = clazz;
}
@@ -3082,7 +3085,9 @@ public abstract class EnumerableDefaults {
}
}
- /** Value wrapped with a comparer. */
+ /** Value wrapped with a comparer.
+ *
+ * @param <T> element type */
private static class Wrapped<T> {
private final EqualityComparer<T> comparer;
private final T element;
@@ -3111,7 +3116,10 @@ public abstract class EnumerableDefaults {
}
}
- /** Map that wraps each value. */
+ /** Map that wraps each value.
+ *
+ * @param <K> key type
+ * @param <V> value type */
private static class WrapMap<K, V> extends AbstractMap<K, V> {
private final Map<Wrapped<K>, V> map;
private final EqualityComparer<K> comparer;
@@ -3178,13 +3186,17 @@ public abstract class EnumerableDefaults {
}
}
- /** Reads a populated map, applying a selector function. */
+ /** Reads a populated map, applying a selector function.
+ *
+ * @param <TResult> result type
+ * @param <TKey> key type
+ * @param <TAccumulate> accumulator type */
private static class LookupResultEnumerable<TResult, TKey, TAccumulate>
extends AbstractEnumerable2<TResult> {
private final Map<TKey, TAccumulate> map;
private final Function2<TKey, TAccumulate, TResult> resultSelector;
- public LookupResultEnumerable(Map<TKey, TAccumulate> map,
+ LookupResultEnumerable(Map<TKey, TAccumulate> map,
Function2<TKey, TAccumulate, TResult> resultSelector) {
this.map = map;
this.resultSelector = resultSelector;
@@ -3210,7 +3222,12 @@ public abstract class EnumerableDefaults {
}
}
- /** Enumerator that performs a merge join on its sorted inputs. */
+ /** Enumerator that performs a merge join on its sorted inputs.
+ *
+ * @param <TResult> result type
+ * @param <TSource> left input record type
+ * @param <TKey> key type
+ * @param <TInner> right input record type */
private static class MergeJoinEnumerator<TResult, TSource, TInner, TKey extends Comparable<TKey>>
implements Enumerator<TResult> {
final List<TSource> lefts = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/Linq4j.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/Linq4j.java b/linq4j/src/main/java/org/apache/calcite/linq4j/Linq4j.java
index d6c727c..5e58a44 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/Linq4j.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/Linq4j.java
@@ -440,7 +440,9 @@ public abstract class Linq4j {
}
}
- /** Iterable enumerator. */
+ /** Iterable enumerator.
+ *
+ * @param <T> element type */
@SuppressWarnings("unchecked")
static class IterableEnumerator<T> implements Enumerator<T> {
private final Iterable<? extends T> iterable;
@@ -481,7 +483,9 @@ public abstract class Linq4j {
}
}
- /** Composite enumerable. */
+ /** Composite enumerable.
+ *
+ * @param <E> element type */
static class CompositeEnumerable<E> extends AbstractEnumerable<E> {
private final Enumerator<Enumerable<E>> enumerableEnumerator;
@@ -525,7 +529,9 @@ public abstract class Linq4j {
}
}
- /** Iterable enumerable. */
+ /** Iterable enumerable.
+ *
+ * @param <T> element type */
static class IterableEnumerable<T> extends AbstractEnumerable2<T> {
protected final Iterable<T> iterable;
@@ -542,7 +548,9 @@ public abstract class Linq4j {
}
}
- /** Collection enumerable. */
+ /** Collection enumerable.
+ *
+ * @param <T> element type */
static class CollectionEnumerable<T> extends IterableEnumerable<T> {
CollectionEnumerable(Collection<T> iterable) {
super(iterable);
@@ -569,7 +577,9 @@ public abstract class Linq4j {
}
}
- /** List enumerable. */
+ /** List enumerable.
+ *
+ * @param <T> element type */
static class ListEnumerable<T> extends CollectionEnumerable<T> {
ListEnumerable(List<T> list) {
super(list);
@@ -608,7 +618,9 @@ public abstract class Linq4j {
}
}
- /** Enumerator that returns one element. */
+ /** Enumerator that returns one element.
+ *
+ * @param <E> element type */
private static class SingletonEnumerator<E> implements Enumerator<E> {
final E e;
int i = 0;
@@ -633,7 +645,9 @@ public abstract class Linq4j {
}
}
- /** Enumerator that returns one null element. */
+ /** Enumerator that returns one null element.
+ *
+ * @param <E> element type */
private static class SingletonNullEnumerator<E> implements Enumerator<E> {
int i = 0;
@@ -653,7 +667,9 @@ public abstract class Linq4j {
}
}
- /** Iterator that reads from an underlying {@link Enumerator}. */
+ /** Iterator that reads from an underlying {@link Enumerator}.
+ *
+ * @param <T> element type */
private static class EnumeratorIterator<T>
implements Iterator<T>, AutoCloseable {
private final Enumerator<T> enumerator;
@@ -683,7 +699,9 @@ public abstract class Linq4j {
}
}
- /** Enumerator optimized for random-access list. */
+ /** Enumerator optimized for random-access list.
+ *
+ * @param <V> element type */
private static class ListEnumerator<V> implements Enumerator<V> {
private final List<? extends V> list;
int i = -1;
@@ -709,7 +727,9 @@ public abstract class Linq4j {
}
/** Enumerates over the cartesian product of the given lists, returning
- * a list for each row. */
+ * a list for each row.
+ *
+ * @param <E> element type */
private static class CartesianProductListEnumerator<E>
extends CartesianProductEnumerator<E, List<E>> {
CartesianProductListEnumerator(List<Enumerator<E>> enumerators) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java b/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java
index 0ef3df6..c0e4192 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/Ord.java
@@ -147,11 +147,13 @@ public class Ord<E> implements Map.Entry<Integer, E> {
throw new UnsupportedOperationException();
}
- /** List of {@link Ord} backed by a list of elements. */
+ /** List of {@link Ord} backed by a list of elements.
+ *
+ * @param <E> element type */
private static class OrdList<E> extends AbstractList<Ord<E>> {
private final List<? extends E> elements;
- public OrdList(List<? extends E> elements) {
+ OrdList(List<? extends E> elements) {
this.elements = elements;
}
@@ -164,20 +166,24 @@ public class Ord<E> implements Map.Entry<Integer, E> {
}
}
- /** List of {@link Ord} backed by a random-access list of elements. */
+ /** List of {@link Ord} backed by a random-access list of elements.
+ *
+ * @param <E> element type */
private static class OrdRandomAccessList<E> extends OrdList<E>
implements RandomAccess {
- public OrdRandomAccessList(List<? extends E> elements) {
+ OrdRandomAccessList(List<? extends E> elements) {
super(elements);
}
}
- /** List of {@link Ord} backed by an array of elements. */
+ /** List of {@link Ord} backed by an array of elements.
+ *
+ * @param <E> element type */
private static class OrdArrayList<E> extends AbstractList<Ord<E>>
implements RandomAccess {
private final E[] elements;
- public OrdArrayList(E[] elements) {
+ OrdArrayList(E[] elements) {
this.elements = elements;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/QueryProviderImpl.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/QueryProviderImpl.java b/linq4j/src/main/java/org/apache/calcite/linq4j/QueryProviderImpl.java
index 3c8e50d..e7bc153 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/QueryProviderImpl.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/QueryProviderImpl.java
@@ -51,6 +51,8 @@ public abstract class QueryProviderImpl implements QueryProvider {
/**
* Binds an expression to this query provider.
+ *
+ * @param <T> element type
*/
public static class QueryableImpl<T> extends BaseQueryable<T> {
public QueryableImpl(QueryProviderImpl provider, Type elementType,
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java b/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
index f0997e1..328e9e6 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
@@ -711,8 +711,8 @@ public abstract class QueryableDefaults {
* Sorts the elements of a sequence in descending
* order according to a key.
*/
- public static <T, TKey extends Comparable> OrderedQueryable<T>
- orderByDescending(Queryable<T> source,
+ public static <T, TKey extends Comparable> OrderedQueryable<T> orderByDescending(
+ Queryable<T> source,
FunctionExpression<Function1<T, TKey>> keySelector) {
throw Extensions.todo();
}
@@ -1076,8 +1076,8 @@ public abstract class QueryableDefaults {
* Performs a subsequent ordering of the elements in a sequence in
* descending order according to a key.
*/
- public static <T, TKey extends Comparable<TKey>> OrderedQueryable<T>
- thenByDescending(OrderedQueryable<T> source,
+ public static <T, TKey extends Comparable<TKey>> OrderedQueryable<T> thenByDescending(
+ OrderedQueryable<T> source,
FunctionExpression<Function1<T, TKey>> keySelector) {
throw Extensions.todo();
}
@@ -1144,12 +1144,16 @@ public abstract class QueryableDefaults {
throw Extensions.todo();
}
- /** Replayable. */
+ /** Replayable.
+ *
+ * @param <T> element type */
public interface Replayable<T> extends Queryable<T> {
void replay(QueryableFactory<T> factory);
}
- /** Replayable queryable. */
+ /** Replayable queryable.
+ *
+ * @param <T> element type */
public abstract static class ReplayableQueryable<T>
extends DefaultQueryable<T> implements Replayable<T> {
public void replay(QueryableFactory<T> factory) {
@@ -1183,7 +1187,9 @@ public abstract class QueryableDefaults {
}
}
- /** Non-leaf replayable queryable. */
+ /** Non-leaf replayable queryable.
+ *
+ * @param <T> element type */
public abstract static class NonLeafReplayableQueryable<T>
extends ReplayableQueryable<T> {
private final Queryable<T> original;
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/function/Functions.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/function/Functions.java b/linq4j/src/main/java/org/apache/calcite/linq4j/function/Functions.java
index 8d6ccbf..f903422 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/function/Functions.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/function/Functions.java
@@ -36,8 +36,7 @@ import java.util.RandomAccess;
public abstract class Functions {
private Functions() {}
- public static final Map<Class<? extends Function>, Class>
- FUNCTION_RESULT_TYPES =
+ public static final Map<Class<? extends Function>, Class> FUNCTION_RESULT_TYPES =
Collections.<Class<? extends Function>, Class>unmodifiableMap(
map(Function0.class, Object.class,
Function1.class, Object.class,
@@ -531,7 +530,10 @@ public abstract class Functions {
}
}
- /** Selector equality comparer. */
+ /** Selector equality comparer.
+ *
+ * @param <T> element type
+ * @param <T2> target type */
private static final class SelectorEqualityComparer<T, T2>
implements EqualityComparer<T> {
private final Function1<T, T2> selector;
@@ -624,7 +626,11 @@ public abstract class Functions {
}
}
- /** Ignore. */
+ /** Ignore.
+ *
+ * @param <R> result type
+ * @param <T0> first argument type
+ * @param <T1> second argument type */
private static final class Ignore<R, T0, T1>
implements Function0<R>, Function1<T0, R>, Function2<T0, T1, R> {
public R apply() {
@@ -642,13 +648,15 @@ public abstract class Functions {
static final Ignore INSTANCE = new Ignore();
}
- /** List that generates each element using a function. */
+ /** List that generates each element using a function.
+ *
+ * @param <E> element type */
private static class GeneratingList<E> extends AbstractList<E>
implements RandomAccess {
private final int size;
private final Function1<Integer, E> fn;
- public GeneratingList(int size, Function1<Integer, E> fn) {
+ GeneratingList(int size, Function1<Integer, E> fn) {
this.size = size;
this.fn = fn;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockBuilder.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockBuilder.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockBuilder.java
index 1c591fe..653ae23 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockBuilder.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BlockBuilder.java
@@ -497,7 +497,7 @@ public class BlockBuilder {
private final Map<ParameterExpression, Boolean> actives =
new IdentityHashMap<>();
- public SubstituteVariableVisitor(Map<ParameterExpression, Expression> map) {
+ SubstituteVariableVisitor(Map<ParameterExpression, Expression> map) {
this.map = map;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
index 3af0fe6..d0c27e8 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ClassDeclarationFinder.java
@@ -38,8 +38,7 @@ public class ClassDeclarationFinder extends Shuttle {
protected final List<MemberDeclaration> addedDeclarations =
new ArrayList<MemberDeclaration>();
- private final Function1<ClassDeclarationFinder, ClassDeclarationFinder>
- childFactory;
+ private final Function1<ClassDeclarationFinder, ClassDeclarationFinder> childFactory;
private static final Function1<ClassDeclarationFinder,
ClassDeclarationFinder> DEFAULT_CHILD_FACTORY =
@@ -90,8 +89,8 @@ public class ClassDeclarationFinder extends Shuttle {
* @param optimizingClass class that implements optimizations
* @return factory that creates instances of given classes
*/
- private static Function1<ClassDeclarationFinder, ClassDeclarationFinder>
- newChildCreator(Class<? extends ClassDeclarationFinder> optimizingClass) {
+ private static Function1<ClassDeclarationFinder, ClassDeclarationFinder> newChildCreator(
+ Class<? extends ClassDeclarationFinder> optimizingClass) {
try {
final Constructor<? extends ClassDeclarationFinder> constructor =
optimizingClass.getConstructor(ClassDeclarationFinder.class);
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ExpressionWriter.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ExpressionWriter.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ExpressionWriter.java
index fd72330..99fefc6 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ExpressionWriter.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ExpressionWriter.java
@@ -33,11 +33,11 @@ class ExpressionWriter {
private boolean indentPending;
private final boolean generics;
- public ExpressionWriter() {
+ ExpressionWriter() {
this(true);
}
- public ExpressionWriter(boolean generics) {
+ ExpressionWriter(boolean generics) {
this.generics = generics;
}
@@ -197,7 +197,7 @@ class ExpressionWriter {
/** Helps generate strings of spaces, to indent text. */
private static class Indent extends ArrayList<String> {
- public Indent(int initialCapacity) {
+ Indent(int initialCapacity) {
super(initialCapacity);
ensureSize(initialCapacity);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Expressions.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Expressions.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Expressions.java
index 0651024..6902cc4 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Expressions.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Expressions.java
@@ -1168,7 +1168,7 @@ public abstract class Expressions {
* <p>It can be used when the delegate type is not known at compile time.
*/
public static <T, F extends Function<? extends T>> FunctionExpression<F>
- lambda(Class<F> type, BlockStatement body,
+ lambda(Class<F> type, BlockStatement body,
Iterable<? extends ParameterExpression> parameters) {
return new FunctionExpression<F>(type, body, toList(parameters));
}
@@ -1179,9 +1179,8 @@ public abstract class Expressions {
*
* <p>It can be used when the delegate type is not known at compile time.
*/
- public static <T, F extends Function<? extends T>> FunctionExpression<F>
- lambda(Class<F> type, BlockStatement body,
- ParameterExpression... parameters) {
+ public static <T, F extends Function<? extends T>> FunctionExpression<F> lambda(
+ Class<F> type, BlockStatement body, ParameterExpression... parameters) {
return lambda(type, body, toList(parameters));
}
@@ -1191,8 +1190,8 @@ public abstract class Expressions {
*
* <p>It can be used when the delegate type is not known at compile time.
*/
- public static <T, F extends Function<? extends T>> FunctionExpression<F>
- lambda(Class<F> type, Expression body,
+ public static <T, F extends Function<? extends T>> FunctionExpression<F> lambda(
+ Class<F> type, Expression body,
Iterable<? extends ParameterExpression> parameters) {
return lambda(type, Blocks.toFunctionBlock(body), toList(parameters));
}
@@ -1203,8 +1202,8 @@ public abstract class Expressions {
*
* <p>It can be used when the delegate type is not known at compile time.
*/
- public static <T, F extends Function<? extends T>> FunctionExpression<F>
- lambda(Class<F> type, Expression body, ParameterExpression... parameters) {
+ public static <T, F extends Function<? extends T>> FunctionExpression<F> lambda(
+ Class<F> type, Expression body, ParameterExpression... parameters) {
return lambda(type, Blocks.toFunctionBlock(body), toList(parameters));
}
@@ -3213,7 +3212,9 @@ public abstract class Expressions {
interface SymbolDocumentInfo {
}
- /** Fluent list. */
+ /** Fluent list.
+ *
+ * @param <T> element type */
public interface FluentList<T> extends List<T> {
FluentList<T> append(T t);
@@ -3226,14 +3227,16 @@ public abstract class Expressions {
FluentList<T> appendAll(T... ts);
}
- /** Fluent array list. */
+ /** Fluent array list.
+ *
+ * @param <T> element type */
private static class FluentArrayList<T> extends ArrayList<T>
implements FluentList<T> {
- public FluentArrayList() {
+ FluentArrayList() {
super();
}
- public FluentArrayList(Collection<? extends T> c) {
+ FluentArrayList(Collection<? extends T> c) {
super(c);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/linq4j/src/main/java/org/apache/calcite/linq4j/tree/FunctionExpression.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/FunctionExpression.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/FunctionExpression.java
index 14c67ca..3bbe26a 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/FunctionExpression.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/FunctionExpression.java
@@ -172,7 +172,8 @@ public final class FunctionExpression<F extends Function<?>>
.begin(" {\n")
.append("public ")
.append(Types.className(resultType2))
- .list(" " + methodName + "(", ", ", ") ", params)
+ .list(" " + methodName + "(",
+ ", ", ") ", params)
.append(Blocks.toFunctionBlock(body));
// Generate an intermediate bridge method if at least one parameter is
@@ -222,8 +223,8 @@ public final class FunctionExpression<F extends Function<?>>
private Method getAbstractMethod() {
if (type instanceof Class
- && ((Class) type).isInterface()
- && ((Class) type).getDeclaredMethods().length == 1) {
+ && ((Class) type).isInterface()
+ && ((Class) type).getDeclaredMethods().length == 1) {
return ((Class) type).getDeclaredMethods()[0];
}
return null;