Skip to content

Commit

Permalink
Benchmarking json perf again.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cnuernber
cnuernber committed Apr 8, 2022
1 parent 2004a14 commit 6b7a3b5
Show file tree
Hide file tree
Showing 4 changed files with 187 additions and 120 deletions.
35 changes: 28 additions & 7 deletions java/tech/v3/datatype/CharBuffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,46 @@ public CharBuffer(boolean _trimLeading, boolean _trimTrailing, boolean _nilEmpty
public CharBuffer() {
this(false, false, false);
}
public final void ensureCapacity(int newlen) {
public final char[] ensureCapacity(int newlen) {
if (newlen >= buffer.length) {
char[] newbuffer = new char[newlen * 2];
System.arraycopy(buffer, 0, newbuffer, 0, len);
buffer = newbuffer;
}
return buffer;
}
public final void append(char val) {
ensureCapacity(len+1);
buffer[len] = val;
char[] buf = buffer;
//common case first
if (len < buf.length) {
buf[len] = val;
++len;
return;
}
buf = ensureCapacity(len+1);
buf[len] = val;
++len;
}
public final void append(char[] data, int startoff, int endoff) {
if(startoff < endoff) {
int nchars = endoff - startoff;
int newlen = len + nchars;
ensureCapacity(newlen);
System.arraycopy(data,startoff,buffer,len,nchars);
len += nchars;
char[] buf = buffer;
int buflen = len;
int remaining = buf.length - buflen;
//common case
if (nchars < remaining) {
for(; startoff < endoff; ++startoff, ++buflen)
buf[buflen] = data[startoff];
len = buflen;
} else {
int newlen = buflen + nchars;
buf = ensureCapacity(newlen);
for (; startoff < endoff; ++startoff, ++buflen)
buf[buflen] = data[startoff];
// Usually we are appending small things.
// System.arraycopy(data,startoff,buffer,len,nchars);
len += nchars;
}
}
}
public final void clear() { len = 0; }
Expand Down
154 changes: 92 additions & 62 deletions java/tech/v3/datatype/JSONReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,68 @@
import clojure.lang.PersistentHashMap;
import clojure.lang.LazilyPersistentVector;
import clojure.lang.Keyword;
import clojure.lang.ITransientVector;
import clojure.lang.ITransientMap;
import clojure.lang.PersistentVector;


public final class JSONReader implements AutoCloseable {
CharReader reader;
public interface ObjReader {
public Object newObj();
public Object onKV(Object obj, Object k, Object v);
public default Object finalizeObj(Object obj) { return obj; }
};
public static final ObjReader immutableObjReader = new ObjReader() {
public Object newObj() { return PersistentHashMap.EMPTY.asTransient(); }
public Object onKV(Object obj, Object k, Object v) {
return ((ITransientMap)obj).assoc(k, v);
}
public Object finalizeObj(Object obj) {
return ((ITransientMap)obj).persistent();
}
};
public static final ObjReader mutableObjReader = new ObjReader() {
public Object newObj() { return new HashMap<Object,Object>(); }
public Object onKV(Object obj, Object k, Object v) {
((HashMap<Object,Object>)obj).put(k,v);
return obj;
}
};

public interface ArrayReader {
public Object newArray();
public Object onValue(Object ary, Object v);
public default Object finalizeArray(Object ary) { return ary; }
};
public static final ArrayReader immutableArrayReader = new ArrayReader() {
public Object newArray() { return PersistentVector.EMPTY.asTransient(); }
public Object onValue(Object ary, Object v) {
return ((ITransientVector)ary).conj(v);
}
public Object finalizeArray(Object obj) {
return ((ITransientVector)obj).persistent();
}
};
public static final ArrayReader mutableArrayReader = new ArrayReader() {
public Object newArray() { return new ArrayList<Object>(); }
public Object onValue(Object ary, Object v) {
((ArrayList<Object>)ary).add(v);
return ary;
}
};
//Parsing specialization functions
public final Function<String,Object> doubleFn;
public final Function<String,Object> keyFn;
public final BiFunction<Object,Object,Object> valFn;
public final Function<Object[],Object> mapFn;
public final Function<Object[],Object> listFn;
// public final Function<String,Object> keyFn;
// public final BiFunction<Object,Object,Object> valFn;
// public final Function<Object[],Object> mapFn;
// public final Function<Object[],Object> listFn;
public final Supplier<Object> eofFn;

public final ObjReader objReader;
public final ArrayReader aryReader;
//Top level object parsing context
final ArrayList<ArrayList<Object>> contextStack = new ArrayList<ArrayList<Object>>();
int stackDepth = 0;
// final ArrayList<ArrayList<Object>> contextStack = new ArrayList<ArrayList<Object>>();
// int stackDepth = 0;
//We only need one temp buffer for various string building activities
final CharBuffer charBuffer = new CharBuffer();
//A temp buffer for reading out fixed sequences of characters
Expand All @@ -54,31 +101,27 @@ public final class JSONReader implements AutoCloseable {

public static final Keyword elidedValue = Keyword.intern("tech.v3.datatype.char-input", "elided");

final void pushContext() {
++stackDepth;
}
final void popContext() {
--stackDepth;
if (stackDepth < 0)
throw new RuntimeException("Stack underflow");
}
final ArrayList<Object> currentContext() {
for(int needed = stackDepth - contextStack.size() + 1; needed > 0; --needed)
contextStack.add(new ArrayList<Object>());
return contextStack.get(stackDepth);
}
// final void pushContext() {
// ++stackDepth;
// }
// final void popContext() {
// --stackDepth;
// if (stackDepth < 0)
// throw new RuntimeException("Stack underflow");
// }
// final ArrayList<Object> currentContext() {
// for(int needed = stackDepth - contextStack.size() + 1; needed > 0; --needed)
// contextStack.add(new ArrayList<Object>());
// return contextStack.get(stackDepth);
// }

public JSONReader(Function<String,Object> _doubleFn,
Function<String,Object> _keyFn,
BiFunction<Object,Object,Object> _valFn,
Function<Object[],Object> _listFn,
Function<Object[],Object> _mapFn,
ArrayReader _aryReader,
ObjReader _objReader,
Supplier<Object> _eofFn) {
doubleFn = orDefault(_doubleFn, defaultDoubleParser);
keyFn = orDefault(_keyFn, strIdentityFn);
valFn = orDefault(_valFn, defaultValFn);
listFn = orDefault(_listFn, defaultListFn);
mapFn = orDefault(_mapFn, defaultMapFn);
aryReader = _aryReader != null ? _aryReader : immutableArrayReader;
objReader = _objReader != null ? _objReader : immutableObjReader;
eofFn = orDefault(_eofFn, defaultEOFFn);
}

Expand Down Expand Up @@ -134,6 +177,7 @@ final String readString() throws Exception {
pos = startpos - 1;
}
}
cb.append(buffer,startpos,len);
buffer = reader.nextBuffer();
}
throw new EOFException("EOF while reading string: " + cb.toString());
Expand Down Expand Up @@ -201,34 +245,37 @@ final Object readNumber(final char firstChar) throws Exception {
else if (nextChar == 'e' ||
nextChar == 'E' ||
nextChar == '.') {
if (nextChar == '.')
dotIndex = cb.length() + pos - startpos;
if (nextChar == '.') {
//if appending in blocks
dotIndex = cb.length() + pos - startpos;
//if appending in singles
//dotIndex = cb.length() - 1;
}
integer = false;
}
}
cb.append(buffer, startpos, len);
cb.append(buffer, startpos, pos);
buffer = reader.nextBuffer();
}
return finalizeNumber(cb, integer, firstChar, dotIndex);
}

final Object readList() throws Exception {
final ArrayList<Object> dataBuf = currentContext();
dataBuf.clear();
boolean hasNext = true;
boolean first = true;
Object aryObj = aryReader.newArray();
while (!reader.eof()) {
final char nextChar = reader.eatwhite();
if (nextChar == ']') {
if (hasNext && !first)
throw new Exception("One too many commas in your list my friend");
return listFn.apply(dataBuf.toArray());
return aryReader.finalizeArray(aryObj);
} else if (nextChar != 0) {
if (!hasNext)
throw new Exception("One too few commas in your list my friend");
first = false;
reader.unread();
dataBuf.add(readObject());
aryObj = aryReader.onValue(aryObj, readObject());
hasNext = reader.eatwhite() == ',';
if (!hasNext)
reader.unread();
Expand Down Expand Up @@ -267,42 +314,36 @@ final Object readList() throws Exception {
/* } */

final Object readMap() throws Exception {
final ArrayList<Object> dataBuf = currentContext();
dataBuf.clear();
boolean hasNext = true;
boolean first = true;
//By the json specification, keys must be strings.
Object mapObj = objReader.newObj();
while(!reader.eof()) {
char nextChar = reader.eatwhite();
if (nextChar == '}') {
if (hasNext && !first)
throw new Exception("One too many commas in your map my friend: "
+ dataBuf.toString());
return mapFn.apply(dataBuf.toArray());
+ String.valueOf(objReader.finalizeObj(mapObj)));
return objReader.finalizeObj(mapObj);
} else {
first = false;
if (!hasNext)
throw new Exception ("One too few commas in your map my friend: "
+ dataBuf.toString());
Object keyVal = null;
+ String.valueOf(objReader.finalizeObj(mapObj)));
String keyVal = null;
if (nextChar == '"')
keyVal = keyFn.apply(readString());
keyVal = readString();
else
throw new Exception("JSON keys must be quoted strings.");

nextChar = reader.eatwhite();
if (nextChar != ':')
throw new Exception("Map keys must be followed by a ':'");
Object valVal = readObject();
valVal = valFn.apply(keyVal, valVal);
//Note reference equality here
if (valVal != elidedValue) {
dataBuf.add(keyVal);
dataBuf.add(valVal);
}
mapObj = objReader.onKV(mapObj, keyVal, valVal);
nextChar = reader.eatwhite();
if ( nextChar == 0 )
throw new EOFException("EOF while reading map: " + dataBuf.toString());
throw new EOFException("EOF while reading map: " + String.valueOf(objReader.finalizeObj(mapObj)));
hasNext = nextChar == ',';
if (!hasNext)
reader.unread();
Expand Down Expand Up @@ -338,18 +379,8 @@ public final Object readObject() throws Exception {
return null;
throw new Exception("JSON parse error - unrecognized 'null' entry.");
}
case '[': {
pushContext();
final Object retval = readList();
popContext();
return retval;
}
case '{': {
pushContext();
final Object retval = readMap();
popContext();
return retval;
}
case '[': return readList();
case '{': return readMap();
case 0:
if (reader.eof()) {
close();
Expand All @@ -363,7 +394,6 @@ public final Object readObject() throws Exception {
}

public void beginParse(CharReader rdr) {
stackDepth = 0;
reader = rdr;
}

Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject cnuernber/dtype-next "9.024-SNAPHOT"
(defproject cnuernber/dtype-next "9.024-SNAPSHOT"
:description "A Clojure library designed to aid in the implementation of high performance algorithms and systems."
:url "http://github.com/cnuernber/dtype-next"
:license {:name "EPL-2.0"
Expand Down

0 comments on commit 6b7a3b5

Please sign in to comment.