You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2020/08/19 21:29:24 UTC
[GitHub] [beam] pskevin opened a new pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
pskevin opened a new pull request #12635:
URL: https://github.com/apache/beam/pull/12635
All components of the xlang transform that aren't uniquely identified by topological ordering are now isolated into their respective namespaces.
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) and mention them in a comment (`R: @username`).
- [x] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/#make-reviewers-job-easier).
Post-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
Lang | SDK | Dataflow | Flink | Samza | Spark | Twister2
--- | --- | --- | --- | --- | --- | ---
Go | [](https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/) | ---
Java | [](https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/)
Python | [](https://ci-beam.apache.org/job/beam_PostCommit_Python2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python35/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python2_PVR_Flink_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python35_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/) | ---
XLang | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/) | ---
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
--- |Java | Python | Go | Website
--- | --- | --- | --- | ---
Non-portable | [](https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/lastCompletedBuild/) <br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/)
Portable | --- | [](https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/) | --- | ---
See [.test-infra/jenkins/README](https://github.com/apache/beam/blob/master/.test-infra/jenkins/README.md) for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck commented on a change in pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
lostluck commented on a change in pull request #12635:
URL: https://github.com/apache/beam/pull/12635#discussion_r473413110
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
Review comment:
Slices are always passed by reference, so this is overwriting the coder lists in the extracted coder. You would need to create a n new slice, and append values to that and *then* overwrite the existing one in coder.
updatedComponentCoderIDs := append(nil, coder.ComponentCoderIds...)
That should create a new slice with the same elements.
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
Review comment:
Should this assignment be outside the loop?
This is saying after each element in coder.ComponentCoderIds, reset the ComponentCoderIds to this new updated version.
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
+ }
+ }
+
+ idMap[cid] = newID(cid)
+
+ // Updating Coders map
+ c.Coders[idMap[cid]] = coder
+ delete(c.Coders, cid)
+
+ return idMap[cid]
+}
+
+func AddWindowingStrategyID(c *pipepb.Components, idMap map[string]string, wid string, newID func(string) string) string {
+ if _, exists := idMap[wid]; exists {
+ return idMap[wid]
+ }
+
+ windowingStrategy, exists := c.WindowingStrategies[wid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", wid, c.WindowingStrategies))
+ }
+
+ // Updating WindowCoderID of WindowingStrategy
+ if windowingStrategy.WindowCoderId != "" {
+ windowingStrategy.WindowCoderId = AddCoderID(c, idMap, windowingStrategy.WindowCoderId, newID)
+ }
+
+ // Updating EnvironmentId of WindowingStrategy
+ if windowingStrategy.EnvironmentId != "" {
+ windowingStrategy.EnvironmentId = AddEnvironmentID(c, idMap, windowingStrategy.EnvironmentId, newID)
+ }
+
+ idMap[wid] = newID(wid)
+
+ // Updating WindowingStrategies map
+ c.WindowingStrategies[idMap[wid]] = windowingStrategy
+ delete(c.WindowingStrategies, wid)
+
+ return idMap[wid]
+}
+
+func AddEnvironmentID(c *pipepb.Components, idMap map[string]string, eid string, newID func(string) string) string {
+ if _, exists := idMap[eid]; exists {
+ return idMap[eid]
+ }
+
+ environment, exists := c.Environments[eid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", eid, c.Environments))
+ }
+
+ idMap[eid] = newID(eid)
+
+ // Updating Environments map
+ c.Environments[idMap[eid]] = environment
+ delete(c.Environments, eid)
+
+ return idMap[eid]
+}
+
+func AddNamespace(t *pipepb.PTransform, c *pipepb.Components, namespace string) {
+ newID := func(id string) string {
+ return fmt.Sprintf("%v@%v", id, namespace)
+ }
+
+ idMap := make(map[string]string)
+
+ updateCoderID := func(cid string) string {
+ return AddCoderID(c, idMap, cid, newID)
+ }
+
+ updateWindowingStrategyID := func(wid string) string {
+ return AddWindowingStrategyID(c, idMap, wid, newID)
+ }
+
+ updateEnvironmentID := func(eid string) string {
+ return AddEnvironmentID(c, idMap, eid, newID)
+ }
+
+ // Update Environment ID of PTransform
+ if t.EnvironmentId != "" {
+ t.EnvironmentId = updateEnvironmentID(t.EnvironmentId)
+ }
+ fmt.Println(t)
Review comment:
leftover Debug printout
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
+ }
+ }
+
+ idMap[cid] = newID(cid)
+
+ // Updating Coders map
+ c.Coders[idMap[cid]] = coder
+ delete(c.Coders, cid)
+
+ return idMap[cid]
+}
+
+func AddWindowingStrategyID(c *pipepb.Components, idMap map[string]string, wid string, newID func(string) string) string {
+ if _, exists := idMap[wid]; exists {
+ return idMap[wid]
+ }
+
+ windowingStrategy, exists := c.WindowingStrategies[wid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", wid, c.WindowingStrategies))
+ }
+
+ // Updating WindowCoderID of WindowingStrategy
+ if windowingStrategy.WindowCoderId != "" {
+ windowingStrategy.WindowCoderId = AddCoderID(c, idMap, windowingStrategy.WindowCoderId, newID)
+ }
+
+ // Updating EnvironmentId of WindowingStrategy
+ if windowingStrategy.EnvironmentId != "" {
+ windowingStrategy.EnvironmentId = AddEnvironmentID(c, idMap, windowingStrategy.EnvironmentId, newID)
+ }
+
+ idMap[wid] = newID(wid)
+
+ // Updating WindowingStrategies map
+ c.WindowingStrategies[idMap[wid]] = windowingStrategy
+ delete(c.WindowingStrategies, wid)
+
+ return idMap[wid]
+}
+
+func AddEnvironmentID(c *pipepb.Components, idMap map[string]string, eid string, newID func(string) string) string {
+ if _, exists := idMap[eid]; exists {
+ return idMap[eid]
+ }
+
+ environment, exists := c.Environments[eid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", eid, c.Environments))
+ }
+
+ idMap[eid] = newID(eid)
+
+ // Updating Environments map
+ c.Environments[idMap[eid]] = environment
+ delete(c.Environments, eid)
+
+ return idMap[eid]
+}
+
+func AddNamespace(t *pipepb.PTransform, c *pipepb.Components, namespace string) {
+ newID := func(id string) string {
+ return fmt.Sprintf("%v@%v", id, namespace)
+ }
+
+ idMap := make(map[string]string)
+
+ updateCoderID := func(cid string) string {
+ return AddCoderID(c, idMap, cid, newID)
+ }
+
+ updateWindowingStrategyID := func(wid string) string {
+ return AddWindowingStrategyID(c, idMap, wid, newID)
+ }
+
+ updateEnvironmentID := func(eid string) string {
+ return AddEnvironmentID(c, idMap, eid, newID)
+ }
Review comment:
Remove these helpers, and call the functions directly in the loop below please. They're only used once each, and you do not modify any of their parameters, making the closures less useful, and harder to read.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pskevin commented on pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
pskevin commented on pull request #12635:
URL: https://github.com/apache/beam/pull/12635#issuecomment-676721855
CC: @chamikaramj
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pskevin commented on a change in pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
pskevin commented on a change in pull request #12635:
URL: https://github.com/apache/beam/pull/12635#discussion_r473436448
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
Review comment:
Ack. Updated!
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
Review comment:
Ack. Updated!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pskevin commented on pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
pskevin commented on pull request #12635:
URL: https://github.com/apache/beam/pull/12635#issuecomment-676721794
R: @lostluck
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pskevin commented on a change in pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
pskevin commented on a change in pull request #12635:
URL: https://github.com/apache/beam/pull/12635#discussion_r473436707
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
+ }
+ }
+
+ idMap[cid] = newID(cid)
+
+ // Updating Coders map
+ c.Coders[idMap[cid]] = coder
+ delete(c.Coders, cid)
+
+ return idMap[cid]
+}
+
+func AddWindowingStrategyID(c *pipepb.Components, idMap map[string]string, wid string, newID func(string) string) string {
+ if _, exists := idMap[wid]; exists {
+ return idMap[wid]
+ }
+
+ windowingStrategy, exists := c.WindowingStrategies[wid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", wid, c.WindowingStrategies))
+ }
+
+ // Updating WindowCoderID of WindowingStrategy
+ if windowingStrategy.WindowCoderId != "" {
+ windowingStrategy.WindowCoderId = AddCoderID(c, idMap, windowingStrategy.WindowCoderId, newID)
+ }
+
+ // Updating EnvironmentId of WindowingStrategy
+ if windowingStrategy.EnvironmentId != "" {
+ windowingStrategy.EnvironmentId = AddEnvironmentID(c, idMap, windowingStrategy.EnvironmentId, newID)
+ }
+
+ idMap[wid] = newID(wid)
+
+ // Updating WindowingStrategies map
+ c.WindowingStrategies[idMap[wid]] = windowingStrategy
+ delete(c.WindowingStrategies, wid)
+
+ return idMap[wid]
+}
+
+func AddEnvironmentID(c *pipepb.Components, idMap map[string]string, eid string, newID func(string) string) string {
+ if _, exists := idMap[eid]; exists {
+ return idMap[eid]
+ }
+
+ environment, exists := c.Environments[eid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", eid, c.Environments))
+ }
+
+ idMap[eid] = newID(eid)
+
+ // Updating Environments map
+ c.Environments[idMap[eid]] = environment
+ delete(c.Environments, eid)
+
+ return idMap[eid]
+}
+
+func AddNamespace(t *pipepb.PTransform, c *pipepb.Components, namespace string) {
+ newID := func(id string) string {
+ return fmt.Sprintf("%v@%v", id, namespace)
+ }
+
+ idMap := make(map[string]string)
+
+ updateCoderID := func(cid string) string {
+ return AddCoderID(c, idMap, cid, newID)
+ }
+
+ updateWindowingStrategyID := func(wid string) string {
+ return AddWindowingStrategyID(c, idMap, wid, newID)
+ }
+
+ updateEnvironmentID := func(eid string) string {
+ return AddEnvironmentID(c, idMap, eid, newID)
+ }
+
+ // Update Environment ID of PTransform
+ if t.EnvironmentId != "" {
+ t.EnvironmentId = updateEnvironmentID(t.EnvironmentId)
+ }
+ fmt.Println(t)
Review comment:
Sorry about that. Removed it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pskevin commented on a change in pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
pskevin commented on a change in pull request #12635:
URL: https://github.com/apache/beam/pull/12635#discussion_r473436935
##########
File path: sdks/go/pkg/beam/core/runtime/xlangx/namespace.go
##########
@@ -0,0 +1,136 @@
+// 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 xlangx
+
+import (
+ "fmt"
+
+ "github.com/apache/beam/sdks/go/pkg/beam/internal/errors"
+ pipepb "github.com/apache/beam/sdks/go/pkg/beam/model/pipeline_v1"
+)
+
+func AddCoderID(c *pipepb.Components, idMap map[string]string, cid string, newID func(string) string) string {
+ if _, exists := idMap[cid]; exists {
+ return idMap[cid]
+ }
+
+ coder, exists := c.Coders[cid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing coder id: %v not in %v", cid, c.Coders))
+ }
+
+ // Updating ComponentCoderIDs of Coder
+ if coder.GetComponentCoderIds() != nil {
+ updatedComponentCoderIDs := coder.ComponentCoderIds // Pass by value
+ for i, ccid := range coder.ComponentCoderIds {
+ updatedComponentCoderIDs[i] = AddCoderID(c, idMap, ccid, newID)
+ coder.ComponentCoderIds = updatedComponentCoderIDs
+ }
+ }
+
+ idMap[cid] = newID(cid)
+
+ // Updating Coders map
+ c.Coders[idMap[cid]] = coder
+ delete(c.Coders, cid)
+
+ return idMap[cid]
+}
+
+func AddWindowingStrategyID(c *pipepb.Components, idMap map[string]string, wid string, newID func(string) string) string {
+ if _, exists := idMap[wid]; exists {
+ return idMap[wid]
+ }
+
+ windowingStrategy, exists := c.WindowingStrategies[wid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", wid, c.WindowingStrategies))
+ }
+
+ // Updating WindowCoderID of WindowingStrategy
+ if windowingStrategy.WindowCoderId != "" {
+ windowingStrategy.WindowCoderId = AddCoderID(c, idMap, windowingStrategy.WindowCoderId, newID)
+ }
+
+ // Updating EnvironmentId of WindowingStrategy
+ if windowingStrategy.EnvironmentId != "" {
+ windowingStrategy.EnvironmentId = AddEnvironmentID(c, idMap, windowingStrategy.EnvironmentId, newID)
+ }
+
+ idMap[wid] = newID(wid)
+
+ // Updating WindowingStrategies map
+ c.WindowingStrategies[idMap[wid]] = windowingStrategy
+ delete(c.WindowingStrategies, wid)
+
+ return idMap[wid]
+}
+
+func AddEnvironmentID(c *pipepb.Components, idMap map[string]string, eid string, newID func(string) string) string {
+ if _, exists := idMap[eid]; exists {
+ return idMap[eid]
+ }
+
+ environment, exists := c.Environments[eid]
+ if !exists {
+ panic(errors.Errorf("attempted to add namespace to missing windowing strategy id: %v not in %v", eid, c.Environments))
+ }
+
+ idMap[eid] = newID(eid)
+
+ // Updating Environments map
+ c.Environments[idMap[eid]] = environment
+ delete(c.Environments, eid)
+
+ return idMap[eid]
+}
+
+func AddNamespace(t *pipepb.PTransform, c *pipepb.Components, namespace string) {
+ newID := func(id string) string {
+ return fmt.Sprintf("%v@%v", id, namespace)
+ }
+
+ idMap := make(map[string]string)
+
+ updateCoderID := func(cid string) string {
+ return AddCoderID(c, idMap, cid, newID)
+ }
+
+ updateWindowingStrategyID := func(wid string) string {
+ return AddWindowingStrategyID(c, idMap, wid, newID)
+ }
+
+ updateEnvironmentID := func(eid string) string {
+ return AddEnvironmentID(c, idMap, eid, newID)
+ }
Review comment:
Makes sense. Removed it!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] lostluck merged pull request #12635: [BEAM-9919] Isolating xlang transforms by namespace
Posted by GitBox <gi...@apache.org>.
lostluck merged pull request #12635:
URL: https://github.com/apache/beam/pull/12635
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org