Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/808
Change subject: Avoid 1 copy of the data when returning results
......................................................................
Avoid 1 copy of the data when returning results
Change-Id: I8728b218e8f8e20d3e58be46c704f75ef2288933
---
M asterixdb/asterix-app/src/main/java/org/apache/asterix/result/ResultUtils.java
1 file changed, 30 insertions(+), 42 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/08/808/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/result/ResultUtils.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/result/ResultUtils.java
index d7ddce5..f8922a3 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/result/ResultUtils.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/result/ResultUtils.java
@@ -24,6 +24,7 @@
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +44,6 @@
import org.apache.hyracks.api.comm.VSizeFrame;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.control.nc.resources.memory.FrameManager;
-import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -74,11 +74,9 @@
return s;
}
- public static void displayCSVHeader(ARecordType recordType, SessionConfig
conf)
- throws AsterixException {
+ public static void displayCSVHeader(ARecordType recordType, SessionConfig
conf) throws AsterixException {
if (recordType == null) {
- throw new AsterixException(
- "Cannot output CSV with header without specifying
output-record-type");
+ throw new AsterixException("Cannot output CSV with header without
specifying output-record-type");
}
// If HTML-ifying, we have to output this here before the header -
// pretty ugly
@@ -109,7 +107,6 @@
IFrame frame = new VSizeFrame(resultDisplayFrameMgr);
int bytesRead = resultReader.read(frame);
- ByteBufferInputStream bbis = new ByteBufferInputStream();
// Whether we are wrapping the output sequence in an array
boolean wrap_array = false;
@@ -145,46 +142,37 @@
final boolean indentJSON = conf.is(SessionConfig.INDENT_JSON);
if (bytesRead > 0) {
do {
- try {
- fta.reset(frame.getBuffer());
- int last = fta.getTupleCount();
- String result;
- for (int tIndex = 0; tIndex < last; tIndex++) {
- int start = fta.getTupleStartOffset(tIndex);
- int length = fta.getTupleEndOffset(tIndex) - start;
- bbis.setByteBuffer(frame.getBuffer(), start);
- byte[] recordBytes = new byte[length];
- int numread = bbis.read(recordBytes, 0, length);
- if (conf.fmt() == OutputFormat.CSV) {
- if ((numread > 0) && (recordBytes[numread - 1] ==
'\n')) {
- numread--;
- }
+ ByteBuffer frameBuffer = frame.getBuffer();
+ fta.reset(frameBuffer);
+ int last = fta.getTupleCount();
+ String result;
+ for (int tIndex = 0; tIndex < last; tIndex++) {
+ int start = fta.getTupleStartOffset(tIndex);
+ int length = fta.getTupleEndOffset(tIndex) - start;
+ byte[] frameBytes = frameBuffer.array();
+ if (conf.fmt() == OutputFormat.CSV) {
+ if ((length > 0) && (frameBytes[start + length - 1] ==
'\n')) {
+ length--;
}
- result = new String(recordBytes, 0, numread, UTF_8);
- if (wrap_array && notfirst) {
- conf.out().print(", ");
- }
- notfirst = true;
- if (indentJSON) {
- // TODO(tillw): this is inefficient - do this
during result generation
- result = JSONUtil.indent(result, 2);
- }
- conf.out().print(result);
- if (conf.fmt() == OutputFormat.CSV) {
- conf.out().print("\r\n");
- }
- ++stats.count;
- // TODO(tillw) fix this approximation
- stats.size += result.length();
}
- frame.getBuffer().clear();
- } finally {
- try {
- bbis.close();
- } catch (IOException e) {
- throw new HyracksDataException(e);
+ result = new String(frameBytes, start, length, UTF_8);
+ if (wrap_array && notfirst) {
+ conf.out().print(", ");
}
+ notfirst = true;
+ if (indentJSON) {
+ // TODO(tillw): this is inefficient - do this during
result generation
+ result = JSONUtil.indent(result, 2);
+ }
+ conf.out().print(result);
+ if (conf.fmt() == OutputFormat.CSV) {
+ conf.out().print("\r\n");
+ }
+ ++stats.count;
+ // TODO(tillw) fix this approximation
+ stats.size += result.length();
}
+ frameBuffer.clear();
} while (resultReader.read(frame) > 0);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/808
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8728b218e8f8e20d3e58be46c704f75ef2288933
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <[email protected]>
