You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ta...@apache.org on 2017/06/16 04:34:37 UTC
[1/2] beam git commit: Remove unused BeamPipelineCreator class
Repository: beam
Updated Branches:
refs/heads/DSL_SQL 9bcae5326 -> abe0f1a0a
Remove unused BeamPipelineCreator class
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/51f54925
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/51f54925
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/51f54925
Branch: refs/heads/DSL_SQL
Commit: 51f549251bc54f112490014fa7ec5d41da7717d6
Parents: 9bcae53
Author: Tyler Akidau <ta...@apache.org>
Authored: Thu Jun 15 18:04:43 2017 -0700
Committer: Tyler Akidau <ta...@apache.org>
Committed: Thu Jun 15 19:55:12 2017 -0700
----------------------------------------------------------------------
.../dsls/sql/planner/BeamPipelineCreator.java | 58 --------------------
.../beam/dsls/sql/planner/BeamQueryPlanner.java | 1 -
.../apache/beam/dsls/sql/rel/BeamRelNode.java | 4 +-
3 files changed, 2 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/51f54925/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 38e039f..0000000
--- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamPipelineCreator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.beam.dsls.sql.planner;
-
-import java.util.Map;
-import org.apache.beam.dsls.sql.rel.BeamRelNode;
-import org.apache.beam.dsls.sql.schema.BaseBeamTable;
-import org.apache.beam.sdk.Pipeline;
-
-/**
- * {@link BeamPipelineCreator} converts a {@link BeamRelNode} tree, into a Beam
- * pipeline.
- *
- */
-class BeamPipelineCreator {
- private Map<String, BaseBeamTable> sourceTables;
-
- private Pipeline pipeline;
-
- private boolean hasPersistent = false;
-
- public BeamPipelineCreator(Map<String, BaseBeamTable> sourceTables, Pipeline basePipeline) {
- this.sourceTables = sourceTables;
- this.pipeline = basePipeline;
- }
-
- public Map<String, BaseBeamTable> getSourceTables() {
- return sourceTables;
- }
-
- public Pipeline getPipeline() {
- return pipeline;
- }
-
- public boolean hasPersistent() {
- return hasPersistent;
- }
-
- public void setHasPersistent(boolean hasPersistent) {
- this.hasPersistent = hasPersistent;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/beam/blob/51f54925/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java
----------------------------------------------------------------------
diff --git a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java
index 98580cb..ef71b53 100644
--- a/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java
+++ b/dsls/sql/src/main/java/org/apache/beam/dsls/sql/planner/BeamQueryPlanner.java
@@ -110,7 +110,6 @@ public class BeamQueryPlanner {
throws Exception {
BeamRelNode relNode = convertToBeamRel(sqlStatement);
- BeamPipelineCreator planCreator = new BeamPipelineCreator(sourceTables, basePipeline);
// the input PCollectionTuple is empty, and be rebuilt in BeamIOSourceRel.
return relNode.buildBeamPipeline(PCollectionTuple.empty(basePipeline));
}
http://git-wip-us.apache.org/repos/asf/beam/blob/51f54925/dsls/sql/src/main/java/org/apache/beam/dsls/sql/rel/BeamRelNode.java
----------------------------------------------------------------------
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 0233ccf..aed4b06 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
@@ -24,13 +24,13 @@ import org.apache.calcite.rel.RelNode;
/**
* A new method {@link #buildBeamPipeline(PCollectionTuple)} is added, it's
- * called by {@code BeamPipelineCreator}.
+ * called by {@code BeamQueryPlanner}.
*/
public interface BeamRelNode extends RelNode {
/**
* A {@link BeamRelNode} is a recursive structure, the
- * {@code BeamPipelineCreator} visits it with a DFS(Depth-First-Search)
+ * {@code BeamQueryPlanner} visits it with a DFS(Depth-First-Search)
* algorithm.
*/
PCollection<BeamSqlRow> buildBeamPipeline(PCollectionTuple inputPCollections) throws Exception;
[2/2] beam git commit: [BEAM-2454] This closes #3376
Posted by ta...@apache.org.
[BEAM-2454] This closes #3376
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/abe0f1a0
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/abe0f1a0
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/abe0f1a0
Branch: refs/heads/DSL_SQL
Commit: abe0f1a0a79a9e762eba2bfe976d004bd5e6ab44
Parents: 9bcae53 51f5492
Author: Tyler Akidau <ta...@apache.org>
Authored: Thu Jun 15 21:33:44 2017 -0700
Committer: Tyler Akidau <ta...@apache.org>
Committed: Thu Jun 15 21:33:44 2017 -0700
----------------------------------------------------------------------
.../dsls/sql/planner/BeamPipelineCreator.java | 58 --------------------
.../beam/dsls/sql/planner/BeamQueryPlanner.java | 1 -
.../apache/beam/dsls/sql/rel/BeamRelNode.java | 4 +-
3 files changed, 2 insertions(+), 61 deletions(-)
----------------------------------------------------------------------