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/07/13 22:43:13 UTC
reef git commit: [REEF-1490] Remove ITaskMessageSource.Message.Set
Repository: reef
Updated Branches:
refs/heads/master 46e98f9d7 -> d0b675238
[REEF-1490] Remove ITaskMessageSource.Message.Set
This change:
* removes unused method ITaskMessageSource.Message.Set
* adds documentation for ITaskMessageSource interface
* modifies DefaultTaskMessageSource to return empty message
* adds DefaultContextMessageSource as default implementation
for IContextMessageSource
JIRA:
[REEF-1490](https://issues.apache.org/jira/browse/REEF-1490)
Pull request:
This closes #1075
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/d0b67523
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/d0b67523
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/d0b67523
Branch: refs/heads/master
Commit: d0b6752384700790a302c1dd9d1f10f384d69ba8
Parents: 46e98f9
Author: Mariia Mykhailova <ma...@apache.org>
Authored: Mon Jul 11 15:25:44 2016 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Wed Jul 13 15:42:23 2016 -0700
----------------------------------------------------------------------
.../Org.Apache.REEF.Common/Context/IContextMessageSource.cs | 3 +++
.../Tasks/Defaults/DefaultTaskMessageSource.cs | 9 +--------
lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs | 5 ++++-
.../Tasks/HelloTask/HelloTaskMessage.cs | 4 ----
.../Functional/Messaging/MessageTask.cs | 4 ----
5 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/d0b67523/lang/cs/Org.Apache.REEF.Common/Context/IContextMessageSource.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Context/IContextMessageSource.cs b/lang/cs/Org.Apache.REEF.Common/Context/IContextMessageSource.cs
index 967aa85..2971ccd 100644
--- a/lang/cs/Org.Apache.REEF.Common/Context/IContextMessageSource.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Context/IContextMessageSource.cs
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+using Org.Apache.REEF.Common.Context.Defaults;
+using Org.Apache.REEF.Tang.Annotations;
using Org.Apache.REEF.Utilities;
namespace Org.Apache.REEF.Common.Context
@@ -23,6 +25,7 @@ namespace Org.Apache.REEF.Common.Context
/// Implement (and bind) this interface to send messages from a context as part of a heartbeat from Evaluator to
/// Driver.
/// </summary>
+ [DefaultImplementation(typeof(DefaultContextMessageSource))]
public interface IContextMessageSource
{
Optional<ContextMessage> Message { get; }
http://git-wip-us.apache.org/repos/asf/reef/blob/d0b67523/lang/cs/Org.Apache.REEF.Common/Tasks/Defaults/DefaultTaskMessageSource.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Tasks/Defaults/DefaultTaskMessageSource.cs b/lang/cs/Org.Apache.REEF.Common/Tasks/Defaults/DefaultTaskMessageSource.cs
index 04f3105..0060f5b 100644
--- a/lang/cs/Org.Apache.REEF.Common/Tasks/Defaults/DefaultTaskMessageSource.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Tasks/Defaults/DefaultTaskMessageSource.cs
@@ -33,14 +33,7 @@ namespace Org.Apache.REEF.Common.Tasks.Defaults
{
get
{
- TaskMessage defaultTaskMessage = TaskMessage.From(
- "defaultSourceId",
- ByteUtilities.StringToByteArrays("default message generated at " + DateTime.Now.ToString(CultureInfo.InvariantCulture)));
- return Optional<TaskMessage>.Of(defaultTaskMessage);
- }
-
- set
- {
+ return Optional<TaskMessage>.Empty();
}
}
}
http://git-wip-us.apache.org/repos/asf/reef/blob/d0b67523/lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs b/lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs
index 21f78e6..967f3ce 100644
--- a/lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Tasks/ITaskMessageSource.cs
@@ -21,9 +21,12 @@ using Org.Apache.REEF.Utilities;
namespace Org.Apache.REEF.Common.Tasks
{
+ /// <summary>
+ /// Implement (and bind) this interface to send messages from a task as part of a heartbeat from Evaluator to Driver.
+ /// </summary>
[DefaultImplementation(typeof(DefaultTaskMessageSource))]
public interface ITaskMessageSource
{
- Optional<TaskMessage> Message { get; set; }
+ Optional<TaskMessage> Message { get; }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/d0b67523/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTaskMessage.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTaskMessage.cs b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTaskMessage.cs
index 71dc8eb..a7b07f6 100644
--- a/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTaskMessage.cs
+++ b/lang/cs/Org.Apache.REEF.Examples/Tasks/HelloTask/HelloTaskMessage.cs
@@ -39,10 +39,6 @@ namespace Org.Apache.REEF.Examples.Tasks.HelloTask
ByteUtilities.StringToByteArrays("hello message generated at " + DateTime.Now.ToString(CultureInfo.InvariantCulture)));
return Optional<TaskMessage>.Of(defaultTaskMessage);
}
-
- set
- {
- }
}
}
}
http://git-wip-us.apache.org/repos/asf/reef/blob/d0b67523/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
index cfe2483..c1d5d6c 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
+++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/MessageTask.cs
@@ -63,10 +63,6 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging
return Optional<TaskMessage>.Of(defaultTaskMessage);
}
-
- set
- {
- }
}
public byte[] Call(byte[] memento)