From fc5906e1e56c323ce520f93e08a024f65b2e4021 Mon Sep 17 00:00:00 2001 From: James Xu Date: Thu, 15 Jun 2017 10:30:47 +0800 Subject: [PATCH] [BEAM-2440] BeamSql: reduce visibility --- .../org/apache/beam/dsls/sql/example/BeamSqlExample.java | 2 +- .../apache/beam/dsls/sql/planner/BeamPipelineCreator.java | 2 +- .../beam/dsls/sql/planner/UnsupportedOperatorsVisitor.java | 2 +- .../org/apache/beam/dsls/sql/rel/BeamAggregationRel.java | 1 - .../java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java | 1 - .../java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java | 1 - .../java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java | 1 - .../java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java | 2 -- .../main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java | 5 ++--- .../org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java | 1 - .../main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java | 1 - .../beam/dsls/sql/{planner => rel}/BeamSqlRelUtils.java | 5 ++--- .../java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java | 1 - 13 files changed, 7 insertions(+), 18 deletions(-) rename dsls/sql/src/main/java/org/apache/beam/dsls/sql/{planner => rel}/BeamSqlRelUtils.java (95%) diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java index 8ba785bedf36..6bb1617a9ae8 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/example/BeamSqlExample.java @@ -39,7 +39,7 @@ * This is a quick example, which uses Beam SQL DSL to create a data pipeline. * */ -public class BeamSqlExample { +class BeamSqlExample { private static final Logger LOG = LoggerFactory.getLogger(BeamSqlExample.class); public static void main(String[] args) throws Exception { diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java index abdc66cb11db..38e039f2e06d 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java @@ -27,7 +27,7 @@ * pipeline. * */ -public class BeamPipelineCreator { +class BeamPipelineCreator { private Map sourceTables; private Pipeline pipeline; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/UnsupportedOperatorsVisitor.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/UnsupportedOperatorsVisitor.java index 9dfa21d8ca51..4a710248bbdb 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/UnsupportedOperatorsVisitor.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/UnsupportedOperatorsVisitor.java @@ -23,6 +23,6 @@ * Unsupported operation to visit a RelNode. * */ -public class UnsupportedOperatorsVisitor extends SqlShuttle { +class UnsupportedOperatorsVisitor extends SqlShuttle { } diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java index 828dceccd822..595563df5578 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamAggregationRel.java @@ -19,7 +19,6 @@ import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRecordType; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java index dc13646b6791..40fe05c5b8e4 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamFilterRel.java @@ -19,7 +19,6 @@ import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutor; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; import org.apache.beam.dsls.sql.transform.BeamSqlFilterFn; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java index 76a7cb84f7e0..88fff637de0b 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSinkRel.java @@ -20,7 +20,6 @@ import com.google.common.base.Joiner; import java.util.List; import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BaseBeamTable; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java index 3fdeb28ff224..ed2bf1220905 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamIOSourceRel.java @@ -19,7 +19,6 @@ import com.google.common.base.Joiner; import org.apache.beam.dsls.sql.BeamSqlEnv; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BaseBeamTable; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java index 937a83448e34..e6331c6fc7f8 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamProjectRel.java @@ -18,10 +18,8 @@ package org.apache.beam.dsls.sql.rel; import java.util.List; - import org.apache.beam.dsls.sql.interpreter.BeamSqlExpressionExecutor; import org.apache.beam.dsls.sql.interpreter.BeamSqlFnExecutor; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; import org.apache.beam.dsls.sql.transform.BeamSqlProjectFn; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java index 80d1f3916350..0233ccffe41b 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java @@ -17,7 +17,6 @@ */ package org.apache.beam.dsls.sql.rel; -import org.apache.beam.dsls.sql.planner.BeamPipelineCreator; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; @@ -25,13 +24,13 @@ /** * A new method {@link #buildBeamPipeline(PCollectionTuple)} is added, it's - * called by {@link BeamPipelineCreator}. + * called by {@code BeamPipelineCreator}. */ public interface BeamRelNode extends RelNode { /** * A {@link BeamRelNode} is a recursive structure, the - * {@link BeamPipelineCreator} visits it with a DFS(Depth-First-Search) + * {@code BeamPipelineCreator} visits it with a DFS(Depth-First-Search) * algorithm. */ PCollection buildBeamPipeline(PCollectionTuple inputPCollections) throws Exception; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java index 271e98f5f251..3d41e3ad4417 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSetOperatorRelBase.java @@ -21,7 +21,6 @@ import java.io.Serializable; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.transform.BeamSetOperatorsTransforms; import org.apache.beam.sdk.transforms.MapElements; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java index 7632e6a86031..6c7be0b3d65b 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSortRel.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder; import org.apache.beam.dsls.sql.utils.CalciteUtils; diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamSqlRelUtils.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java similarity index 95% rename from dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamSqlRelUtils.java rename to dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java index d9b6e1726345..9f1f7030e272 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamSqlRelUtils.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamSqlRelUtils.java @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.dsls.sql.planner; +package org.apache.beam.dsls.sql.rel; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.beam.dsls.sql.rel.BeamRelNode; import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.plan.volcano.RelSubset; import org.apache.calcite.rel.RelNode; @@ -30,7 +29,7 @@ /** * Utilities for {@code BeamRelNode}. */ -public class BeamSqlRelUtils { +class BeamSqlRelUtils { private static final Logger LOG = LoggerFactory.getLogger(BeamSqlRelUtils.class); private static final AtomicInteger sequence = new AtomicInteger(0); diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java index 61d9713f9bd2..ce7576817984 100644 --- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java +++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamValuesRel.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.beam.dsls.sql.planner.BeamSqlRelUtils; import org.apache.beam.dsls.sql.schema.BeamSqlRecordType; import org.apache.beam.dsls.sql.schema.BeamSqlRow; import org.apache.beam.dsls.sql.schema.BeamSqlRowCoder;