Fix the tests and code to support server side serialization.
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_result_distribution@2982 123451ca-8445-de46-9d55-352943316053
diff --git a/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java b/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
index 439420a..a6ebf01 100644
--- a/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
+++ b/algebricks/algebricks-data/src/main/java/edu/uci/ics/hyracks/algebricks/data/IResultSerializerFactoryProvider.java
@@ -23,7 +23,7 @@
public interface IResultSerializerFactoryProvider extends Serializable {
/**
- * Creates a result serialized appender
+ * Returns a result serializer factory
*
* @param fields
* - A position of the fields in the order it should be written in the output.
@@ -35,6 +35,6 @@
* - The record descriptor describing the input frame to be serialized.
* @return A new instance of result serialized appender.
*/
- public IResultSerializerFactory getAqlResultAppenderFactoryProvider(int[] fields,
+ public IResultSerializerFactory getAqlResultSerializerFactoryProvider(int[] fields,
IPrinterFactory[] printerFactories, IAWriterFactory writerFactory, RecordDescriptor inputRecordDesc);
}
diff --git a/hyracks/hyracks-control/hyracks-control-common/src/main/java/edu/uci/ics/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java b/hyracks/hyracks-control/hyracks-control-common/src/main/java/edu/uci/ics/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
index 3603f39..091a5d2 100644
--- a/hyracks/hyracks-control/hyracks-control-common/src/main/java/edu/uci/ics/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
+++ b/hyracks/hyracks-control/hyracks-control-common/src/main/java/edu/uci/ics/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
@@ -97,11 +97,10 @@
}
@Override
- public void registerResultPartitionLocation(JobId jobId, ResultSetId rsId, boolean orderedResult,
- byte[] serializedRecordDescriptor, int partition, int nPartitions, NetworkAddress networkAddress)
- throws Exception {
+ public void registerResultPartitionLocation(JobId jobId, ResultSetId rsId, boolean orderedResult, int partition,
+ int nPartitions, NetworkAddress networkAddress) throws Exception {
CCNCFunctions.RegisterResultPartitionLocationFunction fn = new CCNCFunctions.RegisterResultPartitionLocationFunction(
- jobId, rsId, orderedResult, serializedRecordDescriptor, partition, nPartitions, networkAddress);
+ jobId, rsId, orderedResult, partition, nPartitions, networkAddress);
ipcHandle.send(-1, fn, null);
}
diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
index dd961c8..2ba82b1 100644
--- a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/edu/uci/ics/hyracks/tests/integration/AbstractIntegrationTest.java
@@ -16,7 +16,7 @@
import java.io.File;
import java.io.IOException;
-import java.io.OutputStream;
+import java.io.PrintStream;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
@@ -132,7 +132,6 @@
IHyracksDataset hyracksDataset = new HyracksDataset(hcc, datasetClientCtx, nReaders);
hyracksDataset.open(jobId, spec.getResultSetIds().get(0));
- byte[] serializedRecordDescriptor = hyracksDataset.getSerializedRecordDescriptor();
/* FrameTupleAccessor frameTupleAccessor = new FrameTupleAccessor(datasetClientCtx.getFrameSize(),
recordDescriptor);
@@ -205,7 +204,7 @@
private static final long serialVersionUID = 1L;
@Override
- public IResultSerializer createResultSerializer(final OutputStream frameOutputStream) {
+ public IResultSerializer createResultSerializer(final PrintStream printStream) {
return new IResultSerializer() {
private static final long serialVersionUID = 1L;