You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2016/03/21 23:13:19 UTC
reef git commit: [REEF-770] Remove InstanceId fields
Repository: reef
Updated Branches:
refs/heads/master 07f88b172 -> c27ea4220
[REEF-770] Remove InstanceId fields
This removes `InstanceId` properties from `internal` classes.
JIRA:
[REEF-770](https://issues.apache.org/jira/browse/REEF-770)
Pull Request:
Closes #895
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/c27ea422
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/c27ea422
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/c27ea422
Branch: refs/heads/master
Commit: c27ea42209617dfa87881cefdcc542ab16a5cc51
Parents: 07f88b1
Author: Andrew Chung <af...@gmail.com>
Authored: Mon Mar 21 13:31:38 2016 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Mon Mar 21 15:11:07 2016 -0700
----------------------------------------------------------------------
.../Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs | 4 ----
.../Bridge/Events/AllocatedEvaluator.cs | 4 ----
.../Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs | 7 -------
.../Bridge/Events/CompletedEvaluator.cs | 10 ----------
.../Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs | 4 ----
.../Bridge/Events/EvaluatorRequestor.cs | 4 ----
.../Bridge/Events/FailedEvaluator.cs | 7 -------
.../cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs | 4 ----
.../Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs | 5 -----
.../Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs | 3 ---
10 files changed, 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs
index 8c0af97..52c62e9 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ActiveContext.cs
@@ -36,15 +36,11 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
internal ActiveContext(IActiveContextClr2Java clr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
Clr2Java = clr2Java;
_serializer = new AvroConfigurationSerializer();
_parentId = Optional<string>.OfNullable(clr2Java.GetParentId());
}
- [DataMember]
- public string InstanceId { get; private set; }
-
private IActiveContextClr2Java Clr2Java { get; set; }
public string Id
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
index 694391c..28943fe 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/AllocatedEvaluator.cs
@@ -43,7 +43,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
public AllocatedEvaluator(IAllocatedEvaluatorClr2Java clr2Java, ISet<IConfigurationProvider> configurationProviders)
{
_configurationProviders = configurationProviders;
- InstanceId = Guid.NewGuid().ToString("N");
_serializer = new AvroConfigurationSerializer();
Clr2Java = clr2Java;
Id = Clr2Java.GetId();
@@ -52,9 +51,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
NameServerInfo = Clr2Java.GetNameServerInfo();
}
- [DataMember]
- public string InstanceId { get; set; }
-
public string Id { get; private set; }
public string EvaluatorBatchId { get; set; }
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs
index f5bc007..b528ab3 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/ClosedContext.cs
@@ -33,7 +33,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
internal ClosedContext(IClosedContextClr2Java clr2java)
{
- InstanceId = Guid.NewGuid().ToString("N");
Id = clr2java.GetId();
EvaluatorId = clr2java.GetEvaluatorId();
EvaluatorDescriptor = clr2java.GetEvaluatorDescriptor();
@@ -41,12 +40,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
}
/// <summary>
- /// An ID for the ClosedContext instance.
- /// </summary>
- [DataMember]
- public string InstanceId { get; private set; }
-
- /// <summary>
/// Gets the ID of the closed context.
/// </summary>
public string Id { get; private set; }
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedEvaluator.cs
index 83fe2c5..70c8288 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedEvaluator.cs
@@ -25,22 +25,12 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
[DataContract]
internal class CompletedEvaluator : ICompletedEvaluator
{
- private string _instanceId;
-
public CompletedEvaluator(ICompletedEvaluatorClr2Java clr2Java)
{
- _instanceId = Guid.NewGuid().ToString("N");
CompletedEvaluatorClr2Java = clr2Java;
}
[DataMember]
- public string InstanceId
- {
- get { return _instanceId; }
- set { _instanceId = value; }
- }
-
- [DataMember]
public string Id
{
get
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs
index a5007d6..6d983f8 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/CompletedTask.cs
@@ -28,14 +28,10 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
{
internal CompletedTask(ICompletedTaskClr2Java completedTaskClr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
CompletedTaskClr2Java = completedTaskClr2Java;
ActiveContextClr2Java = completedTaskClr2Java.GetActiveContext();
}
- [DataMember]
- public string InstanceId { get; set; }
-
public byte[] Message
{
get
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/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 e6292ee..43c17a5 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/EvaluatorRequestor.cs
@@ -40,7 +40,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
internal EvaluatorRequestor(IEvaluatorRequestorClr2Java clr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
Clr2Java = clr2Java;
}
@@ -56,9 +55,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
public IResourceCatalog ResourceCatalog { get; set; }
[DataMember]
- public string InstanceId { get; set; }
-
- [DataMember]
private IEvaluatorRequestorClr2Java Clr2Java { get; set; }
public void Submit(IEvaluatorRequest request)
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedEvaluator.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedEvaluator.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedEvaluator.cs
index 3e30fb4..bf126c0 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedEvaluator.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedEvaluator.cs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
@@ -24,20 +23,17 @@ using Org.Apache.REEF.Driver.Context;
using Org.Apache.REEF.Driver.Evaluator;
using Org.Apache.REEF.Driver.Task;
using Org.Apache.REEF.Utilities;
-using Org.Apache.REEF.Utilities.Logging;
namespace Org.Apache.REEF.Driver.Bridge.Events
{
[DataContract]
internal sealed class FailedEvaluator : IFailedEvaluator
{
- private static readonly Logger LOGGER = Logger.GetLogger(typeof(FailedEvaluator));
private readonly string _id;
private readonly IList<IFailedContext> _failedContexts;
public FailedEvaluator(IFailedEvaluatorClr2Java clr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
FailedEvaluatorClr2Java = clr2Java;
_id = FailedEvaluatorClr2Java.GetId();
_failedContexts = new List<IFailedContext>(
@@ -46,9 +42,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
}
[DataMember]
- public string InstanceId { get; set; }
-
- [DataMember]
private IFailedEvaluatorClr2Java FailedEvaluatorClr2Java { get; set; }
public string Id
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs
index f208df9..fa108b1 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/FailedTask.cs
@@ -33,7 +33,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
public FailedTask(IFailedTaskClr2Java failedTaskClr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
Parse(failedTaskClr2Java);
FailedTaskClr2Java = failedTaskClr2Java;
ActiveContextClr2Java = failedTaskClr2Java.GetActiveContext();
@@ -41,9 +40,6 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
public Optional<string> Reason { get; set; }
- [DataMember]
- public string InstanceId { get; set; }
-
public string Id { get; private set; }
public string Message { get; set; }
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs
index 4819799..c904f14 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Bridge/Events/SuspendedTask.cs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-using System;
using System.Runtime.Serialization;
using Org.Apache.REEF.Driver.Bridge.Clr2java;
using Org.Apache.REEF.Driver.Context;
@@ -28,14 +27,10 @@ namespace Org.Apache.REEF.Driver.Bridge.Events
{
internal SuspendedTask(ISuspendedTaskClr2Java suspendedTaskClr2Java)
{
- InstanceId = Guid.NewGuid().ToString("N");
SuspendedTaskClr2Java = suspendedTaskClr2Java;
ActiveContextClr2Java = suspendedTaskClr2Java.GetActiveContext();
}
- [DataMember]
- public string InstanceId { get; set; }
-
public byte[] Message
{
get
http://git-wip-us.apache.org/repos/asf/reef/blob/c27ea422/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs
index 9a01945..91bae8c 100644
--- a/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs
+++ b/lang/cs/Org.Apache.REEF.Driver/Evaluator/EvaluatorRequest.cs
@@ -61,9 +61,6 @@ namespace Org.Apache.REEF.Driver.Evaluator
}
[DataMember]
- public string InstanceId { get; set; }
-
- [DataMember]
public int MemoryMegaBytes { get; private set; }
[DataMember]