Improvements on coding styles
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2182c07b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2182c07b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2182c07b Branch: refs/heads/master Commit: 2182c07b1ef01bb37d168572600a2f4fe7d39da3 Parents: fd4a009 Author: shaofengshi <shaofeng...@apache.org> Authored: Sun Jul 23 13:40:47 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sun Jul 23 13:42:15 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/query/relnode/OLAPAggregateRel.java | 4 ++-- .../java/org/apache/kylin/query/relnode/OLAPWindowRel.java | 2 -- .../org/apache/kylin/query/routing/RealizationChooser.java | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2182c07b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java index adb145a..b868267 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java @@ -84,8 +84,8 @@ public class OLAPAggregateRel extends Aggregate implements OLAPRel { AGGR_FUNC_MAP.put("MIN", "MIN"); Map<String, MeasureTypeFactory> udafFactories = MeasureTypeFactory.getUDAFFactories(); - for (String udaf : udafFactories.keySet()) { - AGGR_FUNC_MAP.put(udaf, udafFactories.get(udaf).getAggrFunctionName()); + for (Map.Entry<String, MeasureTypeFactory> entry : udafFactories.entrySet()) { + AGGR_FUNC_MAP.put(entry.getKey(), entry.getValue().getAggrFunctionName()); } Map<String, Class<?>> udafs = MeasureTypeFactory.getUDAFs(); http://git-wip-us.apache.org/repos/asf/kylin/blob/2182c07b/query/src/main/java/org/apache/kylin/query/relnode/OLAPWindowRel.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPWindowRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPWindowRel.java index c2ea4e2..6470504 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPWindowRel.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPWindowRel.java @@ -106,12 +106,10 @@ public class OLAPWindowRel extends Window implements OLAPRel { @Override public EnumerableRel implementEnumerable(List<EnumerableRel> inputs) { - ArrayList<RelNode> relInputs = new ArrayList<>(inputs.size()); for (EnumerableRel input : inputs) { if (input instanceof OLAPRel) { ((OLAPRel) input).replaceTraitSet(EnumerableConvention.INSTANCE); } - relInputs.add(input); } return EnumerableWindowBridge.createEnumerableWindow(getCluster(), traitSet, inputs.get(0), constants, rowType, groups); } http://git-wip-us.apache.org/repos/asf/kylin/blob/2182c07b/query/src/main/java/org/apache/kylin/query/routing/RealizationChooser.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/routing/RealizationChooser.java b/query/src/main/java/org/apache/kylin/query/routing/RealizationChooser.java index a598ee6..3431c45 100644 --- a/query/src/main/java/org/apache/kylin/query/routing/RealizationChooser.java +++ b/query/src/main/java/org/apache/kylin/query/routing/RealizationChooser.java @@ -66,12 +66,13 @@ public class RealizationChooser { throw new NoRealizationFoundException("No model found for" + toErrorMsg(context)); } - for (DataModelDesc model : modelMap.keySet()) { - Map<String, String> aliasMap = matches(model, context); + for (Map.Entry<DataModelDesc, Set<IRealization>> entry : modelMap.entrySet()) { + final DataModelDesc model = entry.getKey(); + final Map<String, String> aliasMap = matches(model, context); if (aliasMap != null) { fixModel(context, model, aliasMap); - IRealization realization = QueryRouter.selectRealization(context, modelMap.get(model)); + IRealization realization = QueryRouter.selectRealization(context, entry.getValue()); if (realization == null) { logger.info("Give up on model {} because no suitable realization is found", model); unfixModel(context);
