From c34f38d61d6b8fc69f48e70f2feb6f225a5eca96 Mon Sep 17 00:00:00 2001 From: sunjincheng121 Date: Thu, 13 Apr 2017 18:01:40 +0800 Subject: [PATCH] [FLINK-6304][table]Clear a lot of useless import --- .../org/apache/flink/table/plan/nodes/CommonScan.scala | 1 - .../scala/org/apache/flink/table/plan/nodes/FlinkRel.scala | 6 +----- .../plan/rules/datastream/DataStreamAggregateRule.scala | 1 - .../plan/rules/datastream/DataStreamOverAggregateRule.scala | 3 --- .../plan/rules/datastream/StreamTableSourceScanRule.scala | 3 +-- .../DataSetSlideTimeWindowAggFlatMapFunction.scala | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala index 274b602e8384d..0a0d20441db37 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/CommonScan.scala @@ -20,7 +20,6 @@ package org.apache.flink.table.plan.nodes import org.apache.flink.api.common.functions.MapFunction import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.java.typeutils.RowTypeInfo import org.apache.flink.table.api.TableConfig import org.apache.flink.table.codegen.CodeGenerator import org.apache.flink.table.runtime.MapRunner diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala index 258d7f2af39c3..1aa084bd22d22 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/nodes/FlinkRel.scala @@ -22,11 +22,7 @@ import org.apache.calcite.rel.`type`.RelDataType import org.apache.calcite.rex._ import org.apache.calcite.sql.SqlAsOperator import org.apache.calcite.sql.`type`.SqlTypeName -import org.apache.flink.api.common.functions.MapFunction -import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.table.api.{TableConfig, TableException} -import org.apache.flink.table.codegen.CodeGenerator -import org.apache.flink.table.runtime.MapRunner +import org.apache.flink.table.api.TableException import scala.collection.JavaConversions._ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala index 09f05d71be3d7..052f738bea5a7 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamAggregateRule.scala @@ -22,7 +22,6 @@ import org.apache.calcite.plan.{Convention, RelOptRule, RelOptRuleCall, RelTrait import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.flink.table.api.TableException -import org.apache.flink.table.expressions.Alias import org.apache.flink.table.plan.logical.rel.LogicalWindowAggregate import org.apache.flink.table.plan.nodes.datastream.{DataStreamAggregate, DataStreamConvention} diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala index 214d68b071092..dc4675369fec2 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/DataStreamOverAggregateRule.scala @@ -23,12 +23,9 @@ import org.apache.calcite.plan.{Convention, RelOptRule, RelTraitSet} import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.logical.LogicalWindow -import org.apache.flink.table.calcite.FlinkRelBuilder.NamedWindowProperty import org.apache.flink.table.plan.nodes.datastream.DataStreamConvention import org.apache.flink.table.plan.nodes.datastream.DataStreamOverAggregate -import scala.collection.JavaConversions._ - /** * Rule to convert a LogicalWindow into a DataStreamOverAggregate. */ diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala index c6c7c59ad2af7..a6db08468d4ba 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/plan/rules/datastream/StreamTableSourceScanRule.scala @@ -23,8 +23,7 @@ import org.apache.calcite.rel.RelNode import org.apache.calcite.rel.convert.ConverterRule import org.apache.calcite.rel.core.TableScan import org.apache.calcite.rel.logical.LogicalTableScan -import org.apache.flink.table.plan.nodes.datastream. - {StreamTableSourceScan, DataStreamConvention} +import org.apache.flink.table.plan.nodes.datastream.{StreamTableSourceScan, DataStreamConvention} import org.apache.flink.table.plan.schema.TableSourceTable import org.apache.flink.table.sources.StreamTableSource diff --git a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala index 5f37b8a9306a4..d7b0cef7ee587 100644 --- a/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala +++ b/flink-libraries/flink-table/src/main/scala/org/apache/flink/table/runtime/aggregate/DataSetSlideTimeWindowAggFlatMapFunction.scala @@ -20,10 +20,9 @@ package org.apache.flink.table.runtime.aggregate import org.apache.flink.api.common.functions.RichFlatMapFunction import org.apache.flink.api.common.typeinfo.TypeInformation import org.apache.flink.api.java.typeutils.ResultTypeQueryable -import org.apache.flink.configuration.Configuration import org.apache.flink.streaming.api.windowing.windows.TimeWindow import org.apache.flink.types.Row -import org.apache.flink.util.{Collector, Preconditions} +import org.apache.flink.util.Collector /**