You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/04/18 18:13:11 UTC
incubator-asterixdb git commit: need just 1 interface method as
byte[] is Serializable
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 1eedb4cb3 -> 22302e75d
need just 1 interface method as byte[] is Serializable
Change-Id: I471c800037781b678d2a6ba2ba0281f78623e7bf
Reviewed-on: https://asterix-gerrit.ics.uci.edu/800
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <hu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/22302e75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/22302e75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/22302e75
Branch: refs/heads/master
Commit: 22302e75d02f0dbd4ca8ec21e40146a764692b4a
Parents: 1eedb4c
Author: Till Westmann <ti...@apache.org>
Authored: Wed Apr 13 18:12:09 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Mon Apr 18 09:13:36 2016 -0700
----------------------------------------------------------------------
.../org/apache/hyracks/api/context/IHyracksTaskContext.java | 4 +---
.../org/apache/hyracks/api/util/JavaSerializationUtils.java | 3 +++
.../src/main/java/org/apache/hyracks/control/nc/Task.java | 5 -----
.../java/org/apache/hyracks/test/support/TestTaskContext.java | 5 -----
4 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/22302e75/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
index 58adccb..b0f6269 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
@@ -41,11 +41,9 @@ public interface IHyracksTaskContext
public IDatasetPartitionManager getDatasetPartitionManager();
- public void sendApplicationMessageToCC(byte[] message, DeploymentId deploymendId) throws Exception;
+ public void sendApplicationMessageToCC(Serializable message, DeploymentId deploymentId) throws Exception;
public void setSharedObject(Object sharedObject);
public Object getSharedObject();
-
- public void sendApplicationMessageToCC(Serializable message, DeploymentId deploymentId) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/22302e75/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
index 1324c3f..1d85fb9 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java
@@ -31,6 +31,9 @@ import java.lang.reflect.Proxy;
public class JavaSerializationUtils {
public static byte[] serialize(Serializable jobSpec) throws IOException {
+ if (jobSpec instanceof byte[]) {
+ return (byte[]) jobSpec;
+ }
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(jobSpec);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/22302e75/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
index 134154c..5eee4b3 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
@@ -384,11 +384,6 @@ public class Task implements IHyracksTaskContext, ICounterContext, Runnable {
}
@Override
- public void sendApplicationMessageToCC(byte[] message, DeploymentId deploymentId) throws Exception {
- this.ncs.sendApplicationMessageToCC(message, deploymentId);
- }
-
- @Override
public void sendApplicationMessageToCC(Serializable message, DeploymentId deploymentId) throws Exception {
this.ncs.sendApplicationMessageToCC(JavaSerializationUtils.serialize(message), deploymentId);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/22302e75/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
index ee2bff5..a3b67ca 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
@@ -134,11 +134,6 @@ public class TestTaskContext implements IHyracksTaskContext {
}
@Override
- public void sendApplicationMessageToCC(byte[] message, DeploymentId deploymentId) throws Exception {
-
- }
-
- @Override
public void sendApplicationMessageToCC(Serializable message, DeploymentId deploymentId) throws Exception {
}