Reverting the merge of fullstack_hyracks_result_distribution branch until all the tests pass.
git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization@3033 123451ca-8445-de46-9d55-352943316053
diff --git a/hyracks/hyracks-dataflow-common/pom.xml b/hyracks/hyracks-dataflow-common/pom.xml
index 393e97f..a0ffb66 100644
--- a/hyracks/hyracks-dataflow-common/pom.xml
+++ b/hyracks/hyracks-dataflow-common/pom.xml
@@ -15,8 +15,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
diff --git a/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/comm/io/FrameOutputStream.java b/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/comm/io/FrameOutputStream.java
deleted file mode 100644
index 95833b1..0000000
--- a/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/comm/io/FrameOutputStream.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2009-2010 by The Regents of the University of California
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * you may obtain a copy of the License from
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package edu.uci.ics.hyracks.dataflow.common.comm.io;
-
-import java.nio.ByteBuffer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
-import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender;
-
-public class FrameOutputStream extends ByteArrayAccessibleOutputStream {
- private static final Logger LOGGER = Logger.getLogger(FrameOutputStream.class.getName());
-
- private final FrameTupleAppender frameTupleAppender;
-
- public FrameOutputStream(int frameSize) {
- this.frameTupleAppender = new FrameTupleAppender(frameSize);
- }
-
- public void reset(ByteBuffer buffer, boolean clear) {
- frameTupleAppender.reset(buffer, clear);
- }
-
- public int getTupleCount() {
- int tupleCount = frameTupleAppender.getTupleCount();
- if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.finest("appendTuple(): tuple count: " + tupleCount);
- }
- return tupleCount;
- }
-
- public boolean appendTuple() {
- if (LOGGER.isLoggable(Level.FINEST)) {
- LOGGER.finest("appendTuple(): tuple size: " + count);
- }
- boolean appended = frameTupleAppender.append(buf, 0, count);
- count = 0;
- return appended;
- }
-}