Repository: reef Updated Branches: refs/heads/master 2ee2ca980 -> 9d6ecfedb
[REEF-1363] Cleanup .NET code marked obsolete in 0.14 JIRA: [REEF-1363](https://issues.apache.org/jira/browse/REEF-1363) Pull request: This closes #970 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/9d6ecfed Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/9d6ecfed Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/9d6ecfed Branch: refs/heads/master Commit: 9d6ecfedb00efd21293bd5dc20b254531b67fbb5 Parents: 2ee2ca9 Author: Mariia Mykhailova <[email protected]> Authored: Tue Apr 26 14:18:21 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Apr 26 17:03:15 2016 -0700 ---------------------------------------------------------------------- .../Bridge/DriverBridgeConfigurationOptions.cs | 6 ---- .../Bridge/Events/EvaluatorRequestor.cs | 2 -- .../Evaluator/EvaluatorRequestBuilder.cs | 6 +--- .../HadoopFileInputPartitionTest.cs | 16 ---------- .../TestFilePartitionInputDataSet.cs | 32 -------------------- .../FileSystem/IFileDeSerializer.cs | 12 -------- .../Formats/ConfigurationFile.cs | 3 +- 7 files changed, 2 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs index 995a958..73c5d72 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/DriverBridgeConfigurationOptions.cs @@ -143,12 +143,6 @@ namespace Org.Apache.REEF.Driver.Bridge { } - [Obsolete("Deprecated in 0.14, will be removed.")] - [NamedParameter("The number of times an application should be submitted in case of failure.", "MaxApplicationSubmissions", "1")] - public class MaxApplicationSubmissions : Name<int> - { - } - [NamedParameter("Command Line Arguments supplied by client", "CommandLineArguments", null)] public class ArgumentSets : Name<ISet<string>> { http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs index 9e75904..3fa65a2 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs @@ -102,9 +102,7 @@ namespace Org.Apache.REEF.Driver.Bridge.Events public EvaluatorRequestBuilder NewBuilder(IEvaluatorRequest request) { -#pragma warning disable 618 return new EvaluatorRequestBuilder(request); -#pragma warning restore 618 } public void Dispose() http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs index b59005b..d6e5a63 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs +++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequestBuilder.cs @@ -16,7 +16,6 @@ // under the License. using System; - using Org.Apache.REEF.Common.Runtime; namespace Org.Apache.REEF.Driver.Evaluator @@ -27,8 +26,7 @@ namespace Org.Apache.REEF.Driver.Evaluator private string _rackName; private string _runtimeName; - [Obsolete("This constructor will be internal after 0.13.")] - public EvaluatorRequestBuilder(IEvaluatorRequest request) + internal EvaluatorRequestBuilder(IEvaluatorRequest request) { Number = request.Number; MegaBytes = request.MemoryMegaBytes; @@ -124,9 +122,7 @@ namespace Org.Apache.REEF.Driver.Evaluator /// <returns></returns> public IEvaluatorRequest Build() { -#pragma warning disable 618 return new EvaluatorRequest(Number, MegaBytes, VirtualCore, rack: _rackName, evaluatorBatchId: _evaluatorBatchId, runtimeName: _runtimeName); -#pragma warning restore 618 } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.IO.TestClient/HadoopFileInputPartitionTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.TestClient/HadoopFileInputPartitionTest.cs b/lang/cs/Org.Apache.REEF.IO.TestClient/HadoopFileInputPartitionTest.cs index 1633325..e04bee4 100644 --- a/lang/cs/Org.Apache.REEF.IO.TestClient/HadoopFileInputPartitionTest.cs +++ b/lang/cs/Org.Apache.REEF.IO.TestClient/HadoopFileInputPartitionTest.cs @@ -145,22 +145,6 @@ namespace Org.Apache.REEF.IO.TestClient } /// <summary> - /// Read bytes from all the files in the file folder and return one by one - /// </summary> - /// <param name="fileFolder"></param> - /// <returns></returns> - [Obsolete("Remove after 0.14")] - public IEnumerable<byte> Deserialize(string fileFolder) - { - var files = new HashSet<string>(); - foreach (var f in Directory.GetFiles(fileFolder)) - { - files.Add(f); - } - return Deserialize(files); - } - - /// <summary> /// Read bytes from all the files in the set and return one by one /// </summary> /// <param name="filePaths"></param> http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.IO.Tests/TestFilePartitionInputDataSet.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/TestFilePartitionInputDataSet.cs b/lang/cs/Org.Apache.REEF.IO.Tests/TestFilePartitionInputDataSet.cs index 5cbb983..001c322 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/TestFilePartitionInputDataSet.cs +++ b/lang/cs/Org.Apache.REEF.IO.Tests/TestFilePartitionInputDataSet.cs @@ -313,22 +313,6 @@ namespace Org.Apache.REEF.IO.Tests } /// <summary> - /// Enumerate all the files in the file foder and return each byte read - /// </summary> - /// <param name="fileFolder"></param> - /// <returns></returns> - [Obsolete("Remove after 0.14")] - public IEnumerable<byte> Deserialize(string fileFolder) - { - var files = new HashSet<string>(); - foreach (var f in Directory.GetFiles(fileFolder)) - { - files.Add(f); - } - return Deserialize(files); - } - - /// <summary> /// Enumerate all the files in the set and return each byte read /// </summary> /// <param name="filePaths"></param> @@ -372,22 +356,6 @@ namespace Org.Apache.REEF.IO.Tests } /// <summary> - /// read all the files in the fileFolder cand return byte read one by one - /// </summary> - /// <param name="fileFolder"></param> - /// <returns></returns> - [Obsolete("Remove after 0.14")] - public IEnumerable<Row> Deserialize(string fileFolder) - { - ISet<string> files = new HashSet<string>(); - foreach (var f in Directory.GetFiles(fileFolder)) - { - files.Add(f); - } - return Deserialize(files); - } - - /// <summary> /// read all the files in the set and return byte read one by one /// </summary> /// <param name="filePaths"></param> http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.IO/PartitionedData/FileSystem/IFileDeSerializer.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/PartitionedData/FileSystem/IFileDeSerializer.cs b/lang/cs/Org.Apache.REEF.IO/PartitionedData/FileSystem/IFileDeSerializer.cs index 988b11d..958207d 100644 --- a/lang/cs/Org.Apache.REEF.IO/PartitionedData/FileSystem/IFileDeSerializer.cs +++ b/lang/cs/Org.Apache.REEF.IO/PartitionedData/FileSystem/IFileDeSerializer.cs @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System; using System.Collections.Generic; namespace Org.Apache.REEF.IO.PartitionedData.FileSystem @@ -27,22 +26,11 @@ namespace Org.Apache.REEF.IO.PartitionedData.FileSystem public interface IFileDeSerializer<T> { /// <summary> - /// The input is a file folder which contains all input files in one partition. - /// The output is of type T which is defined by the client - /// If there is any IO error, IOException could be thrown. - /// </summary> - /// <param name="fileFolder"></param> - /// <returns></returns> - [Obsolete("Remove after 0.14")] - T Deserialize(string fileFolder); - - /// <summary> /// The input is a set of file paths. /// The output is of type T which is defined by the client. /// If there is any IO error, IOException could be thrown. /// </summary> /// <param name="filePaths"></param> - /// <param name="local"></param> /// <returns></returns> T Deserialize(ISet<string> filePaths); } http://git-wip-us.apache.org/repos/asf/reef/blob/9d6ecfed/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs index 3edaa30..8c4fd11 100644 --- a/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs +++ b/lang/cs/Org.Apache.REEF.Tang/Formats/ConfigurationFile.cs @@ -241,8 +241,7 @@ namespace Org.Apache.REEF.Tang.Formats } } - [Obsolete("Will be changed as internal after 0.14")] - public static void ProcessConfigData(IConfigurationBuilder conf, IList<KeyValuePair<string, string>> settings) + internal static void ProcessConfigData(IConfigurationBuilder conf, IList<KeyValuePair<string, string>> settings) { foreach (KeyValuePair<string, string> kv in settings) {
