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 2015/01/15 09:15:47 UTC
incubator-calcite git commit: Fix code style so that no line opens
more than one parenthesis
Repository: incubator-calcite
Updated Branches:
refs/heads/master 506c1ab46 -> d0b5e373e
Fix code style so that no line opens more than one parenthesis
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/d0b5e373
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/d0b5e373
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/d0b5e373
Branch: refs/heads/master
Commit: d0b5e373e098c495c3a68b77249b1a9e4a284517
Parents: 506c1ab
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jan 14 23:55:40 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Jan 14 23:55:40 2015 -0800
----------------------------------------------------------------------
.../adapter/enumerable/AggImplementor.java | 9 +-
.../adapter/enumerable/EnumerableAggregate.java | 14 +-
.../adapter/enumerable/EnumerableCorrelate.java | 9 +-
.../adapter/enumerable/EnumerableJoin.java | 9 +-
.../enumerable/EnumerableRelImplementor.java | 21 +--
.../enumerable/EnumerableTableModify.java | 4 +-
.../adapter/enumerable/EnumerableWindow.java | 92 +++++++------
.../calcite/adapter/enumerable/RexImpTable.java | 134 +++++++++++--------
.../enumerable/StrictAggImplementor.java | 37 ++---
.../enumerable/impl/WinAggAddContextImpl.java | 5 +-
.../org/apache/calcite/prepare/Prepare.java | 4 +-
.../apache/calcite/rel/metadata/RelMdUtil.java | 13 +-
.../apache/calcite/rel/rules/SemiJoinRule.java | 7 +-
.../java/org/apache/calcite/rex/RexBuilder.java | 4 +-
.../java/org/apache/calcite/rex/RexUtil.java | 4 +-
.../calcite/schema/impl/ScalarFunctionImpl.java | 4 +-
.../calcite/schema/impl/TableFunctionImpl.java | 38 +++---
.../org/apache/calcite/sql/SqlDataTypeSpec.java | 5 +-
.../sql2rel/RelStructuredTypeFlattener.java | 5 +-
.../org/apache/calcite/plan/RelWriterTest.java | 5 +-
.../calcite/test/ReflectiveSchemaTest.java | 7 +-
.../org/apache/calcite/test/RexProgramTest.java | 12 +-
.../org/apache/calcite/tools/PlannerTest.java | 43 +++---
.../calcite/linq4j/EnumerableDefaults.java | 12 +-
.../calcite/linq4j/EnumerableQueryable.java | 9 +-
.../calcite/linq4j/QueryableDefaults.java | 10 +-
.../calcite/linq4j/function/Functions.java | 28 ++--
.../calcite/linq4j/tree/BinaryExpression.java | 8 +-
.../calcite/linq4j/tree/BlockBuilder.java | 12 +-
.../org/apache/calcite/linq4j/tree/Blocks.java | 4 +-
.../apache/calcite/linq4j/tree/Expressions.java | 28 ++--
.../calcite/linq4j/test/DeterministicTest.java | 57 ++++----
.../calcite/linq4j/test/OptimizerTest.java | 79 ++++++-----
33 files changed, 402 insertions(+), 330 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
index ed99ac5..9c18376 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/AggImplementor.java
@@ -49,9 +49,12 @@ public interface AggImplementor {
* Implements reset of the intermediate variables to the initial state.
* {@link AggResetContext#accumulator()} should be used to reference
* the state variables.
- * For instance, to zero the count use the following code:
- * {@code reset.currentBlock().add(Expressions.statement(
- * Expressions.assign(reset.accumulator().get(0), Expressions.constant(0)));}
+ * For instance, to zero the count, use the following code:
+ *
+ * <blockquote><code>reset.currentBlock().add(<br>
+ * Expressions.statement(<br>
+ * Expressions.assign(reset.accumulator().get(0),<br>
+ * Expressions.constant(0)));</code></blockquote>
*
* @param info Aggregate context
* @param reset Reset context
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
index 39aaec9..532821f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAggregate.java
@@ -295,8 +295,7 @@ public class EnumerableAggregate extends Aggregate
List<Expression> accumulator =
new ArrayList<Expression>(stateSize);
for (int j = 0; j < stateSize; j++) {
- accumulator.add(accPhysType.fieldReference(
- acc_, j + stateOffset));
+ accumulator.add(accPhysType.fieldReference(acc_, j + stateOffset));
}
agg.state = accumulator;
@@ -309,17 +308,18 @@ public class EnumerableAggregate extends Aggregate
inputPhysType.getRowType().getFieldList();
List<RexNode> args = new ArrayList<RexNode>();
for (Integer index : agg.call.getArgList()) {
- args.add(new RexInputRef(index,
- inputTypes.get(index).getType()));
+ args.add(
+ new RexInputRef(index, inputTypes.get(index).getType()));
}
return args;
}
public RexToLixTranslator rowTranslator() {
return RexToLixTranslator.forAggregation(typeFactory,
- currentBlock(), new RexToLixTranslator.InputGetterImpl(
- Collections.singletonList(Pair.of(
- (Expression) inParameter, inputPhysType))))
+ currentBlock(),
+ new RexToLixTranslator.InputGetterImpl(
+ Collections.singletonList(
+ Pair.of((Expression) inParameter, inputPhysType))))
.setNullable(currentNullables());
}
};
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
index 3e2f468..6085520 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCorrelate.java
@@ -104,12 +104,11 @@ public class EnumerableCorrelate extends Correlate
: JoinRelType.INNER, physType,
ImmutableList.of(leftResult.physType, rightResult.physType));
- builder.append(Expressions.call(leftExpression,
- BuiltInMethod.CORRELATE_JOIN.method,
- Expressions.constant(joinType.toLinq4j()),
+ builder.append(
+ Expressions.call(leftExpression, BuiltInMethod.CORRELATE_JOIN.method,
+ Expressions.constant(joinType.toLinq4j()),
Expressions.lambda(corrBlock.toBlock(), corrArg),
- selector
- ));
+ selector));
return implementor.result(physType, builder.toBlock());
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
index bd712df..ef93c17 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableJoin.java
@@ -170,10 +170,11 @@ public class EnumerableJoin extends EquiJoin implements EnumerableRel {
.append(
Util.first(keyPhysType.comparer(),
Expressions.constant(null)))
- .append(Expressions.constant(
- joinType.generatesNullsOnLeft()))
- .append(Expressions.constant(
- joinType.generatesNullsOnRight())))).toBlock());
+ .append(
+ Expressions.constant(joinType.generatesNullsOnLeft()))
+ .append(
+ Expressions.constant(
+ joinType.generatesNullsOnRight())))).toBlock());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
index 2a3ca20..d69fffd 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableRelImplementor.java
@@ -116,9 +116,11 @@ public class EnumerableRelImplementor extends JavaRelImplementor {
new Function<ParameterExpression, Statement>() {
public Statement apply(ParameterExpression input) {
return Expressions.declare(Modifier.FINAL, input,
- Expressions.convert_(Expressions.call(DataContext.ROOT,
- BuiltInMethod.DATA_CONTEXT_GET.method,
- Expressions.constant(input.name)), input.type));
+ Expressions.convert_(
+ Expressions.call(DataContext.ROOT,
+ BuiltInMethod.DATA_CONTEXT_GET.method,
+ Expressions.constant(input.name)),
+ input.type));
}
});
@@ -139,12 +141,13 @@ public class EnumerableRelImplementor extends JavaRelImplementor {
BuiltInMethod.BINDABLE_BIND.method.getName(),
Expressions.list(root0_),
block));
- memberDeclarations.add(Expressions.methodDecl(Modifier.PUBLIC,
- Type.class,
- BuiltInMethod.TYPED_GET_ELEMENT_TYPE.method.getName(),
- Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.return_(null,
- Expressions.constant(result.physType.getJavaRowType())))));
+ memberDeclarations.add(
+ Expressions.methodDecl(Modifier.PUBLIC, Type.class,
+ BuiltInMethod.TYPED_GET_ELEMENT_TYPE.method.getName(),
+ Collections.<ParameterExpression>emptyList(),
+ Blocks.toFunctionBlock(
+ Expressions.return_(null,
+ Expressions.constant(result.physType.getJavaRowType())))));
return Expressions.classDecl(Modifier.PUBLIC,
"Baz",
null,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
index 944577c..c40678e 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableModify.java
@@ -107,8 +107,8 @@ public class EnumerableTableModify extends TableModify
final int fieldCount =
childPhysType.getRowType().getFieldCount();
for (int i = 0; i < fieldCount; i++) {
- expressionList.add(childPhysType.fieldReference(o_, i,
- physType.getJavaFieldType(i)));
+ expressionList.add(
+ childPhysType.fieldReference(o_, i, physType.getJavaFieldType(i)));
}
convertedChildExp =
builder.append(
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
index fd0304b..aa0ada7 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableWindow.java
@@ -175,10 +175,9 @@ public class EnumerableWindow extends Window implements EnumerableRel {
final List<Expression> translatedConstants =
new ArrayList<Expression>(constants.size());
for (RexLiteral constant : constants) {
- translatedConstants.add(RexToLixTranslator.translateLiteral(
- constant, constant.getType(),
- typeFactory,
- RexImpTable.NullAs.NULL));
+ translatedConstants.add(
+ RexToLixTranslator.translateLiteral(constant, constant.getType(),
+ typeFactory, RexImpTable.NullAs.NULL));
}
PhysType inputPhysType = result.physType;
@@ -255,11 +254,13 @@ public class EnumerableWindow extends Window implements EnumerableRel {
Object[].class),
false);
- builder3.add(Expressions.statement(
- Expressions.assign(prevStart, Expressions.constant(-1))));
- builder3.add(Expressions.statement(
- Expressions.assign(prevEnd,
- Expressions.constant(Integer.MAX_VALUE))));
+ builder3.add(
+ Expressions.statement(
+ Expressions.assign(prevStart, Expressions.constant(-1))));
+ builder3.add(
+ Expressions.statement(
+ Expressions.assign(prevEnd,
+ Expressions.constant(Integer.MAX_VALUE))));
final BlockBuilder builder4 = new BlockBuilder();
@@ -343,14 +344,13 @@ public class EnumerableWindow extends Window implements EnumerableRel {
hasRows = builder4.append("hasRows",
Expressions.lessThanOrEqual(startTmp, endTmp));
- builder4.add(Expressions.ifThenElse(
- hasRows,
- Expressions.block(
- Expressions.statement(
- Expressions.assign(startPe, startTmp)),
- Expressions.statement(
- Expressions.assign(endPe, endTmp))
- ),
+ builder4.add(
+ Expressions.ifThenElse(hasRows,
+ Expressions.block(
+ Expressions.statement(
+ Expressions.assign(startPe, startTmp)),
+ Expressions.statement(
+ Expressions.assign(endPe, endTmp))),
Expressions.block(
Expressions.statement(
Expressions.assign(startPe, Expressions.constant(-1))),
@@ -381,8 +381,8 @@ public class EnumerableWindow extends Window implements EnumerableRel {
0, int.class, builder5.newName("actualStart"));
final BlockBuilder builder6 = new BlockBuilder(true, builder5);
- builder6.add(Expressions.statement(
- Expressions.assign(actualStart, startX)));
+ builder6.add(
+ Expressions.statement(Expressions.assign(actualStart, startX)));
for (final AggImpState agg : aggs) {
agg.implementor.implementReset(agg.context,
@@ -400,24 +400,27 @@ public class EnumerableWindow extends Window implements EnumerableRel {
BlockStatement resetWindowState = builder6.toBlock();
if (resetWindowState.statements.size() == 1) {
- builder5.add(Expressions.declare(0, actualStart,
- Expressions.condition(needRecomputeWindow,
- startX, Expressions.add(prevEnd, Expressions.constant(1)))));
+ builder5.add(
+ Expressions.declare(0, actualStart,
+ Expressions.condition(needRecomputeWindow, startX,
+ Expressions.add(prevEnd, Expressions.constant(1)))));
} else {
- builder5.add(Expressions.declare(0, actualStart,
- null));
- builder5.add(Expressions.ifThenElse(needRecomputeWindow,
- resetWindowState,
- Expressions.statement(Expressions.assign(actualStart,
- Expressions.add(prevEnd, Expressions.constant(1))))));
+ builder5.add(
+ Expressions.declare(0, actualStart, null));
+ builder5.add(
+ Expressions.ifThenElse(needRecomputeWindow,
+ resetWindowState,
+ Expressions.statement(
+ Expressions.assign(actualStart,
+ Expressions.add(prevEnd, Expressions.constant(1))))));
}
if (lowerBoundCanChange instanceof BinaryExpression) {
- builder5.add(Expressions.statement(
- Expressions.assign(prevStart, startX)));
+ builder5.add(
+ Expressions.statement(Expressions.assign(prevStart, startX)));
}
- builder5.add(Expressions.statement(
- Expressions.assign(prevEnd, endX)));
+ builder5.add(
+ Expressions.statement(Expressions.assign(prevEnd, endX)));
final BlockBuilder builder7 = new BlockBuilder(true, builder5);
final DeclarationStatement jDecl =
@@ -469,9 +472,11 @@ public class EnumerableWindow extends Window implements EnumerableRel {
if (implementResult(aggs, builder5, resultContextBuilder, rexArguments,
true)) {
- builder4.add(Expressions.ifThen(Expressions.orElse(
- lowerBoundCanChange,
- Expressions.notEqual(endX, prevEnd)), builder5.toBlock()));
+ builder4.add(
+ Expressions.ifThen(
+ Expressions.orElse(lowerBoundCanChange,
+ Expressions.notEqual(endX, prevEnd)),
+ builder5.toBlock()));
}
implementResult(aggs, builder4, resultContextBuilder, rexArguments,
@@ -802,11 +807,12 @@ public class EnumerableWindow extends Window implements EnumerableRel {
aggHolderType,
builder.newName(aggName + "w" + windowIdx));
- builder.add(Expressions.declare(0, aggRes,
- Expressions.constant(
- Primitive.is(aggRes.getType())
+ builder.add(
+ Expressions.declare(0, aggRes,
+ Expressions.constant(Primitive.is(aggRes.getType())
? Primitive.of(aggRes.getType()).defaultValue
- : null, aggRes.getType())));
+ : null,
+ aggRes.getType())));
agg.result = aggRes;
outputRow.add(aggRes);
agg.implementor.implementReset(agg.context,
@@ -862,8 +868,8 @@ public class EnumerableWindow extends Window implements EnumerableRel {
// Several count(a) and count(b) might share the result
Expression aggRes = builder.append("a" + agg.aggIdx + "res",
RexToLixTranslator.convert(res, agg.result.getType()));
- builder.add(Expressions.statement(
- Expressions.assign(agg.result, aggRes)));
+ builder.add(
+ Expressions.statement(Expressions.assign(agg.result, aggRes)));
}
return nonEmpty;
}
@@ -928,8 +934,8 @@ public class EnumerableWindow extends Window implements EnumerableRel {
if (bound.getOffset() == null) {
desiredKeyType = Primitive.box(desiredKeyType);
}
- Expression val = translator.translate(new RexInputRef(orderKey,
- keyType), desiredKeyType);
+ Expression val = translator.translate(
+ new RexInputRef(orderKey, keyType), desiredKeyType);
if (!bound.isCurrentRow()) {
RexNode node = bound.getOffset();
Expression offs = translator.translate(node);
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
index 8cc9e80..1d721f8 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/RexImpTable.java
@@ -36,7 +36,6 @@ import org.apache.calcite.rex.RexCall;
import org.apache.calcite.rex.RexLiteral;
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.runtime.SqlFunctions;
-import org.apache.calcite.schema.Function;
import org.apache.calcite.schema.ImplementableAggFunction;
import org.apache.calcite.schema.ImplementableFunction;
import org.apache.calcite.schema.impl.AggregateFunctionImpl;
@@ -52,6 +51,7 @@ import org.apache.calcite.sql.validate.SqlUserDefinedFunction;
import org.apache.calcite.util.BuiltInMethod;
import org.apache.calcite.util.Util;
+import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -419,12 +419,13 @@ public class RexImpTable {
case TRUE:
return Expressions.foldAnd(expressions);
}
- return Expressions.foldAnd(Lists.transform(expressions,
- new com.google.common.base.Function<Expression, Expression>() {
- public Expression apply(Expression e) {
- return nullAs2.handle(e);
- }
- }));
+ return Expressions.foldAnd(
+ Lists.transform(expressions,
+ new Function<Expression, Expression>() {
+ public Expression apply(Expression e) {
+ return nullAs2.handle(e);
+ }
+ }));
}
};
case OR:
@@ -550,7 +551,7 @@ public class RexImpTable {
public CallImplementor get(final SqlOperator operator) {
if (operator instanceof SqlUserDefinedFunction) {
- Function udf =
+ org.apache.calcite.schema.Function udf =
((SqlUserDefinedFunction) operator).getFunction();
if (!(udf instanceof ImplementableFunction)) {
throw new IllegalStateException("User defined function " + operator
@@ -918,8 +919,9 @@ public class RexImpTable {
static class CountImplementor extends StrictAggImplementor {
@Override public void implementNotNullAdd(AggContext info,
AggAddContext add) {
- add.currentBlock().add(Expressions.statement(
- Expressions.postIncrementAssign(add.accumulator().get(0))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.postIncrementAssign(add.accumulator().get(0))));
}
}
@@ -947,8 +949,9 @@ public class RexImpTable {
if (justFrameRowCount) {
return;
}
- add.currentBlock().add(Expressions.statement(
- Expressions.postIncrementAssign(add.accumulator().get(0))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.postIncrementAssign(add.accumulator().get(0))));
}
@Override protected Expression implementNotNullResult(WinAggContext info,
@@ -968,8 +971,9 @@ public class RexImpTable {
? Expressions.constant(BigDecimal.ZERO)
: Expressions.constant(0);
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- reset.accumulator().get(0), start)));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(reset.accumulator().get(0), start)));
}
@Override public void implementNotNullAdd(AggContext info,
@@ -999,8 +1003,10 @@ public class RexImpTable {
Primitive p = Primitive.of(acc.getType());
boolean isMin = MIN == info.aggregation();
Object inf = p == null ? null : (isMin ? p.max : p.min);
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- acc, Expressions.constant(inf, acc.getType()))));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc,
+ Expressions.constant(inf, acc.getType()))));
}
@Override public void implementNotNullAdd(AggContext info,
@@ -1025,23 +1031,30 @@ public class RexImpTable {
public void implementReset(AggContext info, AggResetContext reset) {
List<Expression> acc = reset.accumulator();
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(0), Expressions.constant(false))));
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(1), getDefaultValue(acc.get(1).getType()))));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(0), Expressions.constant(false))));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(1),
+ getDefaultValue(acc.get(1).getType()))));
}
public void implementAdd(AggContext info, AggAddContext add) {
List<Expression> acc = add.accumulator();
Expression flag = acc.get(0);
- add.currentBlock().add(Expressions.ifThen(flag,
- Expressions.throw_(Expressions.new_(IllegalStateException.class,
- Expressions.constant("more than one value in agg "
- + info.aggregation().toString())))));
- add.currentBlock().add(Expressions.statement(
- Expressions.assign(flag, Expressions.constant(true))));
- add.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(1), add.arguments().get(0))));
+ add.currentBlock().add(
+ Expressions.ifThen(flag,
+ Expressions.throw_(
+ Expressions.new_(IllegalStateException.class,
+ Expressions.constant("more than one value in agg "
+ + info.aggregation())))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(flag, Expressions.constant(true))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(1), add.arguments().get(0))));
}
public Expression implementResult(AggContext info,
@@ -1071,13 +1084,17 @@ public class RexImpTable {
AggResetContext reset) {
List<Expression> acc = reset.accumulator();
if (!afi.isStatic) {
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(1), Expressions.new_(afi.declaringClass)
- )));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(1),
+ Expressions.new_(afi.declaringClass))));
}
- reset.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(0), Expressions.call(
- afi.isStatic ? null : acc.get(1), afi.initMethod))));
+ reset.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(0),
+ Expressions.call(afi.isStatic
+ ? null
+ : acc.get(1), afi.initMethod))));
}
@Override protected void implementNotNullAdd(AggContext info,
@@ -1087,10 +1104,11 @@ public class RexImpTable {
List<Expression> args = new ArrayList<Expression>(aggArgs.size() + 1);
args.add(acc.get(0));
args.addAll(aggArgs);
- add.currentBlock().add(Expressions.statement(Expressions.assign(
- acc.get(0), Expressions.call(
- afi.isStatic ? null : acc.get(1), afi.addMethod,
- args))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc.get(0),
+ Expressions.call(afi.isStatic ? null : acc.get(1), afi.addMethod,
+ args))));
}
@Override protected Expression implementNotNullResult(AggContext info,
@@ -1123,16 +1141,22 @@ public class RexImpTable {
};
}
BlockBuilder builder = add.nestBlock();
- add.currentBlock().add(Expressions.ifThen(Expressions.lessThan(
- add.compareRows(Expressions.subtract(add.currentPosition(),
- Expressions.constant(1)), add.currentPosition()),
+ add.currentBlock().add(
+ Expressions.ifThen(
+ Expressions.lessThan(
+ add.compareRows(
+ Expressions.subtract(add.currentPosition(),
+ Expressions.constant(1)),
+ add.currentPosition()),
Expressions.constant(0)),
- Expressions.statement(Expressions.assign(
- acc, computeNewRank(acc, add)))));
+ Expressions.statement(
+ Expressions.assign(acc, computeNewRank(acc, add)))));
add.exitBlock();
add.currentBlock().add(
- Expressions.ifThen(Expressions.greaterThan(add.currentPosition(),
- add.startIndex()), builder.toBlock()));
+ Expressions.ifThen(
+ Expressions.greaterThan(add.currentPosition(),
+ add.startIndex()),
+ builder.toBlock()));
}
protected Expression computeNewRank(Expression acc, WinAggAddContext add) {
@@ -1192,9 +1216,9 @@ public class RexImpTable {
WinAggResultContext winResult = (WinAggResultContext) result;
return Expressions.condition(winResult.hasRows(),
- winResult.rowTranslator(winResult.computeIndex(
- Expressions.constant(0), seekType)).translate(
- winResult.rexArguments().get(0), info.returnType()),
+ winResult.rowTranslator(
+ winResult.computeIndex(Expressions.constant(0), seekType))
+ .translate(winResult.rexArguments().get(0), info.returnType()),
getDefaultValue(info.returnType()));
}
}
@@ -1249,8 +1273,8 @@ public class RexImpTable {
Expression offset;
RexToLixTranslator currentRowTranslator =
- winResult.rowTranslator(winResult.computeIndex(
- Expressions.constant(0), SeekType.SET));
+ winResult.rowTranslator(
+ winResult.computeIndex(Expressions.constant(0), SeekType.SET));
if (rexArgs.size() >= 2) {
// lead(x, offset) or lead(x, offset, default)
offset = currentRowTranslator.translate(
@@ -1277,8 +1301,9 @@ public class RexImpTable {
: getDefaultValue(res.type);
result.currentBlock().add(Expressions.declare(0, res, null));
- result.currentBlock().add(Expressions.ifThenElse(rowInRange, thenBranch,
- Expressions.statement(Expressions.assign(res, defaultValue))));
+ result.currentBlock().add(
+ Expressions.ifThenElse(rowInRange, thenBranch,
+ Expressions.statement(Expressions.assign(res, defaultValue))));
return res;
}
}
@@ -1352,8 +1377,9 @@ public class RexImpTable {
@Override protected Expression implementNotNullResult(
WinAggContext info, WinAggResultContext result) {
// Window cannot be empty since ROWS/RANGE is not possible for ROW_NUMBER
- return Expressions.add(Expressions.subtract(
- result.index(), result.startIndex()), Expressions.constant(1));
+ return Expressions.add(
+ Expressions.subtract(result.index(), result.startIndex()),
+ Expressions.constant(1));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
index ae2ae4c..783dd43 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/StrictAggImplementor.java
@@ -53,9 +53,9 @@ public abstract class StrictAggImplementor implements AggImplementor {
protected final void accAdvance(AggAddContext add, Expression acc,
Expression next) {
- add.currentBlock().add(Expressions.statement(Expressions.assign(
- acc,
- Types.castIfNecessary(acc.type, next))));
+ add.currentBlock().add(
+ Expressions.statement(
+ Expressions.assign(acc, Types.castIfNecessary(acc.type, next))));
}
public final List<Type> getStateType(AggContext info) {
@@ -89,9 +89,10 @@ public abstract class StrictAggImplementor implements AggImplementor {
List<Expression> acc = reset.accumulator();
Expression flag = acc.get(acc.size() - 1);
BlockBuilder block = reset.currentBlock();
- block.add(Expressions.statement(
- Expressions.assign(flag,
- RexImpTable.getDefaultValue(flag.getType()))));
+ block.add(
+ Expressions.statement(
+ Expressions.assign(flag,
+ RexImpTable.getDefaultValue(flag.getType()))));
}
implementNotNullReset(info, reset);
}
@@ -102,9 +103,10 @@ public abstract class StrictAggImplementor implements AggImplementor {
List<Expression> accumulator = reset.accumulator();
for (int i = 0; i < getStateSize(); i++) {
Expression exp = accumulator.get(i);
- block.add(Expressions.statement(
- Expressions.assign(exp,
- RexImpTable.getDefaultValue(exp.getType()))));
+ block.add(
+ Expressions.statement(
+ Expressions.assign(exp,
+ RexImpTable.getDefaultValue(exp.getType()))));
}
}
@@ -125,8 +127,10 @@ public abstract class StrictAggImplementor implements AggImplementor {
: new BlockBuilder(true, add.currentBlock());
if (trackNullsPerRow) {
List<Expression> acc = add.accumulator();
- thenBlock.add(Expressions.statement(Expressions.assign(
- acc.get(acc.size() - 1), Expressions.constant(true))));
+ thenBlock.add(
+ Expressions.statement(
+ Expressions.assign(acc.get(acc.size() - 1),
+ Expressions.constant(true))));
}
if (argsNotNull) {
implementNotNullAdd(info, add);
@@ -177,11 +181,12 @@ public abstract class StrictAggImplementor implements AggImplementor {
nonNull, RexImpTable.getDefaultValue(res.getType()));
}
result.currentBlock().add(Expressions.declare(0, res, null));
- result.currentBlock().add(Expressions.ifThenElse(seenNotNullRows,
- thenBranch,
- Expressions.statement(
- Expressions.assign(res,
- RexImpTable.getDefaultValue(res.getType())))));
+ result.currentBlock().add(
+ Expressions.ifThenElse(seenNotNullRows,
+ thenBranch,
+ Expressions.statement(
+ Expressions.assign(res,
+ RexImpTable.getDefaultValue(res.getType())))));
return res;
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
index adcada8..9932cab 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/impl/WinAggAddContextImpl.java
@@ -40,8 +40,9 @@ public abstract class WinAggAddContextImpl extends WinAggResultContextImpl
}
public final RexToLixTranslator rowTranslator() {
- return rowTranslator(computeIndex(Expressions.constant(0),
- WinAggImplementor.SeekType.AGG_INDEX));
+ return rowTranslator(
+ computeIndex(Expressions.constant(0),
+ WinAggImplementor.SeekType.AGG_INDEX));
}
public final List<Expression> arguments() {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/prepare/Prepare.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/prepare/Prepare.java b/core/src/main/java/org/apache/calcite/prepare/Prepare.java
index ccbf175..ae4e691 100644
--- a/core/src/main/java/org/apache/calcite/prepare/Prepare.java
+++ b/core/src/main/java/org/apache/calcite/prepare/Prepare.java
@@ -450,8 +450,8 @@ public abstract class Prepare {
}
public List<List<String>> getFieldOrigins() {
- return Collections.singletonList(Collections.<String>nCopies(
- 4, null));
+ return Collections.singletonList(
+ Collections.<String>nCopies(4, null));
}
public RelNode getRel() {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
index c152bac..24f5c48 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdUtil.java
@@ -650,14 +650,11 @@ public class RelMdUtil {
}
if (useMaxNdv) {
- distRowCount = Math.max(RelMetadataQuery.getDistinctRowCount(
- left,
- leftMask.build(),
- leftPred),
- RelMetadataQuery.getDistinctRowCount(
- right,
- rightMask.build(),
- rightPred));
+ distRowCount = Math.max(
+ RelMetadataQuery.getDistinctRowCount(left, leftMask.build(),
+ leftPred),
+ RelMetadataQuery.getDistinctRowCount(right, rightMask.build(),
+ rightPred));
} else {
distRowCount =
NumberUtil.multiply(
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
index 28d9454..532f3bc 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/SemiJoinRule.java
@@ -45,9 +45,10 @@ public class SemiJoinRule extends RelOptRule {
private SemiJoinRule() {
super(
operand(Project.class,
- some(operand(Join.class,
- some(operand(RelNode.class, any()),
- operand(Aggregate.class, any()))))));
+ some(
+ operand(Join.class,
+ some(operand(RelNode.class, any()),
+ operand(Aggregate.class, any()))))));
}
@Override public void onMatch(RelOptRuleCall call) {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
index 81c6881..f66f62e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexBuilder.java
@@ -244,8 +244,8 @@ public class RexBuilder {
/**
* Creates a call with a list of arguments.
*
- * <p>Equivalent to <code>makeCall(op, exprList.toArray(new
- * RexNode[exprList.size()]))</code>.
+ * <p>Equivalent to
+ * <code>makeCall(op, exprList.toArray(new RexNode[exprList.size()]))</code>.
*/
public final RexNode makeCall(
SqlOperator op,
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/rex/RexUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUtil.java b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
index ef430d8..d88552a 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
@@ -1357,8 +1357,8 @@ public class RexUtil {
for (RexNode operand : operands) {
list.add(removeFactor(factors, operand));
}
- return and(Iterables.concat(factors.values(),
- ImmutableList.of(or(list))));
+ return and(
+ Iterables.concat(factors.values(), ImmutableList.of(or(list))));
default:
return rex;
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
index 09dfb67..c34076e 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/ScalarFunctionImpl.java
@@ -112,8 +112,8 @@ public class ScalarFunctionImpl extends ReflectiveFunctionBase implements
}
private static CallImplementor createImplementor(final Method method) {
- return RexImpTable.createImplementor(new ReflectiveCallNotNullImplementor(
- method), NullPolicy.ANY, false);
+ return RexImpTable.createImplementor(
+ new ReflectiveCallNotNullImplementor(method), NullPolicy.ANY, false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java b/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
index e8b523b..b23f3a4 100644
--- a/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
+++ b/core/src/main/java/org/apache/calcite/schema/impl/TableFunctionImpl.java
@@ -96,25 +96,25 @@ public class TableFunctionImpl extends ReflectiveFunctionBase implements
}
private static CallImplementor createImplementor(final Method method) {
- return RexImpTable.createImplementor(new ReflectiveCallNotNullImplementor(
- method) {
- public Expression implement(RexToLixTranslator translator,
- RexCall call, List<Expression> translatedOperands) {
- Expression expr = super.implement(translator, call,
- translatedOperands);
- Expression queryable = Expressions.call(
- Expressions.convert_(expr, QueryableTable.class),
- BuiltInMethod.QUERYABLE_TABLE_AS_QUERYABLE.method,
- Expressions.call(DataContext.ROOT,
- BuiltInMethod.DATA_CONTEXT_GET_QUERY_PROVIDER.method),
- Expressions.constant(null, SchemaPlus.class),
- Expressions.constant(call.getOperator().getName(),
- String.class));
- expr = Expressions.call(queryable,
- BuiltInMethod.QUERYABLE_AS_ENUMERABLE.method);
- return expr;
- }
- }, NullPolicy.ANY, false);
+ return RexImpTable.createImplementor(
+ new ReflectiveCallNotNullImplementor(method) {
+ public Expression implement(RexToLixTranslator translator,
+ RexCall call, List<Expression> translatedOperands) {
+ Expression expr = super.implement(translator, call,
+ translatedOperands);
+ Expression queryable = Expressions.call(
+ Expressions.convert_(expr, QueryableTable.class),
+ BuiltInMethod.QUERYABLE_TABLE_AS_QUERYABLE.method,
+ Expressions.call(DataContext.ROOT,
+ BuiltInMethod.DATA_CONTEXT_GET_QUERY_PROVIDER.method),
+ Expressions.constant(null, SchemaPlus.class),
+ Expressions.constant(call.getOperator().getName(),
+ String.class));
+ expr = Expressions.call(queryable,
+ BuiltInMethod.QUERYABLE_AS_ENUMERABLE.method);
+ return expr;
+ }
+ }, NullPolicy.ANY, false);
}
private QueryableTable apply(List<Object> arguments) {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java b/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java
index fd4f22c..62abaa6 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlDataTypeSpec.java
@@ -46,8 +46,9 @@ import static org.apache.calcite.util.Static.RESOURCE;
* <p>In its full glory, we will have to support complex type expressions
* like:</p>
*
- * <blockquote><code>ROW( NUMBER(5,2) NOT NULL AS foo, ROW( BOOLEAN AS b, MyUDT
- * NOT NULL AS i ) AS rec )</code></blockquote>
+ * <blockquote><code>ROW(<br>
+ * NUMBER(5, 2) NOT NULL AS foo,<br>
+ * ROW(BOOLEAN AS b, MyUDT NOT NULL AS i) AS rec)</code></blockquote>
*
* <p>Currently it only supports simple datatypes like CHAR, VARCHAR and DOUBLE,
* with optional precision and scale.</p>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/main/java/org/apache/calcite/sql2rel/RelStructuredTypeFlattener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/RelStructuredTypeFlattener.java b/core/src/main/java/org/apache/calcite/sql2rel/RelStructuredTypeFlattener.java
index 64f562f..bf25d60 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/RelStructuredTypeFlattener.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/RelStructuredTypeFlattener.java
@@ -652,8 +652,9 @@ public class RelStructuredTypeFlattener implements ReflectiveVisitor {
null);
for (RelDataTypeField field : flattenedType.getFieldList()) {
flattenedExps.add(
- Pair.of(rexBuilder.makeCast(field.getType(),
- rexBuilder.constantNull()), field.getName()));
+ Pair.of(
+ rexBuilder.makeCast(field.getType(), rexBuilder.constantNull()),
+ field.getName()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/test/java/org/apache/calcite/plan/RelWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/plan/RelWriterTest.java b/core/src/test/java/org/apache/calcite/plan/RelWriterTest.java
index eaaf2a6..0410398 100644
--- a/core/src/test/java/org/apache/calcite/plan/RelWriterTest.java
+++ b/core/src/test/java/org/apache/calcite/plan/RelWriterTest.java
@@ -179,8 +179,9 @@ public class RelWriterTest {
}
});
- assertThat(Util.toLinux(s), is(
- "LogicalAggregate(group=[{0}], agg#0=[COUNT(DISTINCT $1)], agg#1=[COUNT()])\n"
+ assertThat(Util.toLinux(s),
+ is(
+ "LogicalAggregate(group=[{0}], agg#0=[COUNT(DISTINCT $1)], agg#1=[COUNT()])\n"
+ " LogicalFilter(condition=[=($1, 10)])\n"
+ " LogicalTableScan(table=[[hr, emps]])\n"));
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java b/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
index d66d0a1..61eed09 100644
--- a/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
+++ b/core/src/test/java/org/apache/calcite/test/ReflectiveSchemaTest.java
@@ -146,9 +146,10 @@ public class ReflectiveSchemaTest {
Expressions.constant(
new JdbcTest.HrSchema().emps))), "asQueryable"),
Employee.class)
- .select(Expressions.<Function1<Employee, Integer>>lambda(
- Expressions.field(e, "empid"),
- e))
+ .select(
+ Expressions.<Function1<Employee, Integer>>lambda(
+ Expressions.field(e, "empid"),
+ e))
.toList();
assertEquals(Arrays.asList(100, 200, 150, 110), list);
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RexProgramTest.java b/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
index d275072..d7eecc4 100644
--- a/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RexProgramTest.java
@@ -621,15 +621,17 @@ public class RexProgramTest {
checkPullFactorsUnchanged(
and(aRef,
or(bRef,
- and(cRef, or(dRef,
- and(eRef, or(fRef, gRef)))))));
+ and(cRef,
+ or(dRef, and(eRef, or(fRef, gRef)))))));
checkPullFactorsUnchanged(
and(aRef,
or(bRef,
- and(cRef, or(dRef,
- and(eRef, or(fRef,
- and(gRef, or(trueLiteral, falseLiteral)))))))));
+ and(cRef,
+ or(dRef,
+ and(eRef,
+ or(fRef,
+ and(gRef, or(trueLiteral, falseLiteral)))))))));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 82137f5..23fe783 100644
--- a/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
+++ b/core/src/test/java/org/apache/calcite/tools/PlannerTest.java
@@ -250,8 +250,9 @@ public class PlannerTest {
RelNode rel = planner.convert(parse);
fail("expected error, got " + rel);
} catch (IllegalArgumentException e) {
- assertThat(e.getMessage(), containsString(
- "cannot move from STATE_3_PARSED to STATE_4_VALIDATED"));
+ assertThat(e.getMessage(),
+ containsString(
+ "cannot move from STATE_3_PARSED to STATE_4_VALIDATED"));
}
}
@@ -321,9 +322,10 @@ public class PlannerTest {
RelTraitSet traitSet = planner.getEmptyTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), equalTo(
- "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
- + " EnumerableTableScan(table=[[hr, emps]])\n"));
+ assertThat(toString(transform),
+ equalTo(
+ "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ + " EnumerableTableScan(table=[[hr, emps]])\n"));
}
/** Unit test that parses, validates, converts and
@@ -343,8 +345,8 @@ public class PlannerTest {
RelTraitSet traitSet = convert.getTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), equalTo(
- "EnumerableSort(sort0=[$1], dir0=[ASC])\n"
+ assertThat(toString(transform),
+ equalTo("EnumerableSort(sort0=[$1], dir0=[ASC])\n"
+ " EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ " EnumerableTableScan(table=[[hr, emps]])\n"));
}
@@ -370,8 +372,8 @@ public class PlannerTest {
RelTraitSet traitSet = planner.getEmptyTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), equalTo(
- "EnumerableProject(empid=[$0])\n"
+ assertThat(toString(transform),
+ equalTo("EnumerableProject(empid=[$0])\n"
+ " EnumerableProject(empid=[$0], deptno=[$1])\n"
+ " EnumerableSort(sort0=[$1], dir0=[ASC])\n"
+ " EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
@@ -397,8 +399,8 @@ public class PlannerTest {
RelTraitSet traitSet = planner.getEmptyTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), equalTo(
- "EnumerableProject(empid=[$0])\n"
+ assertThat(toString(transform),
+ equalTo("EnumerableProject(empid=[$0])\n"
+ " EnumerableSort(sort0=[$1], dir0=[ASC])\n"
+ " EnumerableProject(empid=[$0], deptno=[$1])\n"
+ " EnumerableSort(sort0=[$1], dir0=[ASC])\n"
@@ -426,8 +428,9 @@ public class PlannerTest {
RelTraitSet traitSet = planner.getEmptyTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), equalTo(
- "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ assertThat(toString(transform),
+ equalTo(
+ "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ " EnumerableTableScan(table=[[hr, emps]])\n"));
}
@@ -446,8 +449,9 @@ public class PlannerTest {
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
RelNode transform2 = planner.transform(0, traitSet, transform);
- assertThat(toString(transform2), equalTo(
- "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ assertThat(toString(transform2),
+ equalTo(
+ "EnumerableProject(empid=[$0], deptno=[$1], name=[$2], salary=[$3], commission=[$4])\n"
+ " EnumerableTableScan(table=[[hr, emps]])\n"));
}
@@ -499,8 +503,8 @@ public class PlannerTest {
RelNode transform = planner.transform(0, traitSet0, convert);
RelNode transform2 = planner.transform(1, traitSet1, transform);
- assertThat(toString(transform2), equalTo(
- "JdbcProject(name=[$2])\n"
+ assertThat(toString(transform2),
+ equalTo("JdbcProject(name=[$2])\n"
+ " MockJdbcTableScan(table=[[hr, emps]])\n"));
}
@@ -554,8 +558,9 @@ public class PlannerTest {
RelTraitSet traitSet = planner.getEmptyTraitSet()
.replace(EnumerableConvention.INSTANCE);
RelNode transform = planner.transform(0, traitSet, convert);
- assertThat(toString(transform), containsString(
- "EnumerableJoin(condition=[=($0, $5)], joinType=[inner])"));
+ assertThat(toString(transform),
+ containsString(
+ "EnumerableJoin(condition=[=($0, $5)], joinType=[inner])"));
}
/** Test case for
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 a4df14e..8608b1c 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
@@ -330,8 +330,8 @@ public abstract class EnumerableDefaults {
public static <TSource> Enumerable<TSource> concat(
Enumerable<TSource> enumerable0, Enumerable<TSource> enumerable1) {
//noinspection unchecked
- return Linq4j.concat(Arrays.<Enumerable<TSource>>asList(enumerable0,
- enumerable1));
+ return Linq4j.concat(
+ Arrays.<Enumerable<TSource>>asList(enumerable0, enumerable1));
}
/**
@@ -1776,8 +1776,8 @@ public abstract class EnumerableDefaults {
*/
public static <TSource> Enumerable<TSource> skipWhile(
Enumerable<TSource> source, Predicate1<TSource> predicate) {
- return skipWhile(source, Functions.<TSource, Integer>toPredicate2(
- predicate));
+ return skipWhile(source,
+ Functions.<TSource, Integer>toPredicate2(predicate));
}
/**
@@ -1919,8 +1919,8 @@ public abstract class EnumerableDefaults {
*/
public static <TSource> Enumerable<TSource> takeWhile(
Enumerable<TSource> source, final Predicate1<TSource> predicate) {
- return takeWhile(source, Functions.<TSource, Integer>toPredicate2(
- predicate));
+ return takeWhile(source,
+ Functions.<TSource, Integer>toPredicate2(predicate));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableQueryable.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableQueryable.java b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableQueryable.java
index 83dd399..9d0f795 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableQueryable.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableQueryable.java
@@ -381,15 +381,16 @@ class EnumerableQueryable<T> extends DefaultEnumerable<T>
public <TKey extends Comparable> OrderedQueryable<T> orderBy(
FunctionExpression<Function1<T, TKey>> keySelector) {
- return EnumerableDefaults.asOrderedQueryable(EnumerableDefaults.orderBy(
- getThis(), keySelector.getFunction()));
+ return EnumerableDefaults.asOrderedQueryable(
+ EnumerableDefaults.orderBy(getThis(), keySelector.getFunction()));
}
public <TKey> OrderedQueryable<T> orderBy(
FunctionExpression<Function1<T, TKey>> keySelector,
Comparator<TKey> comparator) {
- return EnumerableDefaults.asOrderedQueryable(EnumerableDefaults.orderBy(
- getThis(), keySelector.getFunction(), comparator));
+ return EnumerableDefaults.asOrderedQueryable(
+ EnumerableDefaults.orderBy(getThis(), keySelector.getFunction(),
+ comparator));
}
public <TKey extends Comparable> OrderedQueryable<T> orderByDescending(
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 5818b92..f0997e1 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/QueryableDefaults.java
@@ -895,8 +895,9 @@ public abstract class QueryableDefaults {
*/
public static <T> Queryable<T> skipWhile(Queryable<T> source,
FunctionExpression<Predicate1<T>> predicate) {
- return skipWhileN(source, Expressions.lambda(
- Functions.<T, Integer>toPredicate2(predicate.getFunction())));
+ return skipWhileN(source,
+ Expressions.lambda(
+ Functions.<T, Integer>toPredicate2(predicate.getFunction())));
}
/**
@@ -1030,8 +1031,9 @@ public abstract class QueryableDefaults {
*/
public static <T> Queryable<T> takeWhile(Queryable<T> source,
FunctionExpression<Predicate1<T>> predicate) {
- return takeWhileN(source, Expressions.lambda(
- Functions.<T, Integer>toPredicate2(predicate.getFunction())));
+ return takeWhileN(source,
+ Expressions.lambda(
+ Functions.<T, Integer>toPredicate2(predicate.getFunction())));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 76e6bb8..5d02cd2 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
@@ -38,20 +38,20 @@ public abstract class Functions {
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,
- Function2.class, Object.class,
- BigDecimalFunction1.class, BigDecimal.class,
- DoubleFunction1.class, Double.TYPE,
- FloatFunction1.class, Float.TYPE,
- IntegerFunction1.class, Integer.TYPE,
- LongFunction1.class, Long.TYPE,
- NullableBigDecimalFunction1.class, BigDecimal.class,
- NullableDoubleFunction1.class, Double.class,
- NullableFloatFunction1.class, Float.class,
- NullableIntegerFunction1.class, Integer.class,
- NullableLongFunction1.class, Long.class));
+ Collections.<Class<? extends Function>, Class>unmodifiableMap(
+ map(Function0.class, Object.class,
+ Function1.class, Object.class,
+ Function2.class, Object.class,
+ BigDecimalFunction1.class, BigDecimal.class,
+ DoubleFunction1.class, Double.TYPE,
+ FloatFunction1.class, Float.TYPE,
+ IntegerFunction1.class, Integer.TYPE,
+ LongFunction1.class, Long.TYPE,
+ NullableBigDecimalFunction1.class, BigDecimal.class,
+ NullableDoubleFunction1.class, Double.class,
+ NullableFloatFunction1.class, Float.class,
+ NullableIntegerFunction1.class, Integer.class,
+ NullableLongFunction1.class, Long.class));
private static final Map<Class, Class<? extends Function>> FUNCTION1_CLASSES =
Collections.unmodifiableMap(
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BinaryExpression.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BinaryExpression.java
index cab48ef..37cead1 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BinaryExpression.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/BinaryExpression.java
@@ -71,8 +71,8 @@ public class BinaryExpression extends Expression {
throw cannotEvaluate();
}
case Equal:
- return expression0.evaluate(evaluator).equals(expression1.evaluate(
- evaluator));
+ return expression0.evaluate(evaluator)
+ .equals(expression1.evaluate(evaluator));
case GreaterThan:
switch (primitive) {
case INT:
@@ -129,8 +129,8 @@ public class BinaryExpression extends Expression {
throw cannotEvaluate();
}
case NotEqual:
- return !expression0.evaluate(evaluator).equals(expression1.evaluate(
- evaluator));
+ return !expression0.evaluate(evaluator)
+ .equals(expression1.evaluate(evaluator));
case OrElse:
return (Boolean) expression0.evaluate(evaluator)
|| (Boolean) expression1.evaluate(evaluator);
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 ef2b44a..c58a258 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
@@ -105,8 +105,8 @@ public class BlockBuilder {
Statement lastStatement = statements.get(statements.size() - 1);
if (lastStatement instanceof GotoStatement) {
// convert "return expr;" into "expr;"
- statements.set(statements.size() - 1, Expressions.statement(
- ((GotoStatement) lastStatement).expression));
+ statements.set(statements.size() - 1,
+ Expressions.statement(((GotoStatement) lastStatement).expression));
}
}
Expression result = null;
@@ -191,8 +191,8 @@ public class BlockBuilder {
Statement lastStatement = statements.get(statements.size() - 1);
if (lastStatement instanceof GotoStatement) {
// convert "return expr;" into "expr;"
- statements.set(statements.size() - 1, Expressions.statement(
- ((GotoStatement) lastStatement).expression));
+ statements.set(statements.size() - 1,
+ Expressions.statement(((GotoStatement) lastStatement).expression));
}
}
return append_(name, expression, optimize);
@@ -211,8 +211,8 @@ public class BlockBuilder {
return decl.parameter;
}
}
- DeclarationStatement declare = Expressions.declare(Modifier.FINAL, newName(
- name, optimize), expression);
+ DeclarationStatement declare = Expressions.declare(Modifier.FINAL,
+ newName(name, optimize), expression);
add(declare);
return declare.parameter;
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Blocks.java
----------------------------------------------------------------------
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Blocks.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Blocks.java
index 103abd7..0c9913e 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Blocks.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/Blocks.java
@@ -59,8 +59,8 @@ public final class Blocks {
*/
public static BlockStatement create(Statement statement,
BlockStatement block) {
- return Expressions.block(Expressions.list(statement).appendAll(
- block.statements));
+ return Expressions.block(
+ Expressions.list(statement).appendAll(block.statements));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/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 68c963d..3936d5f 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
@@ -682,8 +682,8 @@ public abstract class Expressions {
*/
public static BinaryExpression divide(Expression left, Expression right,
Method method) {
- return makeBinary(ExpressionType.Divide, left, right, shouldLift(left,
- right, method), method);
+ return makeBinary(ExpressionType.Divide, left, right,
+ shouldLift(left, right, method), method);
}
/**
@@ -1688,8 +1688,8 @@ public abstract class Expressions {
public static ConstructorDeclaration constructorDecl(int modifier,
Type declaredAgainst, Iterable<? extends ParameterExpression> parameters,
BlockStatement body) {
- return new ConstructorDeclaration(modifier, declaredAgainst, toList(
- parameters), body);
+ return new ConstructorDeclaration(modifier, declaredAgainst,
+ toList(parameters), body);
}
/**
@@ -1732,8 +1732,8 @@ public abstract class Expressions {
*/
public static BinaryExpression modulo(Expression left, Expression right,
Method method) {
- return makeBinary(ExpressionType.Modulo, left, right, shouldLift(left,
- right, method), method);
+ return makeBinary(ExpressionType.Modulo, left, right,
+ shouldLift(left, right, method), method);
}
/**
@@ -1780,8 +1780,8 @@ public abstract class Expressions {
*/
public static BinaryExpression multiply(Expression left, Expression right,
Method method) {
- return makeBinary(ExpressionType.Multiply, left, right, shouldLift(left,
- right, method), method);
+ return makeBinary(ExpressionType.Multiply, left, right,
+ shouldLift(left, right, method), method);
}
/**
@@ -1862,8 +1862,8 @@ public abstract class Expressions {
*/
public static BinaryExpression multiplyChecked(Expression left,
Expression right, Method method) {
- return makeBinary(ExpressionType.MultiplyChecked, left, right, shouldLift(
- left, right, method), method);
+ return makeBinary(ExpressionType.MultiplyChecked, left, right,
+ shouldLift(left, right, method), method);
}
/**
@@ -2594,8 +2594,8 @@ public abstract class Expressions {
*/
public static BinaryExpression subtract(Expression left, Expression right,
Method method) {
- return makeBinary(ExpressionType.Subtract, left, right, shouldLift(left,
- right, method), method);
+ return makeBinary(ExpressionType.Subtract, left, right,
+ shouldLift(left, right, method), method);
}
/**
@@ -2671,8 +2671,8 @@ public abstract class Expressions {
*/
public static BinaryExpression subtractChecked(Expression left,
Expression right, Method method) {
- return makeBinary(ExpressionType.SubtractChecked, left, right, shouldLift(
- left, right, method), method);
+ return makeBinary(ExpressionType.SubtractChecked, left, right,
+ shouldLift(left, right, method), method);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/linq4j/src/test/java/org/apache/calcite/linq4j/test/DeterministicTest.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/DeterministicTest.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/DeterministicTest.java
index aa53112..540dce5 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/DeterministicTest.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/DeterministicTest.java
@@ -154,16 +154,15 @@ public class DeterministicTest {
@Test public void testFactorOutBinaryAddSurvivesMultipleOptimizations() {
assertThat(
- optimize(optimizeExpression(
- Expressions.new_(
- Runnable.class,
- Collections.<Expression>emptyList(),
- Expressions.methodDecl(
- 0,
- int.class,
- "test",
- Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.add(ONE, TWO)))))),
+ optimize(
+ optimizeExpression(
+ Expressions.new_(Runnable.class,
+ Collections.<Expression>emptyList(),
+ Expressions.methodDecl(0,
+ int.class,
+ "test",
+ Collections.<ParameterExpression>emptyList(),
+ Blocks.toFunctionBlock(Expressions.add(ONE, TWO)))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
@@ -186,9 +185,9 @@ public class DeterministicTest {
int.class,
"test",
Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.multiply(
- Expressions.add(ONE, TWO),
- Expressions.subtract(ONE, TWO)))))),
+ Blocks.toFunctionBlock(
+ Expressions.multiply(Expressions.add(ONE, TWO),
+ Expressions.subtract(ONE, TWO)))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
@@ -449,9 +448,11 @@ public class DeterministicTest {
int.class,
"test",
Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.call(null,
- Types.lookupMethod(TestClass.class,
- "deterministic", int.class), ONE))))),
+ Blocks.toFunctionBlock(
+ Expressions.call(null,
+ Types.lookupMethod(TestClass.class,
+ "deterministic", int.class),
+ ONE))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
@@ -474,9 +475,11 @@ public class DeterministicTest {
int.class,
"test",
Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.call(null,
- Types.lookupMethod(TestClass.class,
- "nonDeterministic", int.class), ONE))))),
+ Blocks.toFunctionBlock(
+ Expressions.call(null,
+ Types.lookupMethod(TestClass.class,
+ "nonDeterministic", int.class),
+ ONE))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
@@ -498,9 +501,11 @@ public class DeterministicTest {
int.class,
"test",
Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.call(null,
- Types.lookupMethod(TestDeterministicClass.class,
- "deterministic", int.class), ONE))))),
+ Blocks.toFunctionBlock(
+ Expressions.call(null,
+ Types.lookupMethod(TestDeterministicClass.class,
+ "deterministic", int.class),
+ ONE))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
@@ -523,9 +528,11 @@ public class DeterministicTest {
int.class,
"test",
Collections.<ParameterExpression>emptyList(),
- Blocks.toFunctionBlock(Expressions.call(null,
- Types.lookupMethod(TestDeterministicClass.class,
- "nonDeterministic", int.class), ONE))))),
+ Blocks.toFunctionBlock(
+ Expressions.call(null,
+ Types.lookupMethod(TestDeterministicClass.class,
+ "nonDeterministic", int.class),
+ ONE))))),
equalTo("{\n"
+ " return new Runnable(){\n"
+ " int test() {\n"
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/d0b5e373/linq4j/src/test/java/org/apache/calcite/linq4j/test/OptimizerTest.java
----------------------------------------------------------------------
diff --git a/linq4j/src/test/java/org/apache/calcite/linq4j/test/OptimizerTest.java b/linq4j/src/test/java/org/apache/calcite/linq4j/test/OptimizerTest.java
index dd0d82d..1092cb5 100644
--- a/linq4j/src/test/java/org/apache/calcite/linq4j/test/OptimizerTest.java
+++ b/linq4j/src/test/java/org/apache/calcite/linq4j/test/OptimizerTest.java
@@ -121,51 +121,58 @@ public class OptimizerTest {
@Test public void testOptimizeTernaryAtrueBoxed() {
// a ? Boolean.TRUE : Boolean.valueOf(b) === a || b
assertEquals("{\n return a || Boolean.valueOf(b);\n}\n",
- optimize(Expressions.condition(
- Expressions.parameter(boolean.class, "a"),
- TRUE_B, Expressions.call(Boolean.class, "valueOf",
- Expressions.parameter(boolean.class, "b")))));
+ optimize(
+ Expressions.condition(Expressions.parameter(boolean.class, "a"),
+ TRUE_B,
+ Expressions.call(Boolean.class, "valueOf",
+ Expressions.parameter(boolean.class, "b")))));
}
@Test public void testOptimizeTernaryABtrue() {
// a ? b : true === !a || b
assertEquals("{\n return !a || b;\n}\n",
- optimize(Expressions.condition(
- Expressions.parameter(boolean.class, "a"),
- Expressions.parameter(boolean.class, "b"), TRUE)));
+ optimize(
+ Expressions.condition(
+ Expressions.parameter(boolean.class, "a"),
+ Expressions.parameter(boolean.class, "b"), TRUE)));
}
@Test public void testOptimizeTernaryAfalseB() {
// a ? false : b === !a && b
assertEquals("{\n return !a && b;\n}\n",
- optimize(Expressions.condition(
- Expressions.parameter(boolean.class, "a"),
- FALSE, Expressions.parameter(boolean.class, "b"))));
+ optimize(
+ Expressions.condition(
+ Expressions.parameter(boolean.class, "a"),
+ FALSE, Expressions.parameter(boolean.class, "b"))));
}
@Test public void testOptimizeTernaryABfalse() {
// a ? b : false === a && b
assertEquals("{\n return a && b;\n}\n",
- optimize(Expressions.condition(
- Expressions.parameter(boolean.class, "a"),
- Expressions.parameter(boolean.class, "b"), FALSE)));
+ optimize(
+ Expressions.condition(Expressions.parameter(boolean.class, "a"),
+ Expressions.parameter(boolean.class, "b"), FALSE)));
}
@Test public void testOptimizeTernaryInEqualABCeqB() {
// (v ? (Integer) null : inp0_) == null
assertEquals("{\n return v || inp0_ == null;\n}\n",
- optimize(Expressions.equal(Expressions.condition(
- Expressions.parameter(boolean.class, "v"),
- NULL_INTEGER, Expressions.parameter(Integer.class, "inp0_")),
+ optimize(
+ Expressions.equal(
+ Expressions.condition(Expressions.parameter(boolean.class, "v"),
+ NULL_INTEGER,
+ Expressions.parameter(Integer.class, "inp0_")),
NULL)));
}
@Test public void testOptimizeTernaryInEqualABCeqC() {
// (v ? inp0_ : (Integer) null) == null
assertEquals("{\n return !v || inp0_ == null;\n}\n",
- optimize(Expressions.equal(Expressions.condition(
- Expressions.parameter(boolean.class, "v"),
- Expressions.parameter(Integer.class, "inp0_"), NULL_INTEGER),
+ optimize(
+ Expressions.equal(
+ Expressions.condition(Expressions.parameter(boolean.class, "v"),
+ Expressions.parameter(Integer.class, "inp0_"),
+ NULL_INTEGER),
NULL)));
}
@@ -188,18 +195,22 @@ public class OptimizerTest {
@Test public void testOptimizeTernaryInEqualABCneqB() {
// (v ? (Integer) null : inp0_) != null
assertEquals("{\n return !(v || inp0_ == null);\n}\n",
- optimize(Expressions.notEqual(Expressions.condition(
- Expressions.parameter(boolean.class, "v"),
- NULL_INTEGER, Expressions.parameter(Integer.class, "inp0_")),
+ optimize(
+ Expressions.notEqual(
+ Expressions.condition(Expressions.parameter(boolean.class, "v"),
+ NULL_INTEGER,
+ Expressions.parameter(Integer.class, "inp0_")),
NULL)));
}
@Test public void testOptimizeTernaryInEqualABCneqC() {
// (v ? inp0_ : (Integer) null) != null
assertEquals("{\n return !(!v || inp0_ == null);\n}\n",
- optimize(Expressions.notEqual(Expressions.condition(
- Expressions.parameter(boolean.class, "v"),
- Expressions.parameter(Integer.class, "inp0_"), NULL_INTEGER),
+ optimize(
+ Expressions.notEqual(
+ Expressions.condition(Expressions.parameter(boolean.class, "v"),
+ Expressions.parameter(Integer.class, "inp0_"),
+ NULL_INTEGER),
NULL)));
}
@@ -246,9 +257,9 @@ public class OptimizerTest {
@Test public void testAndAlsoNullBool() {
// null && bool
assertEquals("{\n return null && bool;\n}\n",
- optimize(Expressions.andAlso(NULL,
- Expressions.parameter(boolean.class,
- "bool"))));
+ optimize(
+ Expressions.andAlso(NULL,
+ Expressions.parameter(boolean.class, "bool"))));
}
@Test public void testAndAlsoXY() {
@@ -286,9 +297,9 @@ public class OptimizerTest {
@Test public void testOrElseNullBool() {
// null || bool
assertEquals("{\n return null || bool;\n}\n",
- optimize(Expressions.orElse(NULL,
- Expressions.parameter(boolean.class,
- "bool"))));
+ optimize(
+ Expressions.orElse(NULL,
+ Expressions.parameter(boolean.class, "bool"))));
}
@Test public void testOrElseXY() {
@@ -342,8 +353,7 @@ public class OptimizerTest {
// (Integer) x == null
ParameterExpression x = Expressions.parameter(Integer.class, "x");
assertEquals("{\n return x == null;\n}\n",
- optimize(Expressions.equal(x,
- NULL)));
+ optimize(Expressions.equal(x, NULL)));
}
@Test public void testEqualStringNull() {
@@ -414,8 +424,7 @@ public class OptimizerTest {
// (Integer) x == null
ParameterExpression x = Expressions.parameter(Integer.class, "x");
assertEquals("{\n return x != null;\n}\n",
- optimize(Expressions.notEqual(
- x, NULL)));
+ optimize(Expressions.notEqual(x, NULL)));
}
@Test public void testNotEqualStringNull() {