Repository: reef Updated Branches: refs/heads/master 88ddc3a46 -> 5f4d12bcd
[REEF-1328] Remove deprecated IJobSubmission and related classes in favor of JobRequest JIRA: [REEF-1328](https://issues.apache.org/jira/browse/REEF-1328) Pull Request: This closes #937 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/5f4d12bc Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/5f4d12bc Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/5f4d12bc Branch: refs/heads/master Commit: 5f4d12bcd104462eee0c591a7658fd528cbbce1f Parents: 88ddc3a Author: Andrew Chung <[email protected]> Authored: Fri Apr 8 14:49:26 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Apr 11 13:26:58 2016 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Client/API/AppParameters.cs | 8 - .../API/IJobSubmission.cs | 77 --------- .../API/IJobSubmissionBuilder.cs | 92 ----------- .../Org.Apache.REEF.Client/API/IREEFClient.cs | 8 - .../Org.Apache.REEF.Client/API/JobParameters.cs | 12 -- .../cs/Org.Apache.REEF.Client/API/JobRequest.cs | 8 - .../Org.Apache.REEF.Client/API/JobSubmission.cs | 109 ------------- .../API/JobSubmissionBuilder.cs | 163 ------------------- .../API/JobSubmissionBuilderFactory.cs | 49 ------ .../Org.Apache.REEF.Client/Local/LocalClient.cs | 5 - .../Org.Apache.REEF.Client.csproj | 5 - .../YARN/YARNREEFClient.cs | 10 -- .../YARN/YarnREEFDotNetClient.cs | 6 - 13 files changed, 552 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/AppParameters.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/AppParameters.cs b/lang/cs/Org.Apache.REEF.Client/API/AppParameters.cs index 9841811..cf39b1a 100644 --- a/lang/cs/Org.Apache.REEF.Client/API/AppParameters.cs +++ b/lang/cs/Org.Apache.REEF.Client/API/AppParameters.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System; using System.Collections.Generic; using Org.Apache.REEF.Tang.Interface; @@ -51,13 +50,6 @@ namespace Org.Apache.REEF.Client.API _driverConfigurationFileContents = driverConfigurationFileContents; } - [Obsolete("Introduced to bridge deprecation of IJobSubmission.")] - internal static AppParameters FromJobSubmission(IJobSubmission jobSubmission) - { - return new AppParameters(jobSubmission.DriverConfigurations, jobSubmission.GlobalAssemblies, jobSubmission.GlobalFiles, - jobSubmission.LocalAssemblies, jobSubmission.LocalFiles, jobSubmission.DriverConfigurationFileContents); - } - /// <summary> /// The assemblies to be made available to all containers. /// </summary> http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/IJobSubmission.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/IJobSubmission.cs b/lang/cs/Org.Apache.REEF.Client/API/IJobSubmission.cs deleted file mode 100644 index 5cefb98..0000000 --- a/lang/cs/Org.Apache.REEF.Client/API/IJobSubmission.cs +++ /dev/null @@ -1,77 +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. - -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Tang.Interface; - -namespace Org.Apache.REEF.Client.API -{ - /// <summary> - /// This interfaces provides all the information that is needed for - /// a job submission - /// </summary> - [Obsolete("Deprecated in 0.14. Please use JobRequest.")] - public interface IJobSubmission - { - /// <summary> - /// The assemblies to be made available to all containers. - /// </summary> - ISet<string> GlobalAssemblies { get; } - - /// <summary> - /// The driver configurations - /// </summary> - ISet<IConfiguration> DriverConfigurations { get; } - - /// <summary> - /// Global files. - /// </summary> - ISet<string> GlobalFiles { get; } - - /// <summary> - /// Local assemblies. - /// </summary> - ISet<string> LocalAssemblies { get; } - - /// <summary> - /// Local files. - /// </summary> - ISet<string> LocalFiles { get; } - - /// <summary> - /// Driver memory in MegaBytes. - /// </summary> - int DriverMemory { get; } - - /// <summary> - /// The maximum amount of times an application can be submitted. - /// </summary> - int MaxApplicationSubmissions { get; } - - /// <summary> - /// The Job's identifier - /// </summary> - string JobIdentifier { get; } - - /// <summary> - /// Driver config file contents (Org.Apache.REEF.Bridge.exe.config) contents - /// Can be used to redirect assembly versions - /// </summary> - string DriverConfigurationFileContents { get; } - } -} http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/IJobSubmissionBuilder.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/IJobSubmissionBuilder.cs b/lang/cs/Org.Apache.REEF.Client/API/IJobSubmissionBuilder.cs deleted file mode 100644 index 4e2408b..0000000 --- a/lang/cs/Org.Apache.REEF.Client/API/IJobSubmissionBuilder.cs +++ /dev/null @@ -1,92 +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. - -using System; -using Org.Apache.REEF.Tang.Interface; - -namespace Org.Apache.REEF.Client.API -{ - /// <summary> - /// Facilitates building of job submissions - /// </summary> - [Obsolete("Deprecated in 0.14, please use JobRequestBuilder.")] - public interface IJobSubmissionBuilder - { - /// <summary> - /// Bake the information provided so far and return a IJobSubmission - /// </summary> - IJobSubmission Build(); - - /// <summary> - /// Make this file available to all containers - /// </summary> - IJobSubmissionBuilder AddGlobalFile(string fileName); - - /// <summary> - /// Files specific to one container - /// </summary> - IJobSubmissionBuilder AddLocalFile(string fileName); - - /// <summary> - /// Assemblies available to all containers - /// </summary> - IJobSubmissionBuilder AddGlobalAssembly(string fileName); - - /// <summary> - /// Assemblies available to a specific container - /// </summary> - IJobSubmissionBuilder AddLocalAssembly(string fileName); - - /// <summary> - /// Configuration that will be available to the driver - /// </summary> - IJobSubmissionBuilder AddDriverConfiguration(IConfiguration configuration); - - /// <summary> - /// Find the assembly for this type and make it available to a specific container - /// </summary> - IJobSubmissionBuilder AddLocalAssemblyForType(Type type); - - /// <summary> - /// Find the assembly for this type and make it available to all containers - /// </summary> - IJobSubmissionBuilder AddGlobalAssemblyForType(Type type); - - /// <summary> - /// Specify job identifier. - /// </summary> - IJobSubmissionBuilder SetJobIdentifier(string id); - - /// <summary> - /// Set driver memory in megabytes. - /// </summary> - IJobSubmissionBuilder SetDriverMemory(int driverMemoryInMb); - - /// <summary> - /// Set the maximum amount of times a job can be submitted. - /// </summary> - IJobSubmissionBuilder SetMaxApplicationSubmissions(int maxAppSubmissions); - - /// <summary> - /// Driver config file contents (Org.Apache.REEF.Bridge.exe.config) contents - /// Can be used to redirect assembly versions - /// </summary> - /// <param name="driverConfigurationFileContents">Driver configuration file contents.</param> - /// <returns>IJobSubmissionBuilder</returns> - IJobSubmissionBuilder SetDriverConfigurationFileContents(string driverConfigurationFileContents); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/IREEFClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/IREEFClient.cs b/lang/cs/Org.Apache.REEF.Client/API/IREEFClient.cs index 355ca70..a4734f5 100644 --- a/lang/cs/Org.Apache.REEF.Client/API/IREEFClient.cs +++ b/lang/cs/Org.Apache.REEF.Client/API/IREEFClient.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System; using System.Threading.Tasks; using Org.Apache.REEF.Client.Common; using Org.Apache.REEF.Client.YARN.RestClient.DataModel; @@ -32,13 +31,6 @@ namespace Org.Apache.REEF.Client.API /// <summary> /// Submit the job described in jobRequest to the cluster. /// </summary> - /// <param name="jobSubmission"></param> - [Obsolete("Deprecated in 0.14. Please use Submit(JobRequest)")] - void Submit(IJobSubmission jobSubmission); - - /// <summary> - /// Submit the job described in jobRequest to the cluster. - /// </summary> /// <param name="jobRequest"></param> void Submit(JobRequest jobRequest); http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/JobParameters.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/JobParameters.cs b/lang/cs/Org.Apache.REEF.Client/API/JobParameters.cs index d7da2bb..0c1d9fd 100644 --- a/lang/cs/Org.Apache.REEF.Client/API/JobParameters.cs +++ b/lang/cs/Org.Apache.REEF.Client/API/JobParameters.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System; using Org.Apache.REEF.Utilities; namespace Org.Apache.REEF.Client.API @@ -51,17 +50,6 @@ namespace Org.Apache.REEF.Client.API Optional<string>.Empty() : Optional<string>.Of(stderrFilePath); } - [Obsolete("Introduced to bridge deprecation of IJobSubmission.")] - internal static JobParameters FromJobSubmission(IJobSubmission jobSubmission) - { - return new JobParameters( - jobSubmission.JobIdentifier, - jobSubmission.MaxApplicationSubmissions, - jobSubmission.DriverMemory, - null, - null); - } - /// <summary> /// The identifier of the job. /// </summary> http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/JobRequest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/JobRequest.cs b/lang/cs/Org.Apache.REEF.Client/API/JobRequest.cs index 2e3dc6d..c20e7d7 100644 --- a/lang/cs/Org.Apache.REEF.Client/API/JobRequest.cs +++ b/lang/cs/Org.Apache.REEF.Client/API/JobRequest.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System; using System.Collections.Generic; using Org.Apache.REEF.Tang.Interface; @@ -35,13 +34,6 @@ namespace Org.Apache.REEF.Client.API _appParameters = appParameters; } - [Obsolete("Introduced to bridge deprecation of IJobSubmission.")] - internal static JobRequest FromJobSubmission(IJobSubmission jobSubmission) - { - return new JobRequest( - JobParameters.FromJobSubmission(jobSubmission), AppParameters.FromJobSubmission(jobSubmission)); - } - /// <summary> /// The assemblies to be made available to all containers. /// </summary> http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/JobSubmission.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/JobSubmission.cs b/lang/cs/Org.Apache.REEF.Client/API/JobSubmission.cs deleted file mode 100644 index 1484d2e..0000000 --- a/lang/cs/Org.Apache.REEF.Client/API/JobSubmission.cs +++ /dev/null @@ -1,109 +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. - -using System.Collections.Generic; -using Org.Apache.REEF.Tang.Interface; - -namespace Org.Apache.REEF.Client.API -{ - /// <summary> - /// Captures a submission of a REEF Job to a cluster. - /// </summary> - internal sealed class JobSubmission : IJobSubmission - { - private readonly ISet<IConfiguration> _driverConfigurations; - private readonly ISet<string> _globalAssemblies; - private readonly ISet<string> _globalFiles; - private readonly ISet<string> _localAssemblies; - private readonly ISet<string> _localFiles; - private readonly int _driverMemory; - private readonly int _maxAppSubmissions; - private readonly string _jobIdentifier; - private readonly string _driverConfigurationFileContents; - - internal JobSubmission(JobRequest jobRequest) - { - _driverConfigurations = jobRequest.DriverConfigurations; - _globalAssemblies = jobRequest.GlobalAssemblies; - _globalFiles = jobRequest.GlobalFiles; - _localAssemblies = jobRequest.LocalAssemblies; - _localFiles = jobRequest.LocalFiles; - _driverMemory = jobRequest.DriverMemory; - _jobIdentifier = jobRequest.JobIdentifier; - _driverConfigurationFileContents = jobRequest.DriverConfigurationFileContents; - _maxAppSubmissions = jobRequest.MaxApplicationSubmissions; - } - - /// <summary> - /// The assemblies to be made available to all containers. - /// </summary> - ISet<string> IJobSubmission.GlobalAssemblies - { - get { return _globalAssemblies; } - } - - /// <summary> - /// The driver configurations - /// </summary> - ISet<IConfiguration> IJobSubmission.DriverConfigurations - { - get { return _driverConfigurations; } - } - - ISet<string> IJobSubmission.GlobalFiles - { - get { return _globalFiles; } - } - - ISet<string> IJobSubmission.LocalAssemblies - { - get { return _localAssemblies; } - } - - ISet<string> IJobSubmission.LocalFiles - { - get { return _localFiles; } - } - - int IJobSubmission.DriverMemory - { - get { return _driverMemory; } - } - - int IJobSubmission.MaxApplicationSubmissions - { - get { return _maxAppSubmissions; } - } - - /// <summary> - /// The Job's identifier - /// </summary> - string IJobSubmission.JobIdentifier - { - get { return _jobIdentifier; } - } - - /// <summary> - /// Driver config file contents (Org.Apache.REEF.Bridge.exe.config) - /// Can be use to redirect assembly versions - /// </summary> - string IJobSubmission.DriverConfigurationFileContents - { - get { return _driverConfigurationFileContents; } - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilder.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilder.cs b/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilder.cs deleted file mode 100644 index 12a902f..0000000 --- a/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilder.cs +++ /dev/null @@ -1,163 +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. - -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Tang.Interface; - -namespace Org.Apache.REEF.Client.API -{ - [Obsolete("Deprecated in 0.14. Will be removed.")] - internal class JobSubmissionBuilder : IJobSubmissionBuilder - { - private readonly JobRequestBuilder _jobRequestBuilder = JobRequestBuilder.NewBuilder(); - - internal JobSubmissionBuilder(ISet<IConfigurationProvider> configurationProviders) - { - _jobRequestBuilder.AddDriverConfigurationProviders(configurationProviders); - } - - /// <summary> - /// Add a file to be made available in all containers. - /// </summary> - /// <param name="fileName"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddGlobalFile(string fileName) - { - _jobRequestBuilder.AddGlobalFile(fileName); - return this; - } - - /// <summary> - /// Add a file to be made available only on the driver. - /// </summary> - /// <param name="fileName"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddLocalFile(string fileName) - { - _jobRequestBuilder.AddLocalFile(fileName); - return this; - } - - /// <summary> - /// Add an assembly to be made available on all containers. - /// </summary> - /// <param name="fileName"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddGlobalAssembly(string fileName) - { - _jobRequestBuilder.AddGlobalAssembly(fileName); - return this; - } - - /// <summary> - /// Add an assembly to the driver only. - /// </summary> - /// <param name="fileName"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddLocalAssembly(string fileName) - { - _jobRequestBuilder.AddLocalAssembly(fileName); - return this; - } - - /// <summary> - /// Add a Configuration to the Driver. - /// </summary> - /// <param name="configuration"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddDriverConfiguration(IConfiguration configuration) - { - _jobRequestBuilder.AddDriverConfiguration(configuration); - return this; - } - - /// <summary> - /// Add the assembly needed for the given Type to the driver. - /// </summary> - /// <param name="type"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddLocalAssemblyForType(Type type) - { - _jobRequestBuilder.AddLocalAssemblyForType(type); - return this; - } - - /// <summary> - /// Add the assembly needed for the given Type to all containers. - /// </summary> - /// <param name="type"></param> - /// <returns></returns> - public IJobSubmissionBuilder AddGlobalAssemblyForType(Type type) - { - _jobRequestBuilder.AddGlobalAssemblyForType(type); - return this; - } - - /// <summary> - /// Gives the job an identifier. - /// </summary> - /// <param name="id"></param> - /// <returns></returns> - public IJobSubmissionBuilder SetJobIdentifier(string id) - { - _jobRequestBuilder.SetJobIdentifier(id); - return this; - } - - /// <summary> - /// Sets the amount of memory (in MB) to allocate for the Driver. - /// </summary> - /// <param name="driverMemoryInMb">The amount of memory (in MB) to allocate for the Driver.</param> - /// <returns>this</returns> - public IJobSubmissionBuilder SetDriverMemory(int driverMemoryInMb) - { - _jobRequestBuilder.SetDriverMemory(driverMemoryInMb); - return this; - } - - /// <summary> - /// Sets the maximum amount of times a job can be submitted. - /// </summary> - public IJobSubmissionBuilder SetMaxApplicationSubmissions(int maxAppSubmissions) - { - _jobRequestBuilder.SetMaxApplicationSubmissions(maxAppSubmissions); - return this; - } - - /// <summary> - /// Driver config file contents (Org.Apache.REEF.Bridge.exe.config) contents - /// Can be use to redirect assembly versions - /// </summary> - /// <param name="driverConfigurationFileContents">Driver configuration file contents.</param> - /// <returns>this</returns> - public IJobSubmissionBuilder SetDriverConfigurationFileContents(string driverConfigurationFileContents) - { - _jobRequestBuilder.SetDriverConfigurationFileContents(driverConfigurationFileContents); - return this; - } - - /// <summary> - /// Builds the submission - /// </summary> - /// <returns>IJobSubmission</returns> - public IJobSubmission Build() - { - return new JobSubmission(_jobRequestBuilder.Build()); - } - } -} http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilderFactory.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilderFactory.cs b/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilderFactory.cs deleted file mode 100644 index d7b7375..0000000 --- a/lang/cs/Org.Apache.REEF.Client/API/JobSubmissionBuilderFactory.cs +++ /dev/null @@ -1,49 +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. - -using System; -using System.Collections.Generic; -using Org.Apache.REEF.Common.Client.Parameters; -using Org.Apache.REEF.Tang.Annotations; -using Org.Apache.REEF.Tang.Interface; - -namespace Org.Apache.REEF.Client.API -{ - /// <summary> - /// Instantiates IJobSubmissionBuilder based on configurationProviders. - /// </summary> - [Obsolete("Deprecated in 0.14. Please use JobRequestBuilder instead.")] - public sealed class JobSubmissionBuilderFactory - { - private readonly ISet<IConfigurationProvider> _configurationProviders; - - [Inject] - internal JobSubmissionBuilderFactory( - [Parameter(typeof(DriverConfigurationProviders))] ISet<IConfigurationProvider> configurationProviders) - { - _configurationProviders = configurationProviders; - } - - /// <summary> - /// Instantiates IJobSubmissionBuilder - /// </summary> - public IJobSubmissionBuilder GetJobSubmissionBuilder() - { - return new JobSubmissionBuilder(_configurationProviders); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/Local/LocalClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Local/LocalClient.cs b/lang/cs/Org.Apache.REEF.Client/Local/LocalClient.cs index 460e87d..8baf1a6 100644 --- a/lang/cs/Org.Apache.REEF.Client/Local/LocalClient.cs +++ b/lang/cs/Org.Apache.REEF.Client/Local/LocalClient.cs @@ -161,11 +161,6 @@ namespace Org.Apache.REEF.Client.Local return driverFolder; } - public void Submit(IJobSubmission jobSubmission) - { - Submit(JobRequest.FromJobSubmission(jobSubmission)); - } - public void Submit(JobRequest jobRequest) { var driverFolder = PrepareDriverFolder(jobRequest); http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj index e2f410b..be84052 100644 --- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj @@ -64,16 +64,11 @@ under the License. <Compile Include="API\ClientFactory.cs" /> <Compile Include="API\Exceptions\ClasspathException.cs" /> <Compile Include="API\Exceptions\JavaNotFoundException.cs" /> - <Compile Include="API\IJobSubmission.cs" /> - <Compile Include="API\IJobSubmissionBuilder.cs" /> <Compile Include="API\IREEFClient.cs" /> <Compile Include="API\JobParameters.cs" /> <Compile Include="API\JobParametersBuilder.cs" /> <Compile Include="API\JobRequest.cs" /> <Compile Include="API\JobRequestBuilder.cs" /> - <Compile Include="API\JobSubmission.cs" /> - <Compile Include="API\JobSubmissionBuilder.cs" /> - <Compile Include="API\JobSubmissionBuilderFactory.cs" /> <Compile Include="API\TcpPortConfigurationModule.cs" /> <Compile Include="Avro\AvroAppSubmissionParameters.cs" /> <Compile Include="Avro\AvroJobSubmissionParameters.cs" /> http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/YARN/YARNREEFClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/YARN/YARNREEFClient.cs b/lang/cs/Org.Apache.REEF.Client/YARN/YARNREEFClient.cs index 7380b7a..fe43603 100644 --- a/lang/cs/Org.Apache.REEF.Client/YARN/YARNREEFClient.cs +++ b/lang/cs/Org.Apache.REEF.Client/YARN/YARNREEFClient.cs @@ -62,11 +62,6 @@ namespace Org.Apache.REEF.Client.Yarn _paramSerializer = paramSerializer; } - public void Submit(IJobSubmission jobSubmission) - { - Submit(JobRequest.FromJobSubmission(jobSubmission)); - } - public void Submit(JobRequest jobRequest) { // Prepare the job submission folder @@ -95,11 +90,6 @@ namespace Org.Apache.REEF.Client.Yarn return jobSubmitionResultImpl; } - public IJobSubmissionResult SubmitAndGetJobStatus(IJobSubmission jobSubmission) - { - return SubmitAndGetJobStatus(JobRequest.FromJobSubmission(jobSubmission)); - } - /// <summary> /// Pull Job status from Yarn for the given appId /// </summary> http://git-wip-us.apache.org/repos/asf/reef/blob/5f4d12bc/lang/cs/Org.Apache.REEF.Client/YARN/YarnREEFDotNetClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/YARN/YarnREEFDotNetClient.cs b/lang/cs/Org.Apache.REEF.Client/YARN/YarnREEFDotNetClient.cs index 0f58852..4edaf13 100644 --- a/lang/cs/Org.Apache.REEF.Client/YARN/YarnREEFDotNetClient.cs +++ b/lang/cs/Org.Apache.REEF.Client/YARN/YarnREEFDotNetClient.cs @@ -140,12 +140,6 @@ namespace Org.Apache.REEF.Client.YARN throw new NotSupportedException(); } - [Obsolete("Deprecated in 0.14, please use Submit(JobRequest)")] - public void Submit(IJobSubmission jobSubmission) - { - Submit(JobRequest.FromJobSubmission(jobSubmission)); - } - public async Task<FinalState> GetJobFinalStatus(string appId) { var application = await _yarnRMClient.GetApplicationAsync(appId).ConfigureAwait(false);
