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/05/14 17:15:17 UTC
[GitHub] [beam] robertwb opened a new pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
robertwb opened a new pull request #11708:
URL: https://github.com/apache/beam/pull/11708
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) and mention them in a comment (`R: @username`).
- [ ] 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 | Apex | Dataflow | Flink | Gearpump | Samza | Spark
--- | --- | --- | --- | --- | --- | --- | ---
Go | [](https://builds.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/) | --- | --- | [](https://builds.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/) | --- | --- | [](https://builds.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/)
Java | [](https://builds.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Apex/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Gearpump/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/)
Python | [](https://builds.apache.org/job/beam_PostCommit_Python2/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Python35/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/) | --- | [](https://builds.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PreCommit_Python2_PVR_Flink_Cron/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PostCommit_Python35_VR_Flink/lastCompletedBuild/) | --- | --- | [](https://builds.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/)
XLang | --- | --- | --- | [](https://builds.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/) | --- | --- | [](https://builds.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/)
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
--- |Java | Python | Go | Website
--- | --- | --- | --- | ---
Non-portable | [](https://builds.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/)<br>[](https://builds.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/)
Portable | --- | [](https://builds.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.
----------------------------------------------------------------
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] ibzib commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
ibzib commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425468106
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
Review comment:
That's what I get for only reading half the PR...
----------------------------------------------------------------
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] robertwb commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425462830
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
+
+ public static final String SCHEMA = "classpath";
+ private static final String PREFIX = SCHEMA + "://";
+
+ ClassLoaderFileSystem() {}
+
+ @Override
+ protected List<MatchResult> match(List<String> specs) throws IOException {
+ throw new UnsupportedOperationException("Un-globable filesystem.");
+ }
+
+ @Override
+ protected WritableByteChannel create(
+ ClassLoaderResourceId resourceId, CreateOptions createOptions) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ReadableByteChannel open(ClassLoaderResourceId resourceId) throws IOException {
+ ClassLoader classLoader = getClass().getClassLoader();
+ InputStream inputStream =
+ classLoader.getResourceAsStream(resourceId.path.substring(PREFIX.length()));
+ if (inputStream == null) {
+ throw new IOException("Unable to load " + resourceId.path + " with " + classLoader);
+ }
+ return Channels.newChannel(inputStream);
+ }
+
+ @Override
+ protected void copy(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void rename(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void delete(Collection<ClassLoaderResourceId> resourceIds) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ClassLoaderResourceId matchNewResource(String path, boolean isDirectory) {
+ return new ClassLoaderResourceId(path);
+ }
+
+ @Override
+ protected String getScheme() {
+ return SCHEMA;
+ }
+
+ public static class ClassLoaderResourceId implements ResourceId {
+
+ private final String path;
+
+ private ClassLoaderResourceId(String path) {
+ checkArgument(path.startsWith(PREFIX), path);
+ this.path = path;
+ }
+
+ @Override
+ public ResourceId resolve(String other, ResolveOptions resolveOptions) {
Review comment:
The documentation is in the super classes, but I added a test.
----------------------------------------------------------------
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] ibzib commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
ibzib commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r426075525
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -288,6 +289,9 @@ def close(self):
self._zipfile_handle.close()
def file_writer(self, path):
+ # type: (str) -> Tuple[BinaryIO, str]
+ """Given a relative path, returns an open handle that can be written to
+ and an reference that can later be used to read this file."""
Review comment:
```suggestion
and a reference that can later be used to read this file."""
```
----------------------------------------------------------------
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] ibzib commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
ibzib commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425987361
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
+
+ public static final String SCHEMA = "classpath";
+ private static final String PREFIX = SCHEMA + "://";
+
+ ClassLoaderFileSystem() {}
+
+ @Override
+ protected List<MatchResult> match(List<String> specs) throws IOException {
+ throw new UnsupportedOperationException("Un-globable filesystem.");
+ }
+
+ @Override
+ protected WritableByteChannel create(
+ ClassLoaderResourceId resourceId, CreateOptions createOptions) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ReadableByteChannel open(ClassLoaderResourceId resourceId) throws IOException {
+ ClassLoader classLoader = getClass().getClassLoader();
+ InputStream inputStream =
+ classLoader.getResourceAsStream(resourceId.path.substring(PREFIX.length()));
+ if (inputStream == null) {
+ throw new IOException("Unable to load " + resourceId.path + " with " + classLoader);
+ }
+ return Channels.newChannel(inputStream);
+ }
+
+ @Override
+ protected void copy(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void rename(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void delete(Collection<ClassLoaderResourceId> resourceIds) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ClassLoaderResourceId matchNewResource(String path, boolean isDirectory) {
+ return new ClassLoaderResourceId(path);
+ }
+
+ @Override
+ protected String getScheme() {
+ return SCHEMA;
+ }
+
+ public static class ClassLoaderResourceId implements ResourceId {
+
+ private final String path;
+
+ private ClassLoaderResourceId(String path) {
+ checkArgument(path.startsWith(PREFIX), path);
+ this.path = path;
+ }
+
+ @Override
+ public ResourceId resolve(String other, ResolveOptions resolveOptions) {
Review comment:
Thanks!
----------------------------------------------------------------
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] ibzib commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
ibzib commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425439878
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
+
+ public static final String SCHEMA = "classpath";
+ private static final String PREFIX = SCHEMA + "://";
+
+ ClassLoaderFileSystem() {}
+
+ @Override
+ protected List<MatchResult> match(List<String> specs) throws IOException {
+ throw new UnsupportedOperationException("Un-globable filesystem.");
+ }
+
+ @Override
+ protected WritableByteChannel create(
+ ClassLoaderResourceId resourceId, CreateOptions createOptions) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ReadableByteChannel open(ClassLoaderResourceId resourceId) throws IOException {
+ ClassLoader classLoader = getClass().getClassLoader();
+ InputStream inputStream =
+ classLoader.getResourceAsStream(resourceId.path.substring(PREFIX.length()));
+ if (inputStream == null) {
+ throw new IOException("Unable to load " + resourceId.path + " with " + classLoader);
+ }
+ return Channels.newChannel(inputStream);
+ }
+
+ @Override
+ protected void copy(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void rename(
+ List<ClassLoaderResourceId> srcResourceIds, List<ClassLoaderResourceId> destResourceIds)
+ throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected void delete(Collection<ClassLoaderResourceId> resourceIds) throws IOException {
+ throw new UnsupportedOperationException("Read-only filesystem.");
+ }
+
+ @Override
+ protected ClassLoaderResourceId matchNewResource(String path, boolean isDirectory) {
+ return new ClassLoaderResourceId(path);
+ }
+
+ @Override
+ protected String getScheme() {
+ return SCHEMA;
+ }
+
+ public static class ClassLoaderResourceId implements ResourceId {
+
+ private final String path;
+
+ private ClassLoaderResourceId(String path) {
+ checkArgument(path.startsWith(PREFIX), path);
+ this.path = path;
+ }
+
+ @Override
+ public ResourceId resolve(String other, ResolveOptions resolveOptions) {
Review comment:
Can we add a couple trivial unit tests as sanity checks / documentation for `resolve` and `getCurrentDirectory`?
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
Review comment:
Nice! But I don't see this actually used anywhere?
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
+
+ public static final String SCHEMA = "classpath";
+ private static final String PREFIX = SCHEMA + "://";
+
+ ClassLoaderFileSystem() {}
+
+ @Override
+ protected List<MatchResult> match(List<String> specs) throws IOException {
+ throw new UnsupportedOperationException("Un-globable filesystem.");
Review comment:
```suggestion
throw new UnsupportedOperationException("Un-globbable filesystem.");
```
##########
File path: sdks/java/core/src/test/java/org/apache/beam/sdk/io/ClassLoaderFileSystemTest.java
##########
@@ -0,0 +1,57 @@
+/*
+ * 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.sdk.io;
+
+import static java.nio.channels.Channels.newInputStream;
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.ReadableByteChannel;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class ClassLoaderFileSystemTest {
+
+ private static final String SOME_CLASS =
+ "classpath://org/apache/beam/sdk/io/ClassLoaderFilesystem.class";
+
+ @Test
+ public void testOpen() throws IOException {
+ ClassLoaderFileSystem filesystem = new ClassLoaderFileSystem();
+ ReadableByteChannel channel = filesystem.open(filesystem.matchNewResource(SOME_CLASS, false));
+ checkIsClass(channel);
+ }
+
+ @Test
+ public void testRegistrar() throws IOException {
+ ReadableByteChannel channel = FileSystems.open(FileSystems.matchNewResource(SOME_CLASS, false));
+ checkIsClass(channel);
+ }
+
+ public void checkIsClass(ReadableByteChannel channel) throws IOException {
+ FileSystems.setDefaultPipelineOptions(PipelineOptionsFactory.create());
+ InputStream inputStream = newInputStream(channel);
+ byte[] magic = new byte[4];
+ inputStream.read(magic);
+ assertArrayEquals(magic, new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE});
Review comment:
How did I never know this? 😆
----------------------------------------------------------------
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] ibzib commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
ibzib commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425986977
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,161 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
Review comment:
Should we change PortablePipelineJarUtils to use ClassLoaderFileSystem? (Maybe in a follow-up PR) https://github.com/apache/beam/blob/master/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarUtils.java
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -313,39 +329,62 @@ def prepare(self):
with tempfile.NamedTemporaryFile(suffix='.jar') as tout:
self._jar = tout.name
shutil.copy(self._executable_jar, self._jar)
- with zipfile.ZipFile(self._jar, 'a', compression=zipfile.ZIP_DEFLATED) as z:
- with z.open(self.PIPELINE_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_proto).encode('utf-8'))
- with z.open(self.PIPELINE_OPTIONS_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_options).encode('utf-8'))
- with z.open(self.PIPELINE_MANIFEST, 'w') as fout:
- fout.write(
- json.dumps({
- 'defaultJobName': self.PIPELINE_NAME
- }).encode('utf-8'))
self._start_artifact_service(self._jar, self._artifact_port)
def _start_artifact_service(self, jar, requested_port):
- self._artifact_staging_service = artifact_service.ZipFileArtifactService(
- jar, self.ARTIFACT_FOLDER)
+ self._artifact_manager = JarArtifactManager(self._jar, self.ARTIFACT_FOLDER)
+ self._artifact_staging_service = artifact_service.ArtifactStagingService(
+ self._artifact_manager.file_writer)
+ self._artifact_staging_service.register_job(
+ self._job_id,
+ {
+ env_id: env.dependencies
+ for (env_id,
+ env) in self._pipeline_proto.components.environments.items()
+ })
self._artifact_staging_server = grpc.server(futures.ThreadPoolExecutor())
port = self._artifact_staging_server.add_insecure_port(
'[::]:%s' % requested_port)
- beam_artifact_api_pb2_grpc.add_LegacyArtifactStagingServiceServicer_to_server(
+ beam_artifact_api_pb2_grpc.add_ArtifactStagingServiceServicer_to_server(
self._artifact_staging_service, self._artifact_staging_server)
self._artifact_staging_endpoint = endpoints_pb2.ApiServiceDescriptor(
url='localhost:%d' % port)
self._artifact_staging_server.start()
_LOGGER.info('Artifact server started on port %s', port)
+ _LOGGER.error('Artifact server started on port %s', port)
return port
def _stop_artifact_service(self):
self._artifact_staging_server.stop(1)
- self._artifact_staging_service.close()
- self._artifact_manifest_location = (
- self._artifact_staging_service.retrieval_token(self._job_id))
+ self._artifact_manifest_location = None
Review comment:
Can't we remove this now?
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -278,6 +279,23 @@ def to_runner_api(self):
state=self.state)
+class JarArtifactManager(object):
+ def __init__(self, jar_path, root):
+ self._root = root
+ self._zipfile_handle = zipfile.ZipFile(jar_path, 'a')
+
+ def close(self):
+ self._zipfile_handle.close()
+
+ def file_writer(self, path):
Review comment:
Can we get a type annotation and/or comment on the return value here?
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -313,39 +329,62 @@ def prepare(self):
with tempfile.NamedTemporaryFile(suffix='.jar') as tout:
self._jar = tout.name
shutil.copy(self._executable_jar, self._jar)
- with zipfile.ZipFile(self._jar, 'a', compression=zipfile.ZIP_DEFLATED) as z:
- with z.open(self.PIPELINE_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_proto).encode('utf-8'))
- with z.open(self.PIPELINE_OPTIONS_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_options).encode('utf-8'))
- with z.open(self.PIPELINE_MANIFEST, 'w') as fout:
- fout.write(
- json.dumps({
- 'defaultJobName': self.PIPELINE_NAME
- }).encode('utf-8'))
self._start_artifact_service(self._jar, self._artifact_port)
def _start_artifact_service(self, jar, requested_port):
- self._artifact_staging_service = artifact_service.ZipFileArtifactService(
- jar, self.ARTIFACT_FOLDER)
+ self._artifact_manager = JarArtifactManager(self._jar, self.ARTIFACT_FOLDER)
+ self._artifact_staging_service = artifact_service.ArtifactStagingService(
+ self._artifact_manager.file_writer)
+ self._artifact_staging_service.register_job(
+ self._job_id,
+ {
+ env_id: env.dependencies
+ for (env_id,
+ env) in self._pipeline_proto.components.environments.items()
+ })
self._artifact_staging_server = grpc.server(futures.ThreadPoolExecutor())
port = self._artifact_staging_server.add_insecure_port(
'[::]:%s' % requested_port)
- beam_artifact_api_pb2_grpc.add_LegacyArtifactStagingServiceServicer_to_server(
+ beam_artifact_api_pb2_grpc.add_ArtifactStagingServiceServicer_to_server(
self._artifact_staging_service, self._artifact_staging_server)
self._artifact_staging_endpoint = endpoints_pb2.ApiServiceDescriptor(
url='localhost:%d' % port)
self._artifact_staging_server.start()
_LOGGER.info('Artifact server started on port %s', port)
+ _LOGGER.error('Artifact server started on port %s', port)
Review comment:
Why error?
----------------------------------------------------------------
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] robertwb commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425462707
##########
File path: sdks/java/core/src/test/java/org/apache/beam/sdk/io/ClassLoaderFileSystemTest.java
##########
@@ -0,0 +1,57 @@
+/*
+ * 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.sdk.io;
+
+import static java.nio.channels.Channels.newInputStream;
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.ReadableByteChannel;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class ClassLoaderFileSystemTest {
+
+ private static final String SOME_CLASS =
+ "classpath://org/apache/beam/sdk/io/ClassLoaderFilesystem.class";
+
+ @Test
+ public void testOpen() throws IOException {
+ ClassLoaderFileSystem filesystem = new ClassLoaderFileSystem();
+ ReadableByteChannel channel = filesystem.open(filesystem.matchNewResource(SOME_CLASS, false));
+ checkIsClass(channel);
+ }
+
+ @Test
+ public void testRegistrar() throws IOException {
+ ReadableByteChannel channel = FileSystems.open(FileSystems.matchNewResource(SOME_CLASS, false));
+ checkIsClass(channel);
+ }
+
+ public void checkIsClass(ReadableByteChannel channel) throws IOException {
+ FileSystems.setDefaultPipelineOptions(PipelineOptionsFactory.create());
+ InputStream inputStream = newInputStream(channel);
+ byte[] magic = new byte[4];
+ inputStream.read(magic);
+ assertArrayEquals(magic, new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE});
Review comment:
It's used on the Python side.
----------------------------------------------------------------
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] robertwb commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r426061393
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -313,39 +329,62 @@ def prepare(self):
with tempfile.NamedTemporaryFile(suffix='.jar') as tout:
self._jar = tout.name
shutil.copy(self._executable_jar, self._jar)
- with zipfile.ZipFile(self._jar, 'a', compression=zipfile.ZIP_DEFLATED) as z:
- with z.open(self.PIPELINE_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_proto).encode('utf-8'))
- with z.open(self.PIPELINE_OPTIONS_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_options).encode('utf-8'))
- with z.open(self.PIPELINE_MANIFEST, 'w') as fout:
- fout.write(
- json.dumps({
- 'defaultJobName': self.PIPELINE_NAME
- }).encode('utf-8'))
self._start_artifact_service(self._jar, self._artifact_port)
def _start_artifact_service(self, jar, requested_port):
- self._artifact_staging_service = artifact_service.ZipFileArtifactService(
- jar, self.ARTIFACT_FOLDER)
+ self._artifact_manager = JarArtifactManager(self._jar, self.ARTIFACT_FOLDER)
+ self._artifact_staging_service = artifact_service.ArtifactStagingService(
+ self._artifact_manager.file_writer)
+ self._artifact_staging_service.register_job(
+ self._job_id,
+ {
+ env_id: env.dependencies
+ for (env_id,
+ env) in self._pipeline_proto.components.environments.items()
+ })
self._artifact_staging_server = grpc.server(futures.ThreadPoolExecutor())
port = self._artifact_staging_server.add_insecure_port(
'[::]:%s' % requested_port)
- beam_artifact_api_pb2_grpc.add_LegacyArtifactStagingServiceServicer_to_server(
+ beam_artifact_api_pb2_grpc.add_ArtifactStagingServiceServicer_to_server(
self._artifact_staging_service, self._artifact_staging_server)
self._artifact_staging_endpoint = endpoints_pb2.ApiServiceDescriptor(
url='localhost:%d' % port)
self._artifact_staging_server.start()
_LOGGER.info('Artifact server started on port %s', port)
+ _LOGGER.error('Artifact server started on port %s', port)
Review comment:
Leftover debugging. Removed.
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -278,6 +279,23 @@ def to_runner_api(self):
state=self.state)
+class JarArtifactManager(object):
+ def __init__(self, jar_path, root):
+ self._root = root
+ self._zipfile_handle = zipfile.ZipFile(jar_path, 'a')
+
+ def close(self):
+ self._zipfile_handle.close()
+
+ def file_writer(self, path):
Review comment:
Done.
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,161 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
+public class ClassLoaderFileSystem extends FileSystem<ClassLoaderFileSystem.ClassLoaderResourceId> {
Review comment:
Yes, we'll want to do that too (and use the new artifact api).
##########
File path: sdks/python/apache_beam/runners/portability/abstract_job_service.py
##########
@@ -313,39 +329,62 @@ def prepare(self):
with tempfile.NamedTemporaryFile(suffix='.jar') as tout:
self._jar = tout.name
shutil.copy(self._executable_jar, self._jar)
- with zipfile.ZipFile(self._jar, 'a', compression=zipfile.ZIP_DEFLATED) as z:
- with z.open(self.PIPELINE_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_proto).encode('utf-8'))
- with z.open(self.PIPELINE_OPTIONS_PATH, 'w') as fout:
- fout.write(
- json_format.MessageToJson(self._pipeline_options).encode('utf-8'))
- with z.open(self.PIPELINE_MANIFEST, 'w') as fout:
- fout.write(
- json.dumps({
- 'defaultJobName': self.PIPELINE_NAME
- }).encode('utf-8'))
self._start_artifact_service(self._jar, self._artifact_port)
def _start_artifact_service(self, jar, requested_port):
- self._artifact_staging_service = artifact_service.ZipFileArtifactService(
- jar, self.ARTIFACT_FOLDER)
+ self._artifact_manager = JarArtifactManager(self._jar, self.ARTIFACT_FOLDER)
+ self._artifact_staging_service = artifact_service.ArtifactStagingService(
+ self._artifact_manager.file_writer)
+ self._artifact_staging_service.register_job(
+ self._job_id,
+ {
+ env_id: env.dependencies
+ for (env_id,
+ env) in self._pipeline_proto.components.environments.items()
+ })
self._artifact_staging_server = grpc.server(futures.ThreadPoolExecutor())
port = self._artifact_staging_server.add_insecure_port(
'[::]:%s' % requested_port)
- beam_artifact_api_pb2_grpc.add_LegacyArtifactStagingServiceServicer_to_server(
+ beam_artifact_api_pb2_grpc.add_ArtifactStagingServiceServicer_to_server(
self._artifact_staging_service, self._artifact_staging_server)
self._artifact_staging_endpoint = endpoints_pb2.ApiServiceDescriptor(
url='localhost:%d' % port)
self._artifact_staging_server.start()
_LOGGER.info('Artifact server started on port %s', port)
+ _LOGGER.error('Artifact server started on port %s', port)
return port
def _stop_artifact_service(self):
self._artifact_staging_server.stop(1)
- self._artifact_staging_service.close()
- self._artifact_manifest_location = (
- self._artifact_staging_service.retrieval_token(self._job_id))
+ self._artifact_manifest_location = None
Review comment:
Yep. Done.
----------------------------------------------------------------
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] robertwb commented on pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb commented on pull request #11708:
URL: https://github.com/apache/beam/pull/11708#issuecomment-628956526
Still trying to figure out why the test fails on jenkins but passes locally, but other than that it should be ready to be looked at again.
----------------------------------------------------------------
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] robertwb merged pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb merged pull request #11708:
URL: https://github.com/apache/beam/pull/11708
----------------------------------------------------------------
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] robertwb commented on a change in pull request #11708: [BEAM-9577] Artifact v2 support for uber jars.
Posted by GitBox <gi...@apache.org>.
robertwb commented on a change in pull request #11708:
URL: https://github.com/apache/beam/pull/11708#discussion_r425462944
##########
File path: sdks/java/core/src/main/java/org/apache/beam/sdk/io/ClassLoaderFileSystem.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.sdk.io;
+
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
+
+import com.google.auto.service.AutoService;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Collection;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.apache.beam.sdk.annotations.Experimental;
+import org.apache.beam.sdk.io.fs.CreateOptions;
+import org.apache.beam.sdk.io.fs.MatchResult;
+import org.apache.beam.sdk.io.fs.ResolveOptions;
+import org.apache.beam.sdk.io.fs.ResourceId;
+import org.apache.beam.sdk.options.PipelineOptions;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
+
+/** A read-only {@link FileSystem} implementation looking up resources using a ClassLoader. */
Review comment:
It's used on the Python side.
----------------------------------------------------------------
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