Till Westmann has submitted this change and it was merged. Change subject: need just 1 interface method as byte[] is Serializable ......................................................................
need just 1 interface method as byte[] is Serializable Change-Id: I471c800037781b678d2a6ba2ba0281f78623e7bf Reviewed-on: https://asterix-gerrit.ics.uci.edu/800 Tested-by: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/JavaSerializationUtils.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java 4 files changed, 4 insertions(+), 13 deletions(-) Approvals: Murtadha Hubail: Looks good to me, approved Jenkins: Verified 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 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; } 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 @@ 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); 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 @@ } @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); } 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 @@ } @Override - public void sendApplicationMessageToCC(byte[] message, DeploymentId deploymentId) throws Exception { - - } - - @Override public void sendApplicationMessageToCC(Serializable message, DeploymentId deploymentId) throws Exception { } -- To view, visit https://asterix-gerrit.ics.uci.edu/800 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I471c800037781b678d2a6ba2ba0281f78623e7bf Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
