http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java index 478190c..f79b187 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/CachingRelMetadataProvider.java @@ -55,8 +55,8 @@ public class CachingRelMetadataProvider implements RelMetadataProvider { //~ Methods ---------------------------------------------------------------- - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, final Class<? extends M> metadataClass) { final UnboundMetadata<M> function = underlyingProvider.apply(relClass, metadataClass); @@ -77,8 +77,8 @@ public class CachingRelMetadataProvider implements RelMetadataProvider { }; } - public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def) { return underlyingProvider.handlers(def); } @@ -101,7 +101,7 @@ public class CachingRelMetadataProvider implements RelMetadataProvider { private class CachingInvocationHandler implements InvocationHandler { private final Metadata metadata; - public CachingInvocationHandler(Metadata metadata) { + CachingInvocationHandler(Metadata metadata) { this.metadata = Preconditions.checkNotNull(metadata); }
http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java index 8643f91..9f1b0cb 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/ChainedRelMetadataProvider.java @@ -68,8 +68,8 @@ public class ChainedRelMetadataProvider implements RelMetadataProvider { return providers.hashCode(); } - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, final Class<? extends M> metadataClass) { final List<UnboundMetadata<M>> functions = new ArrayList<>(); for (RelMetadataProvider provider : providers) { @@ -104,8 +104,8 @@ public class ChainedRelMetadataProvider implements RelMetadataProvider { } } - public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def) { final ImmutableMultimap.Builder<Method, MetadataHandler<M>> builder = ImmutableMultimap.builder(); for (RelMetadataProvider provider : providers.reverse()) { @@ -124,7 +124,7 @@ public class ChainedRelMetadataProvider implements RelMetadataProvider { private static class ChainedInvocationHandler implements InvocationHandler { private final List<Metadata> metadataList; - public ChainedInvocationHandler(List<Metadata> metadataList) { + ChainedInvocationHandler(List<Metadata> metadataList) { this.metadataList = ImmutableList.copyOf(metadataList); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java index 5fff97a..e3c89fb 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/JaninoRelMetadataProvider.java @@ -184,13 +184,12 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider { } public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + handlers(MetadataDef<M> def) { return provider.handlers(def); } - private static <M extends Metadata> - MetadataHandler<M> load3(MetadataDef<M> def, - Multimap<Method, MetadataHandler<M>> map, + private static <M extends Metadata> MetadataHandler<M> load3( + MetadataDef<M> def, Multimap<Method, MetadataHandler<M>> map, ImmutableList<Class<? extends RelNode>> relClasses) { final StringBuilder buff = new StringBuilder(); final String name = @@ -379,8 +378,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider { } } - private static String - findProvider(List<Pair<String, MetadataHandler>> providerList, + private static String findProvider( + List<Pair<String, MetadataHandler>> providerList, Class<?> declaringClass) { for (Pair<String, MetadataHandler> pair : providerList) { if (declaringClass.isInstance(pair.right)) { @@ -424,8 +423,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider { return buff; } - static <M extends Metadata> MetadataHandler<M> - compile(ClassDeclaration expr, String s, MetadataDef<M> def, + static <M extends Metadata> MetadataHandler<M> compile(ClassDeclaration expr, + String s, MetadataDef<M> def, List<Object> argList) throws CompileException, IOException { final ICompilerFactory compilerFactory; try { @@ -456,8 +455,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider { return def.handlerClass.cast(o); } - synchronized <M extends Metadata, H extends MetadataHandler<M>> H - create(MetadataDef<M> def) { + synchronized <M extends Metadata, H extends MetadataHandler<M>> H create( + MetadataDef<M> def) { try { final Key key = new Key((MetadataDef) def, provider, ImmutableList.copyOf(ALL_RELS)); @@ -469,8 +468,8 @@ public class JaninoRelMetadataProvider implements RelMetadataProvider { } } - synchronized <M extends Metadata, H extends MetadataHandler<M>> H - revise(Class<? extends RelNode> rClass, MetadataDef<M> def) { + synchronized <M extends Metadata, H extends MetadataHandler<M>> H revise( + Class<? extends RelNode> rClass, MetadataDef<M> def) { if (ALL_RELS.add(rClass)) { HANDLERS.invalidateAll(); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java index bdaf4d3..9b5abec 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/ReflectiveRelMetadataProvider.java @@ -114,9 +114,8 @@ public class ReflectiveRelMetadataProvider return reflectiveSource(target, ImmutableList.copyOf(methods)); } - private static RelMetadataProvider - reflectiveSource(final MetadataHandler target, - final ImmutableList<Method> methods) { + private static RelMetadataProvider reflectiveSource( + final MetadataHandler target, final ImmutableList<Method> methods) { final Space2 space = Space2.create(target, methods); // This needs to be a concurrent map since RelMetadataProvider are cached in static @@ -211,8 +210,8 @@ public class ReflectiveRelMetadataProvider space.providerMap); } - public <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def) { + public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def) { final ImmutableMultimap.Builder<Method, MetadataHandler<M>> builder = ImmutableMultimap.builder(); for (Map.Entry<Method, MetadataHandler> entry : handlerMap.entries()) { @@ -241,9 +240,8 @@ public class ReflectiveRelMetadataProvider //~ Methods ---------------------------------------------------------------- - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, - Class<? extends M> metadataClass) { + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, Class<? extends M> metadataClass) { if (metadataClass == metadataClass0) { return apply(relClass); } else { @@ -252,8 +250,8 @@ public class ReflectiveRelMetadataProvider } @SuppressWarnings({ "unchecked", "SuspiciousMethodCalls" }) - public <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass) { + public <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass) { List<Class<? extends RelNode>> newSources = new ArrayList<>(); for (;;) { UnboundMetadata<M> function = map.get(relClass); @@ -343,7 +341,7 @@ public class ReflectiveRelMetadataProvider static class Space2 extends Space { private Class<Metadata> metadataClass0; - public Space2(Class<Metadata> metadataClass0, + Space2(Class<Metadata> metadataClass0, ImmutableMultimap<Method, MetadataHandler> providerMap) { super(providerMap); this.metadataClass0 = metadataClass0; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java index e7032c6..6ec5255 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdColumnUniqueness.java @@ -405,7 +405,7 @@ public class RelMdColumnUniqueness /** Splits a column set between left and right sets. */ private static Pair<ImmutableBitSet, ImmutableBitSet> - splitLeftAndRightColumns(int leftCount, final ImmutableBitSet columns) { + splitLeftAndRightColumns(int leftCount, final ImmutableBitSet columns) { ImmutableBitSet.Builder leftBuilder = ImmutableBitSet.builder(); ImmutableBitSet.Builder rightBuilder = ImmutableBitSet.builder(); for (int bit : columns) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java index 8c826fb..feeabd4 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdPredicates.java @@ -500,7 +500,7 @@ public class RelMdPredicates final RexNode leftChildPredicates; final RexNode rightChildPredicates; - public JoinConditionBasedPredicateInference(Join joinRel, + JoinConditionBasedPredicateInference(Join joinRel, RexNode lPreds, RexNode rPreds) { this(joinRel, joinRel instanceof SemiJoin, lPreds, rPreds); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/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 6a896ad..6229f4e 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 @@ -757,7 +757,7 @@ public class RelMdUtil { private final RelMetadataQuery mq; private Project rel; - public CardOfProjExpr(RelMetadataQuery mq, Project rel) { + CardOfProjExpr(RelMetadataQuery mq, Project rel) { super(true); this.mq = mq; this.rel = rel; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java index b4ddbe2..3eb9d9d 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataProvider.java @@ -62,12 +62,11 @@ public interface RelMetadataProvider { * @return Function that will field a metadata instance; or null if this * provider cannot supply metadata of this type */ - <M extends Metadata> UnboundMetadata<M> - apply(Class<? extends RelNode> relClass, - Class<? extends M> metadataClass); + <M extends Metadata> UnboundMetadata<M> apply( + Class<? extends RelNode> relClass, Class<? extends M> metadataClass); - <M extends Metadata> Multimap<Method, MetadataHandler<M>> - handlers(MetadataDef<M> def); + <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( + MetadataDef<M> def); } // End RelMetadataProvider.java http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java index b50cd8d..06c4fb0 100644 --- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java +++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMetadataQuery.java @@ -199,7 +199,7 @@ public class RelMetadataQuery { /** Re-generates the handler for a given kind of metadata, adding support for * {@code class_} if it is not already present. */ protected <M extends Metadata, H extends MetadataHandler<M>> H - revise(Class<? extends RelNode> class_, MetadataDef<M> def) { + revise(Class<? extends RelNode> class_, MetadataDef<M> def) { return metadataProvider.revise(class_, def); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java index 8de2c41..b4e1a08 100644 --- a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java +++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java @@ -310,7 +310,7 @@ public class RelToSqlConverter extends SqlImplementor // Target Table Name final SqlIdentifier sqlTargetTable = - new SqlIdentifier(modify.getTable().getQualifiedName(), POS); + new SqlIdentifier(modify.getTable().getQualifiedName(), POS); switch (modify.getOperation()) { case INSERT: { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java index c1680e2..665bccf 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/AbstractMaterializedViewRule.java @@ -2186,7 +2186,7 @@ public abstract class AbstractMaterializedViewRule extends RelOptRule { final Multimap<RexTableInputRef, RexTableInputRef> equiColumns = ArrayListMultimap.create(); - public Edge(RelTableRef source, RelTableRef target) { + Edge(RelTableRef source, RelTableRef target) { super(source, target); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java index 5794352..6544db0 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateJoinTransposeRule.java @@ -391,8 +391,8 @@ public class AggregateJoinTransposeRule extends RelOptRule { /** Creates a {@link org.apache.calcite.sql.SqlSplittableAggFunction.Registry} * that is a view of a list. */ - private static <E> SqlSplittableAggFunction.Registry<E> - registry(final List<E> list) { + private static <E> SqlSplittableAggFunction.Registry<E> registry( + final List<E> list) { return new SqlSplittableAggFunction.Registry<E>() { public int register(E e) { int i = list.indexOf(e); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java index 583aa5f..2d8a7e0 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateUnionTransposeRule.java @@ -56,7 +56,7 @@ public class AggregateUnionTransposeRule extends RelOptRule { LogicalUnion.class, RelFactories.LOGICAL_BUILDER); private static final Map<Class<? extends SqlAggFunction>, Boolean> - SUPPORTED_AGGREGATES = new IdentityHashMap<>(); + SUPPORTED_AGGREGATES = new IdentityHashMap<>(); static { SUPPORTED_AGGREGATES.put(SqlMinMaxAggFunction.class, true); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java b/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java index 5a19e56..f3b03a9 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcRelSplitter.java @@ -823,7 +823,7 @@ public abstract class CalcRelSplitter { private static class ImplementTester extends RexVisitorImpl<Void> { private final RelType relType; - public ImplementTester(RelType relType) { + ImplementTester(RelType relType) { super(false); this.relType = relType; } @@ -876,7 +876,7 @@ public abstract class CalcRelSplitter { private final int[] inputExprOrdinals; private final RexNode[] allExprs; - public InputToCommonExprConverter( + InputToCommonExprConverter( int[] exprInverseOrdinals, int[] exprLevels, int level, @@ -959,7 +959,7 @@ public abstract class CalcRelSplitter { private final int[] maxUsingLevelOrdinals; private int currentLevel; - public HighestUsageFinder(RexNode[] exprs, int[] exprLevels) { + HighestUsageFinder(RexNode[] exprs, int[] exprLevels) { super(true); this.maxUsingLevelOrdinals = new int[exprs.length]; Arrays.fill(maxUsingLevelOrdinals, -1); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java b/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java index 989be27..adfb14d 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/FilterRemoveIsNotDistinctFromRule.java @@ -87,7 +87,7 @@ public final class FilterRemoveIsNotDistinctFromRule extends RelOptRule { private class RemoveIsNotDistinctFromRexShuttle extends RexShuttle { RexBuilder rexBuilder; - public RemoveIsNotDistinctFromRexShuttle( + RemoveIsNotDistinctFromRexShuttle( RexBuilder rexBuilder) { this.rexBuilder = rexBuilder; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java index fe7fa8c..7d6c059 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinToMultiJoinRule.java @@ -544,7 +544,7 @@ public class JoinToMultiJoinRule extends RelOptRule { private class InputReferenceCounter extends RexVisitorImpl<Void> { private final int[] refCounts; - public InputReferenceCounter(int[] refCounts) { + InputReferenceCounter(int[] refCounts) { super(true); this.refCounts = refCounts; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java b/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java index 44c53bd..17a158e 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/LoptSemiJoinOptimizer.java @@ -824,7 +824,7 @@ public class LoptSemiJoinOptimizer { /** Dummy class to allow code to compile. */ private static class LcsIndexOptimizer { - public LcsIndexOptimizer(LcsTableScan rel) {} + LcsIndexOptimizer(LcsTableScan rel) {} public FemLocalIndex findSemiJoinIndexByCost(RelNode dimRel, List<Integer> actualLeftKeys, List<Integer> rightKeys, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java index 416a473..4c441e2 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/ProjectToWindowRule.java @@ -179,59 +179,61 @@ public abstract class ProjectToWindowRule extends RelOptRule { */ static class WindowedAggRelSplitter extends CalcRelSplitter { private static final RelType[] REL_TYPES = { - new RelType("CalcRelType") { - protected boolean canImplement(RexFieldAccess field) { - return true; - } + new RelType("CalcRelType") { + protected boolean canImplement(RexFieldAccess field) { + return true; + } - protected boolean canImplement(RexDynamicParam param) { - return true; - } + protected boolean canImplement(RexDynamicParam param) { + return true; + } - protected boolean canImplement(RexLiteral literal) { - return true; - } + protected boolean canImplement(RexLiteral literal) { + return true; + } - protected boolean canImplement(RexCall call) { - return !(call instanceof RexOver); - } + protected boolean canImplement(RexCall call) { + return !(call instanceof RexOver); + } - protected RelNode makeRel(RelOptCluster cluster, RelTraitSet traitSet, - RelBuilder relBuilder, RelNode input, RexProgram program) { - assert !program.containsAggs(); - program = program.normalize(cluster.getRexBuilder(), null); - return super.makeRel(cluster, traitSet, relBuilder, input, program); - } - }, - new RelType("WinAggRelType") { - protected boolean canImplement(RexFieldAccess field) { - return false; - } + protected RelNode makeRel(RelOptCluster cluster, + RelTraitSet traitSet, RelBuilder relBuilder, RelNode input, + RexProgram program) { + assert !program.containsAggs(); + program = program.normalize(cluster.getRexBuilder(), null); + return super.makeRel(cluster, traitSet, relBuilder, input, + program); + } + }, + new RelType("WinAggRelType") { + protected boolean canImplement(RexFieldAccess field) { + return false; + } - protected boolean canImplement(RexDynamicParam param) { - return false; - } + protected boolean canImplement(RexDynamicParam param) { + return false; + } - protected boolean canImplement(RexLiteral literal) { - return false; - } + protected boolean canImplement(RexLiteral literal) { + return false; + } - protected boolean canImplement(RexCall call) { - return call instanceof RexOver; - } + protected boolean canImplement(RexCall call) { + return call instanceof RexOver; + } - protected boolean supportsCondition() { - return false; - } + protected boolean supportsCondition() { + return false; + } - protected RelNode makeRel(RelOptCluster cluster, RelTraitSet traitSet, - RelBuilder relBuilder, RelNode input, RexProgram program) { - Preconditions.checkArgument(program.getCondition() == null, - "WindowedAggregateRel cannot accept a condition"); - return LogicalWindow.create(cluster, traitSet, relBuilder, input, - program); + protected RelNode makeRel(RelOptCluster cluster, RelTraitSet traitSet, + RelBuilder relBuilder, RelNode input, RexProgram program) { + Preconditions.checkArgument(program.getCondition() == null, + "WindowedAggregateRel cannot accept a condition"); + return LogicalWindow.create(cluster, traitSet, relBuilder, input, + program); + } } - } }; WindowedAggRelSplitter(Calc calc, RelBuilder relBuilder) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java index 2d239db..e822d31 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/PushProjector.java @@ -621,7 +621,7 @@ public class PushProjector { private final List<RexNode> preserveRight; private final Strong strong; - public InputSpecialOpFinder( + InputSpecialOpFinder( BitSet rexRefs, ImmutableBitSet leftFields, ImmutableBitSet rightFields, @@ -716,7 +716,7 @@ public class PushProjector { private final List<RexNode> preserveRight; private final int firstRightRef; - public RefAndExprConverter( + RefAndExprConverter( RexBuilder rexBuilder, List<RelDataTypeField> srcFields, List<RelDataTypeField> destFields, @@ -850,7 +850,7 @@ public class PushProjector { * * @param operatorSet Set of operators */ - public OperatorExprCondition(Iterable<? extends SqlOperator> operatorSet) { + OperatorExprCondition(Iterable<? extends SqlOperator> operatorSet) { this.operatorSet = ImmutableSet.copyOf(operatorSet); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java index f0f57a7..d1847c0 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/SubQueryRemoveRule.java @@ -402,7 +402,7 @@ public abstract class SubQueryRemoveRule extends RelOptRule { private final RexSubQuery subQuery; private final RexNode replacement; - public ReplaceSubQueryShuttle(RexSubQuery subQuery, RexNode replacement) { + ReplaceSubQueryShuttle(RexSubQuery subQuery, RexNode replacement) { this.subQuery = subQuery; this.replacement = replacement; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java index 1a1f130..ef89895 100644 --- a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java +++ b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeSystemImpl.java @@ -201,7 +201,7 @@ public abstract class RelDataTypeSystemImpl implements RelDataTypeSystem { @Override public int getNumTypeRadix(SqlTypeName typeName) { if (typeName.getFamily() == SqlTypeFamily.NUMERIC - && getDefaultPrecision(typeName) != -1) { + && getDefaultPrecision(typeName) != -1) { return 10; } return 0; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java b/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java index 427b550..fb83e70 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java +++ b/core/src/main/java/org/apache/calcite/rex/RexCallBinding.java @@ -138,7 +138,7 @@ public class RexCallBinding extends SqlOperatorBinding { private static class RexCastCallBinding extends RexCallBinding { private final RelDataType type; - public RexCastCallBinding( + RexCastCallBinding( RelDataTypeFactory typeFactory, SqlOperator sqlOperator, List<? extends RexNode> operands, RelDataType type, http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java b/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java index 5d8ef59..99f8e78 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java +++ b/core/src/main/java/org/apache/calcite/rex/RexExecutorImpl.java @@ -138,7 +138,7 @@ public class RexExecutorImpl implements RexExecutor { private final RelDataTypeFactory typeFactory; private final RelDataType rowType; - public DataContextInputGetter(RelDataType rowType, + DataContextInputGetter(RelDataType rowType, RelDataTypeFactory typeFactory) { this.rowType = rowType; this.typeFactory = typeFactory; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexOver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexOver.java b/core/src/main/java/org/apache/calcite/rex/RexOver.java index 38d1f9c..7be2af3 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexOver.java +++ b/core/src/main/java/org/apache/calcite/rex/RexOver.java @@ -177,7 +177,7 @@ public class RexOver extends RexCall { * and it can be re-used for multiple visits. */ private static class Finder extends RexVisitorImpl<Void> { - public Finder() { + Finder() { super(true); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexProgram.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexProgram.java b/core/src/main/java/org/apache/calcite/rex/RexProgram.java index b40b02f..2adcb0e 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexProgram.java +++ b/core/src/main/java/org/apache/calcite/rex/RexProgram.java @@ -807,7 +807,7 @@ public class RexProgram { * or null * @param litmus Whether to fail */ - public Checker(RelDataType inputRowType, + Checker(RelDataType inputRowType, List<RelDataType> internalExprTypeList, RelNode.Context context, Litmus litmus) { super(inputRowType, context, litmus); @@ -841,7 +841,7 @@ public class RexProgram { static class ExpansionShuttle extends RexShuttle { private final List<RexNode> exprs; - public ExpansionShuttle(List<RexNode> exprs) { + ExpansionShuttle(List<RexNode> exprs) { this.exprs = exprs; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java index afd24b2..aaea0c2 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java +++ b/core/src/main/java/org/apache/calcite/rex/RexProgramBuilder.java @@ -1013,7 +1013,7 @@ public class RexProgramBuilder { private class RegisterOutputShuttle extends RegisterShuttle { private final List<RexNode> localExprList; - public RegisterOutputShuttle(List<RexNode> localExprList) { + RegisterOutputShuttle(List<RexNode> localExprList) { super(); this.localExprList = localExprList; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/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 03d6051..b1e667e 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java +++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java @@ -2024,12 +2024,12 @@ public class RexUtil { public static Set<RelTableRef> gatherTableReferences(final List<RexNode> nodes) { final Set<RelTableRef> occurrences = new HashSet<>(); RexVisitor<Void> visitor = - new RexVisitorImpl<Void>(true) { - @Override public Void visitTableInputRef(RexTableInputRef ref) { - occurrences.add(ref.getTableRef()); - return super.visitTableInputRef(ref); - } - }; + new RexVisitorImpl<Void>(true) { + @Override public Void visitTableInputRef(RexTableInputRef ref) { + occurrences.add(ref.getTableRef()); + return super.visitTableInputRef(ref); + } + }; for (RexNode e : nodes) { e.accept(visitor); } @@ -2136,7 +2136,7 @@ public class RexUtil { private int limit = -1; private final RelDataType inputRowType; - public ForwardRefFinder(RelDataType inputRowType) { + ForwardRefFinder(RelDataType inputRowType) { super(true); this.inputRowType = inputRowType; } @@ -2442,7 +2442,7 @@ public class RexUtil { private static class RexShiftShuttle extends RexShuttle { private final int offset; - public RexShiftShuttle(int offset) { + RexShiftShuttle(int offset) { this.offset = offset; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java b/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java index 846f9dd..7db66d6 100644 --- a/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java +++ b/core/src/main/java/org/apache/calcite/rex/RexWindowBound.java @@ -91,7 +91,9 @@ public abstract class RexWindowBound { * * @return relative order or -1 when order is not known */ - public int getOrderKey() { return -1; } + public int getOrderKey() { + return -1; + } /** * Transforms the bound via {@link org.apache.calcite.rex.RexVisitor}. @@ -109,7 +111,7 @@ public abstract class RexWindowBound { private static class RexWindowBoundUnbounded extends RexWindowBound { private final SqlNode node; - public RexWindowBoundUnbounded(SqlNode node) { + RexWindowBoundUnbounded(SqlNode node) { this.node = node; } @@ -187,7 +189,7 @@ public abstract class RexWindowBound { private final SqlKind sqlKind; private final RexNode offset; - public RexWindowBoundBounded(RexNode node) { + RexWindowBoundBounded(RexNode node) { assert node instanceof RexCall : "RexWindowBoundBounded window bound should be either 'X preceding'" + " or 'X following' call. Actual type is " + node; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java b/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java index 261b41c..61956cf 100644 --- a/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java +++ b/core/src/main/java/org/apache/calcite/runtime/CalciteResource.java @@ -564,8 +564,7 @@ public interface CalciteResource { @BaseMessage("Execution of a new autocommit statement while a cursor is still open on same connection is not supported") @Property(name = "FeatureDefinition", value = "Eigenbase-defined") - ExInst<CalciteException> - sQLConformance_MultipleActiveAutocommitStatements(); + ExInst<CalciteException> sQLConformance_MultipleActiveAutocommitStatements(); @BaseMessage("Descending sort (ORDER BY DESC) not supported") @Property(name = "FeatureDefinition", value = "Eigenbase-defined") http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/Enumerables.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/Enumerables.java b/core/src/main/java/org/apache/calcite/runtime/Enumerables.java index 0eba4f1..5fbb268 100644 --- a/core/src/main/java/org/apache/calcite/runtime/Enumerables.java +++ b/core/src/main/java/org/apache/calcite/runtime/Enumerables.java @@ -61,8 +61,8 @@ public class Enumerables { /** Converts a supplier of an {@link Enumerable} over object arrays into a * supplier of an {@link Enumerable} over {@link Row} objects. */ - public static Supplier<Enumerable<Row>> - toRow(final Supplier<Enumerable<Object[]>> supplier) { + public static Supplier<Enumerable<Row>> toRow( + final Supplier<Enumerable<Object[]>> supplier) { return new Supplier<Enumerable<Row>>() { public Enumerable<Row> get() { return toRow(supplier.get()); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/FlatLists.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java index 73344c4..13c92ff 100644 --- a/core/src/main/java/org/apache/calcite/runtime/FlatLists.java +++ b/core/src/main/java/org/apache/calcite/runtime/FlatLists.java @@ -140,8 +140,8 @@ public class FlatLists { * @param t Array of members of list * @return List containing the given members */ - private static <T extends Object & Comparable> ComparableList<T> - flatList_(T[] t, boolean copy) { + private static <T extends Object & Comparable> ComparableList<T> flatList_( + T[] t, boolean copy) { switch (t.length) { case 0: //noinspection unchecked @@ -211,8 +211,8 @@ public class FlatLists { return of_(t); } - public static <T extends Comparable> ComparableList<T> - ofComparable(List<T> t) { + public static <T extends Comparable> ComparableList<T> ofComparable( + List<T> t) { return of_(t); } @@ -266,7 +266,9 @@ public class FlatLists { return ImmutableMap.<K, V>builder().putAll(map).put(k, v).build(); } - /** Base class for flat lists. */ + /** Base class for flat lists. + * + * @param <T> element type */ public abstract static class AbstractFlatList<T> extends AbstractImmutableList<T> implements RandomAccess { protected final List<T> toList() { @@ -1201,7 +1203,9 @@ public class FlatLists { } } - /** Empty list that implements the {@link Comparable} interface. */ + /** Empty list that implements the {@link Comparable} interface. + * + * @param <T> element type */ private static class ComparableEmptyList<T> extends AbstractList<T> implements ComparableList<T> { @@ -1237,12 +1241,16 @@ public class FlatLists { * {@link ClassCastException} at runtime when you call * {@link #compareTo(Object)} if the elements of the list do not implement * {@code Comparable}. + * + * @param <T> element type */ public interface ComparableList<T> extends List<T>, Comparable<List> { } /** Wrapper around a list that makes it implement the {@link Comparable} - * interface using lexical ordering. The elements must be comparable. */ + * interface using lexical ordering. The elements must be comparable. + * + * @param <T> element type */ static class ComparableListImpl<T extends Comparable<T>> extends AbstractList<T> implements ComparableList<T> { @@ -1264,8 +1272,7 @@ public class FlatLists { return compare(list, o); } - static <T extends Comparable<T>> - int compare(List<T> list0, List<T> list1) { + static <T extends Comparable<T>> int compare(List<T> list0, List<T> list1) { final int size0 = list0.size(); final int size1 = list1.size(); if (size1 == size0) { @@ -1278,8 +1285,8 @@ public class FlatLists { return size0 - size1; } - static <T extends Comparable<T>> - int compare(List<T> list0, List<T> list1, int size) { + static <T extends Comparable<T>> int compare(List<T> list0, List<T> list1, + int size) { for (int i = 0; i < size; i++) { Comparable o0 = list0.get(i); Comparable o1 = list1.get(i); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/Like.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/Like.java b/core/src/main/java/org/apache/calcite/runtime/Like.java index bdb6785..e55da9d 100644 --- a/core/src/main/java/org/apache/calcite/runtime/Like.java +++ b/core/src/main/java/org/apache/calcite/runtime/Like.java @@ -24,20 +24,20 @@ public class Like { private static final String JAVA_REGEX_SPECIALS = "[]()|^-+*?{}$\\."; private static final String SQL_SIMILAR_SPECIALS = "[]()|^-+*_%?{}"; private static final String [] REG_CHAR_CLASSES = { - "[:ALPHA:]", "\\p{Alpha}", - "[:alpha:]", "\\p{Alpha}", - "[:UPPER:]", "\\p{Upper}", - "[:upper:]", "\\p{Upper}", - "[:LOWER:]", "\\p{Lower}", - "[:lower:]", "\\p{Lower}", - "[:DIGIT:]", "\\d", - "[:digit:]", "\\d", - "[:SPACE:]", " ", - "[:space:]", " ", - "[:WHITESPACE:]", "\\s", - "[:whitespace:]", "\\s", - "[:ALNUM:]", "\\p{Alnum}", - "[:alnum:]", "\\p{Alnum}" + "[:ALPHA:]", "\\p{Alpha}", + "[:alpha:]", "\\p{Alpha}", + "[:UPPER:]", "\\p{Upper}", + "[:upper:]", "\\p{Upper}", + "[:LOWER:]", "\\p{Lower}", + "[:lower:]", "\\p{Lower}", + "[:DIGIT:]", "\\d", + "[:digit:]", "\\d", + "[:SPACE:]", " ", + "[:space:]", " ", + "[:WHITESPACE:]", "\\s", + "[:whitespace:]", "\\s", + "[:ALNUM:]", "\\p{Alnum}", + "[:alnum:]", "\\p{Alnum}" }; private Like() { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java b/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java index 766ef77..724bcf1 100644 --- a/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java +++ b/core/src/main/java/org/apache/calcite/runtime/ResultSetEnumerable.java @@ -50,8 +50,7 @@ public class ResultSetEnumerable<T> extends AbstractEnumerable<T> { private static final Logger LOGGER = LoggerFactory.getLogger( ResultSetEnumerable.class); - private static final Function1<ResultSet, Function0<Object>> - AUTO_ROW_BUILDER_FACTORY = + private static final Function1<ResultSet, Function0<Object>> AUTO_ROW_BUILDER_FACTORY = new Function1<ResultSet, Function0<Object>>() { public Function0<Object> apply(final ResultSet resultSet) { final ResultSetMetaData metaData; @@ -171,12 +170,14 @@ public class ResultSetEnumerable<T> extends AbstractEnumerable<T> { } /** Implementation of {@link Enumerator} that reads from a - * {@link ResultSet}. */ + * {@link ResultSet}. + * + * @param <T> element type */ private static class ResultSetEnumerator<T> implements Enumerator<T> { private final Function0<T> rowBuilder; private ResultSet resultSet; - public ResultSetEnumerator( + ResultSetEnumerator( ResultSet resultSet, Function1<ResultSet, Function0<T>> rowBuilderFactory) { this.resultSet = resultSet; @@ -225,7 +226,7 @@ public class ResultSetEnumerable<T> extends AbstractEnumerable<T> { } private static Function1<ResultSet, Function0<Object>> - primitiveRowBuilderFactory(final Primitive[] primitives) { + primitiveRowBuilderFactory(final Primitive[] primitives) { return new Function1<ResultSet, Function0<Object>>() { public Function0<Object> apply(final ResultSet resultSet) { final ResultSetMetaData metaData; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java index c52abfa..69c6154 100644 --- a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java +++ b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java @@ -72,16 +72,14 @@ public class SqlFunctions { private static final TimeZone LOCAL_TZ = TimeZone.getDefault(); - private static final Function1<List<Object>, Enumerable<Object>> - LIST_AS_ENUMERABLE = + private static final Function1<List<Object>, Enumerable<Object>> LIST_AS_ENUMERABLE = new Function1<List<Object>, Enumerable<Object>>() { public Enumerable<Object> apply(List<Object> list) { return Linq4j.asEnumerable(list); } }; - private static final Function1<Object[], Enumerable<Object[]>> - ARRAY_CARTESIAN_PRODUCT = + private static final Function1<Object[], Enumerable<Object[]>> ARRAY_CARTESIAN_PRODUCT = new Function1<Object[], Enumerable<Object[]>>() { public Enumerable<Object[]> apply(Object[] lists) { final List<Enumerator<Object>> enumerators = new ArrayList<>(); @@ -2005,8 +2003,8 @@ public class SqlFunctions { } } - public static Function1<Object, Enumerable<ComparableList<Comparable>>> - flatProduct(final int[] fieldCounts, final boolean withOrdinality, + public static Function1<Object, Enumerable<ComparableList<Comparable>>> flatProduct( + final int[] fieldCounts, final boolean withOrdinality, final FlatProductInputType[] inputTypes) { if (fieldCounts.length == 1) { if (!withOrdinality && inputTypes[0] == FlatProductInputType.SCALAR) { @@ -2029,8 +2027,8 @@ public class SqlFunctions { }; } - private static Enumerable<FlatLists.ComparableList<Comparable>> - p2(Object[] lists, int[] fieldCounts, boolean withOrdinality, + private static Enumerable<FlatLists.ComparableList<Comparable>> p2( + Object[] lists, int[] fieldCounts, boolean withOrdinality, FlatProductInputType[] inputTypes) { final List<Enumerator<List<Comparable>>> enumerators = new ArrayList<>(); int totalFieldCount = 0; @@ -2063,11 +2061,11 @@ public class SqlFunctions { Linq4j.enumerator(map.entrySet()); Enumerator<List<Comparable>> transformed = Linq4j.transform(enumerator, - new Function1<Entry<Comparable, Comparable>, List<Comparable>>() { - public List<Comparable> apply(Entry<Comparable, Comparable> entry) { - return FlatLists.<Comparable>of(entry.getKey(), entry.getValue()); - } - }); + new Function1<Entry<Comparable, Comparable>, List<Comparable>>() { + public List<Comparable> apply(Entry<Comparable, Comparable> e) { + return FlatLists.of(e.getKey(), e.getValue()); + } + }); enumerators.add(transformed); break; default: @@ -2091,9 +2089,8 @@ public class SqlFunctions { /** Similar to {@link Linq4j#product(Iterable)} but each resulting list * implements {@link FlatLists.ComparableList}. */ - public static <E extends Comparable> - Enumerable<FlatLists.ComparableList<E>> - product(final List<Enumerator<List<E>>> enumerators, final int fieldCount, + public static <E extends Comparable> Enumerable<FlatLists.ComparableList<E>> product( + final List<Enumerator<List<E>>> enumerators, final int fieldCount, final boolean withOrdinality) { return new AbstractEnumerable<FlatLists.ComparableList<E>>() { public Enumerator<FlatLists.ComparableList<E>> enumerator() { @@ -2187,7 +2184,9 @@ public class SqlFunctions { } /** Enumerates over the cartesian product of the given lists, returning - * a comparable list for each row. */ + * a comparable list for each row. + * + * @param <E> element type */ private static class ProductComparableListEnumerator<E extends Comparable> extends CartesianProductEnumerator<List<E>, FlatLists.ComparableList<E>> { final E[] flatElements; http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/schema/Schemas.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/schema/Schemas.java b/core/src/main/java/org/apache/calcite/schema/Schemas.java index bd671f9..edb833a 100644 --- a/core/src/main/java/org/apache/calcite/schema/Schemas.java +++ b/core/src/main/java/org/apache/calcite/schema/Schemas.java @@ -461,8 +461,8 @@ public final class Schemas { /** Returns the star tables defined in a schema. * * @param schema Schema */ - public static List<CalciteSchema.TableEntry> - getStarTables(CalciteSchema schema) { + public static List<CalciteSchema.TableEntry> getStarTables( + CalciteSchema schema) { final List<CalciteSchema.LatticeEntry> list = getLatticeEntries(schema); return Lists.transform(list, TO_TABLE_ENTRY); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/schema/TableFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/schema/TableFunction.java b/core/src/main/java/org/apache/calcite/schema/TableFunction.java index 96ef00b..e5402bb 100644 --- a/core/src/main/java/org/apache/calcite/schema/TableFunction.java +++ b/core/src/main/java/org/apache/calcite/schema/TableFunction.java @@ -40,7 +40,7 @@ public interface TableFunction extends Function { * @return row type of the table */ RelDataType getRowType(RelDataTypeFactory typeFactory, - List<Object> arguments); + List<Object> arguments); /** * Returns the row type of the table yielded by this function when http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java b/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java index 47a499e..b6432c7 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlDescribeSchema.java @@ -67,7 +67,9 @@ public class SqlDescribeSchema extends SqlCall { return ImmutableNullableList.<SqlNode>of(schema); } - public SqlIdentifier getSchema() { return schema; } + public SqlIdentifier getSchema() { + return schema; + } } // End SqlDescribeSchema.java http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java b/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java index 7360b8a..025bced 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlDescribeTable.java @@ -78,9 +78,13 @@ public class SqlDescribeTable extends SqlCall { return ImmutableNullableList.<SqlNode>of(table, column); } - public SqlIdentifier getTable() { return table; } + public SqlIdentifier getTable() { + return table; + } - public SqlIdentifier getColumn() { return column; } + public SqlIdentifier getColumn() { + return column; + } } // End SqlDescribeTable.java http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlDialect.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlDialect.java b/core/src/main/java/org/apache/calcite/sql/SqlDialect.java index 9eab2b7..306ed6e 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlDialect.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlDialect.java @@ -408,8 +408,8 @@ public class SqlDialect { } private static final char[] HEXITS = { - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', + '0', '1', '2', '3', '4', '5', '6', '7', + '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', }; /** http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlIntervalQualifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlIntervalQualifier.java b/core/src/main/java/org/apache/calcite/sql/SqlIntervalQualifier.java index 05c99ab..9e27f56 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlIntervalQualifier.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlIntervalQualifier.java @@ -413,7 +413,7 @@ public class SqlIntervalQualifier extends SqlNode { } private static final BigDecimal[] POWERS10 = { - ZERO, + ZERO, BigDecimal.valueOf(10), BigDecimal.valueOf(100), BigDecimal.valueOf(1000), http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlMatchRecognize.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlMatchRecognize.java b/core/src/main/java/org/apache/calcite/sql/SqlMatchRecognize.java index bb52e62..b797ef9 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlMatchRecognize.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlMatchRecognize.java @@ -336,7 +336,7 @@ public class SqlMatchRecognize extends SqlCall { writer.newlineAndIndent(); writer.sep("ORDER BY"); final SqlWriter.Frame orderFrame = - writer.startList(SqlWriter.FrameTypeEnum.ORDER_BY_LIST); + writer.startList(SqlWriter.FrameTypeEnum.ORDER_BY_LIST); unparseListClause(writer, pattern.orderList); writer.endList(orderFrame); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlSplittableAggFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlSplittableAggFunction.java b/core/src/main/java/org/apache/calcite/sql/SqlSplittableAggFunction.java index 78b400d..d776847 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlSplittableAggFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlSplittableAggFunction.java @@ -95,7 +95,9 @@ public interface SqlSplittableAggFunction { AggregateCall aggregateCall); /** Collection in which one can register an element. Registering may return - * a reference to an existing element. */ + * a reference to an existing element. + * + * @param <E> element type */ interface Registry<E> { int register(E e); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlUtil.java b/core/src/main/java/org/apache/calcite/sql/SqlUtil.java index 1018239..ae3f144 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlUtil.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlUtil.java @@ -383,9 +383,8 @@ public abstract class SqlUtil { return null; } - private static Iterator<SqlOperator> - filterOperatorRoutinesByKind(Iterator<SqlOperator> routines, - final SqlKind sqlKind) { + private static Iterator<SqlOperator> filterOperatorRoutinesByKind( + Iterator<SqlOperator> routines, final SqlKind sqlKind) { return Iterators.filter(routines, new PredicateImpl<SqlOperator>() { public boolean test(SqlOperator input) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/SqlWithItem.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/SqlWithItem.java b/core/src/main/java/org/apache/calcite/sql/SqlWithItem.java index 63692c7..680949f 100644 --- a/core/src/main/java/org/apache/calcite/sql/SqlWithItem.java +++ b/core/src/main/java/org/apache/calcite/sql/SqlWithItem.java @@ -76,7 +76,7 @@ public class SqlWithItem extends SqlCall { private static final SqlWithItemOperator INSTANCE = new SqlWithItemOperator(); - public SqlWithItemOperator() { + SqlWithItemOperator() { super("WITH_ITEM", SqlKind.WITH_ITEM, 0); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/advise/SqlAdvisorGetHintsFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/advise/SqlAdvisorGetHintsFunction.java b/core/src/main/java/org/apache/calcite/sql/advise/SqlAdvisorGetHintsFunction.java index ba0cef7..da8d28e 100644 --- a/core/src/main/java/org/apache/calcite/sql/advise/SqlAdvisorGetHintsFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/advise/SqlAdvisorGetHintsFunction.java @@ -62,14 +62,14 @@ public class SqlAdvisorGetHintsFunction SqlAdvisor.class, String.class, int.class); private static final CallImplementor IMPLEMENTOR = - RexImpTable.createImplementor( - new NotNullImplementor() { - public Expression implement(RexToLixTranslator translator, - RexCall call, List<Expression> operands) { - return Expressions.call(GET_COMPLETION_HINTS, - Iterables.concat(Collections.singleton(ADVISOR), operands)); - } - }, NullPolicy.ANY, false); + RexImpTable.createImplementor( + new NotNullImplementor() { + public Expression implement(RexToLixTranslator translator, + RexCall call, List<Expression> operands) { + return Expressions.call(GET_COMPLETION_HINTS, + Iterables.concat(Collections.singleton(ADVISOR), operands)); + } + }, NullPolicy.ANY, false); private static final List<FunctionParameter> PARAMETERS = ReflectiveFunctionBase.builder() @@ -109,7 +109,7 @@ public class SqlAdvisorGetHintsFunction final SqlAdvisor advisor, final String sql, final int pos) { final String[] replaced = {null}; final List<SqlMoniker> hints = advisor.getCompletionHints(sql, - pos, replaced); + pos, replaced); final List<SqlAdvisorHint> res = new ArrayList<>(hints.size() + 1); res.add(new SqlAdvisorHint(replaced[0], null, "MATCH")); for (SqlMoniker hint : hints) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlArgumentAssignmentOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlArgumentAssignmentOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlArgumentAssignmentOperator.java index 188d4aa..972b7e9 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlArgumentAssignmentOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlArgumentAssignmentOperator.java @@ -35,7 +35,7 @@ import org.apache.calcite.sql.type.ReturnTypes; * consistent with AS, we reverse the arguments. */ class SqlArgumentAssignmentOperator extends SqlAsOperator { - public SqlArgumentAssignmentOperator() { + SqlArgumentAssignmentOperator() { super("=>", SqlKind.ARGUMENT_ASSIGNMENT, 20, true, ReturnTypes.ARG0, InferTypes.RETURN_TYPE, OperandTypes.ANY_ANY); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlDefaultOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlDefaultOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlDefaultOperator.java index a0ab702..44decb3 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlDefaultOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlDefaultOperator.java @@ -33,7 +33,7 @@ import org.apache.calcite.sql.type.SqlTypeName; * has chance to resolve arguments. */ class SqlDefaultOperator extends SqlSpecialOperator { - public SqlDefaultOperator() { + SqlDefaultOperator() { super("DEFAULT", SqlKind.DEFAULT, 100, true, ReturnTypes.explicit(SqlTypeName.ANY), InferTypes.RETURN_TYPE, OperandTypes.NILADIC); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlExtendOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlExtendOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlExtendOperator.java index 6e0cfb7..7ef08a3 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlExtendOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlExtendOperator.java @@ -34,7 +34,7 @@ import org.apache.calcite.sql.SqlWriter; * achieve schema-on-query against other adapters. */ class SqlExtendOperator extends SqlInternalOperator { - public SqlExtendOperator() { + SqlExtendOperator() { super("EXTEND", SqlKind.EXTEND, MDX_PRECEDENCE); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupIdFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupIdFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupIdFunction.java index 7b61703..8f74d36 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupIdFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupIdFunction.java @@ -30,7 +30,7 @@ import org.apache.calcite.sql.type.ReturnTypes; * <p>Some examples are in {@code agg.iq}. */ class SqlGroupIdFunction extends SqlAbstractGroupFunction { - public SqlGroupIdFunction() { + SqlGroupIdFunction() { super("GROUP_ID", SqlKind.GROUP_ID, ReturnTypes.BIGINT, null, OperandTypes.NILADIC, SqlFunctionCategory.SYSTEM); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingFunction.java index 2559558..9abbd60 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingFunction.java @@ -30,7 +30,7 @@ import org.apache.calcite.sql.type.ReturnTypes; * <p>Some examples are in {@code agg.iq}. */ class SqlGroupingFunction extends SqlAbstractGroupFunction { - public SqlGroupingFunction(String name) { + SqlGroupingFunction(String name) { super(name, SqlKind.GROUPING, ReturnTypes.BIGINT, null, OperandTypes.ONE_OR_MORE, SqlFunctionCategory.SYSTEM); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingIdFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingIdFunction.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingIdFunction.java index ef5fe1d..78f79f3 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingIdFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlGroupingIdFunction.java @@ -34,7 +34,7 @@ import org.apache.calcite.sql.type.ReturnTypes; */ @Deprecated // to be removed before 2.0 class SqlGroupingIdFunction extends SqlAbstractGroupFunction { - public SqlGroupingIdFunction() { + SqlGroupingIdFunction() { //noinspection deprecation super("GROUPING_ID", SqlKind.GROUPING_ID, ReturnTypes.BIGINT, null, OperandTypes.ONE_OR_MORE, SqlFunctionCategory.SYSTEM); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java index 603057e..b9f029f 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlItemOperator.java @@ -47,7 +47,7 @@ class SqlItemOperator extends SqlSpecialOperator { OperandTypes.family(SqlTypeFamily.MAP), OperandTypes.family(SqlTypeFamily.ANY)); - public SqlItemOperator() { + SqlItemOperator() { super("ITEM", SqlKind.OTHER_FUNCTION, 100, true, null, null, null); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java index 0ca5e54..7386d3e 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlOverlapsOperator.java @@ -81,10 +81,10 @@ public class SqlOverlapsOperator extends SqlBinaryOperator { final String d = "DATETIME"; final String i = "INTERVAL"; String[] typeNames = { - d, d, - d, i, - i, d, - i, i + d, d, + d, i, + i, d, + i, i }; StringBuilder ret = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlRollupOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlRollupOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlRollupOperator.java index 6e3efc8..09dd97c 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlRollupOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlRollupOperator.java @@ -28,7 +28,7 @@ import org.apache.calcite.sql.SqlWriter; * {@code ROLLUP}, {@code GROUPING SETS}. */ class SqlRollupOperator extends SqlInternalOperator { - public SqlRollupOperator(String name, SqlKind kind) { + SqlRollupOperator(String name, SqlKind kind) { super(name, kind, 4); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java index a29c988..3f125bd 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlStdOperatorTable.java @@ -2204,8 +2204,8 @@ public class SqlStdOperatorTable extends ReflectiveSqlOperatorTable { * * <p>For example, converts {@code TUMBLE_START(rowtime, INTERVAL '1' HOUR))} * to {@code TUMBLE(rowtime, INTERVAL '1' HOUR))}. */ - public static List<Pair<SqlNode, AuxiliaryConverter>> - convertGroupToAuxiliaryCalls(SqlCall call) { + public static List<Pair<SqlNode, AuxiliaryConverter>> convertGroupToAuxiliaryCalls( + SqlCall call) { final SqlOperator op = call.getOperator(); if (op instanceof SqlGroupFunction && op.isGroup()) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java b/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java index 04d1a88..1c0ac32 100644 --- a/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java +++ b/core/src/main/java/org/apache/calcite/sql/type/BasicSqlType.java @@ -180,7 +180,7 @@ public class BasicSqlType extends AbstractSqlType { if (withDetail) { // -1 means there is no default value for precision if (typeName.allowsPrec() - && typeSystem.getDefaultPrecision(typeName) > -1) { + && typeSystem.getDefaultPrecision(typeName) > -1) { printPrecision = true; } if (typeName.getDefaultScale() > -1) { http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java b/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java index 75366d9..5ef22fb 100644 --- a/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java +++ b/core/src/main/java/org/apache/calcite/sql/type/OperandTypes.java @@ -367,8 +367,7 @@ public abstract class OperandTypes { * Operand type-checking strategy where operand types must allow ordered * comparisons. */ - public static final SqlOperandTypeChecker - COMPARABLE_ORDERED_COMPARABLE_ORDERED = + public static final SqlOperandTypeChecker COMPARABLE_ORDERED_COMPARABLE_ORDERED = new ComparableOperandTypeChecker(2, RelDataTypeComparability.ALL, SqlOperandTypeChecker.Consistency.COMPARE); @@ -385,8 +384,7 @@ public abstract class OperandTypes { * Operand type-checking strategy where operand types must allow unordered * comparisons. */ - public static final SqlOperandTypeChecker - COMPARABLE_UNORDERED_COMPARABLE_UNORDERED = + public static final SqlOperandTypeChecker COMPARABLE_UNORDERED_COMPARABLE_UNORDERED = new ComparableOperandTypeChecker(2, RelDataTypeComparability.UNORDERED, SqlOperandTypeChecker.Consistency.LEAST_RESTRICTIVE); @@ -407,8 +405,7 @@ public abstract class OperandTypes { public static final SqlSingleOperandTypeChecker STRING_STRING_INTEGER = family(SqlTypeFamily.STRING, SqlTypeFamily.STRING, SqlTypeFamily.INTEGER); - public static final SqlSingleOperandTypeChecker - STRING_STRING_INTEGER_INTEGER = + public static final SqlSingleOperandTypeChecker STRING_STRING_INTEGER_INTEGER = family(SqlTypeFamily.STRING, SqlTypeFamily.STRING, SqlTypeFamily.INTEGER, SqlTypeFamily.INTEGER); @@ -425,7 +422,8 @@ public abstract class OperandTypes { public static final SqlSingleOperandTypeChecker ANY_ANY = family(SqlTypeFamily.ANY, SqlTypeFamily.ANY); public static final SqlSingleOperandTypeChecker ANY_NUMERIC = - family(SqlTypeFamily.ANY, SqlTypeFamily.NUMERIC); + family(SqlTypeFamily.ANY, SqlTypeFamily.NUMERIC); + /** * Parameter type-checking strategy type must a nullable time interval, * nullable time interval @@ -446,8 +444,7 @@ public abstract class OperandTypes { family(SqlTypeFamily.DATETIME, SqlTypeFamily.DATETIME_INTERVAL, SqlTypeFamily.DATETIME_INTERVAL); - public static final SqlSingleOperandTypeChecker - DATETIME_INTERVAL_INTERVAL_TIME = + public static final SqlSingleOperandTypeChecker DATETIME_INTERVAL_INTERVAL_TIME = family(SqlTypeFamily.DATETIME, SqlTypeFamily.DATETIME_INTERVAL, SqlTypeFamily.DATETIME_INTERVAL, SqlTypeFamily.TIME); @@ -458,8 +455,7 @@ public abstract class OperandTypes { public static final SqlSingleOperandTypeChecker INTERVAL_DATETIME = family(SqlTypeFamily.DATETIME_INTERVAL, SqlTypeFamily.DATETIME); - public static final SqlSingleOperandTypeChecker - INTERVALINTERVAL_INTERVALDATETIME = + public static final SqlSingleOperandTypeChecker INTERVALINTERVAL_INTERVALDATETIME = OperandTypes.or(INTERVAL_SAME_SAME, INTERVAL_DATETIME); // TODO: datetime+interval checking missing http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java b/core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java index 715f59c..73e99f8 100644 --- a/core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java +++ b/core/src/main/java/org/apache/calcite/sql/type/ReturnTypes.java @@ -318,6 +318,7 @@ public abstract class ReturnTypes { new ExplicitOperatorBinding( opBinding, new AbstractList<RelDataType>() { + // CHECKSTYLE: IGNORE 12 public RelDataType get(int index) { RelDataType type = opBinding.getOperandType(index) @@ -329,7 +330,6 @@ public abstract class ReturnTypes { public int size() { return opBinding.getOperandCount(); } - // CHECKSTYLE: IGNORE 1 }); RelDataType biggestElementType = LEAST_RESTRICTIVE.inferReturnType(newBinding); @@ -647,8 +647,7 @@ public abstract class ReturnTypes { * {@link org.apache.calcite.sql.type.SqlTypeTransforms#TO_NULLABLE}, * {@link org.apache.calcite.sql.type.SqlTypeTransforms#TO_VARYING}. */ - public static final SqlReturnTypeInference - DYADIC_STRING_SUM_PRECISION_NULLABLE_VARYING = + public static final SqlReturnTypeInference DYADIC_STRING_SUM_PRECISION_NULLABLE_VARYING = cascade(DYADIC_STRING_SUM_PRECISION, SqlTypeTransforms.TO_NULLABLE, SqlTypeTransforms.TO_VARYING); @@ -656,8 +655,7 @@ public abstract class ReturnTypes { * Same as {@link #DYADIC_STRING_SUM_PRECISION} and using * {@link org.apache.calcite.sql.type.SqlTypeTransforms#TO_NULLABLE} */ - public static final SqlReturnTypeInference - DYADIC_STRING_SUM_PRECISION_NULLABLE = + public static final SqlReturnTypeInference DYADIC_STRING_SUM_PRECISION_NULLABLE = cascade(DYADIC_STRING_SUM_PRECISION, SqlTypeTransforms.TO_NULLABLE); /** http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/type/SqlOperandCountRanges.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/type/SqlOperandCountRanges.java b/core/src/main/java/org/apache/calcite/sql/type/SqlOperandCountRanges.java index 9018084..a99017b 100644 --- a/core/src/main/java/org/apache/calcite/sql/type/SqlOperandCountRanges.java +++ b/core/src/main/java/org/apache/calcite/sql/type/SqlOperandCountRanges.java @@ -45,7 +45,7 @@ public abstract class SqlOperandCountRanges { private final int min; private final int max; - public RangeImpl(int min, int max) { + RangeImpl(int min, int max) { this.min = min; this.max = max; Preconditions.checkArgument(min <= max || max == -1); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java b/core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java index b78e417..7599bb7 100644 --- a/core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java +++ b/core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java @@ -69,7 +69,7 @@ public class SqlTypeExplicitPrecedenceList * @see Glossary#SQL2003 SQL:2003 Part 2 Section 9.5 */ private static final Map<SqlTypeName, SqlTypeExplicitPrecedenceList> - TYPE_NAME_TO_PRECEDENCE_LIST = + TYPE_NAME_TO_PRECEDENCE_LIST = ImmutableMap.<SqlTypeName, SqlTypeExplicitPrecedenceList>builder() .put(SqlTypeName.BOOLEAN, list(SqlTypeName.BOOLEAN)) .put(SqlTypeName.TINYINT, numeric(SqlTypeName.TINYINT)) http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/util/SqlBasicVisitor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/util/SqlBasicVisitor.java b/core/src/main/java/org/apache/calcite/sql/util/SqlBasicVisitor.java index 53fd617..bb48bf8 100644 --- a/core/src/main/java/org/apache/calcite/sql/util/SqlBasicVisitor.java +++ b/core/src/main/java/org/apache/calcite/sql/util/SqlBasicVisitor.java @@ -72,7 +72,9 @@ public class SqlBasicVisitor<R> implements SqlVisitor<R> { //~ Inner Interfaces ------------------------------------------------------- - /** Argument handler. */ + /** Argument handler. + * + * @param <R> result type */ public interface ArgHandler<R> { /** Returns the result of visiting all children of a call to an operator, * then the call itself. @@ -95,6 +97,8 @@ public class SqlBasicVisitor<R> implements SqlVisitor<R> { /** * Default implementation of {@link ArgHandler} which merely calls * {@link SqlNode#accept} on each operand. + * + * @param <R> result type */ public static class ArgHandlerImpl<R> implements ArgHandler<R> { private static final ArgHandler INSTANCE = new ArgHandlerImpl(); http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java index 6e36703..b1b01d2 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java @@ -174,8 +174,8 @@ public abstract class DelegatingScope implements SqlValidatorScope { } @SuppressWarnings("deprecation") - public Pair<String, SqlValidatorNamespace> - findQualifyingTableName(String columnName, SqlNode ctx) { + public Pair<String, SqlValidatorNamespace> findQualifyingTableName( + String columnName, SqlNode ctx) { //noinspection deprecation return parent.findQualifyingTableName(columnName, ctx); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java b/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java index 0b90516..77922c7 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java @@ -198,8 +198,8 @@ class EmptyScope implements SqlValidatorScope { } @SuppressWarnings("deprecation") - public Pair<String, SqlValidatorNamespace> - findQualifyingTableName(String columnName, SqlNode ctx) { + public Pair<String, SqlValidatorNamespace> findQualifyingTableName( + String columnName, SqlNode ctx) { throw validator.newValidationError(ctx, RESOURCE.columnNotFound(columnName)); } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/validate/ParameterNamespace.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/validate/ParameterNamespace.java b/core/src/main/java/org/apache/calcite/sql/validate/ParameterNamespace.java index 5fb41cf..7ed1d4d 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/ParameterNamespace.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/ParameterNamespace.java @@ -31,7 +31,7 @@ class ParameterNamespace extends AbstractNamespace { //~ Constructors ----------------------------------------------------------- - public ParameterNamespace(SqlValidatorImpl validator, RelDataType type) { + ParameterNamespace(SqlValidatorImpl validator, RelDataType type) { super(validator, null); this.type = type; } http://git-wip-us.apache.org/repos/asf/calcite/blob/9ab47c00/core/src/main/java/org/apache/calcite/sql/validate/SqlUserDefinedTableFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlUserDefinedTableFunction.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlUserDefinedTableFunction.java index 1e6f300..d7e22f2 100644 --- a/core/src/main/java/org/apache/calcite/sql/validate/SqlUserDefinedTableFunction.java +++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlUserDefinedTableFunction.java @@ -67,8 +67,8 @@ public class SqlUserDefinedTableFunction extends SqlUserDefinedFunction { public RelDataType getRowType(RelDataTypeFactory typeFactory, List<SqlNode> operandList) { List<Object> arguments = - SqlUserDefinedTableMacro.convertArguments(typeFactory, operandList, - function, getNameAsId(), false); + SqlUserDefinedTableMacro.convertArguments(typeFactory, operandList, + function, getNameAsId(), false); return getFunction().getRowType(typeFactory, arguments); } @@ -84,8 +84,8 @@ public class SqlUserDefinedTableFunction extends SqlUserDefinedFunction { public Type getElementType(RelDataTypeFactory typeFactory, List<SqlNode> operandList) { List<Object> arguments = - SqlUserDefinedTableMacro.convertArguments(typeFactory, operandList, - function, getNameAsId(), false); + SqlUserDefinedTableMacro.convertArguments(typeFactory, operandList, + function, getNameAsId(), false); return getFunction().getElementType(arguments); } }
