|
From: Bryan T. <tho...@us...> - 2007-04-12 23:59:44
|
Update of /cvsroot/cweb/bigdata/src/java/com/bigdata/journal In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2548/src/java/com/bigdata/journal Modified Files: Name2Addr.java CommitRecordIndex.java Log Message: Added a Sesame 1.x SAIL implementation. This is NOT intended for production use. It is just being done to gain a high-level query language integration for the triple store. Index: CommitRecordIndex.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/CommitRecordIndex.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CommitRecordIndex.java 27 Mar 2007 14:34:23 -0000 1.4 --- CommitRecordIndex.java 12 Apr 2007 23:59:34 -0000 1.5 *************** *** 1,10 **** package com.bigdata.journal; ! import java.io.DataInputStream; ! import java.io.DataOutputStream; import java.io.IOException; import java.util.UUID; import org.CognitiveWeb.extser.LongPacker; import com.bigdata.cache.LRUCache; --- 1,10 ---- package com.bigdata.journal; ! import java.io.DataInput; import java.io.IOException; import java.util.UUID; import org.CognitiveWeb.extser.LongPacker; + import org.CognitiveWeb.extser.ShortPacker; import com.bigdata.cache.LRUCache; *************** *** 12,15 **** --- 12,16 ---- import com.bigdata.objndx.BTree; import com.bigdata.objndx.BTreeMetadata; + import com.bigdata.objndx.DataOutputBuffer; import com.bigdata.objndx.IValueSerializer; import com.bigdata.objndx.KeyBuilder; *************** *** 365,377 **** public static transient final IValueSerializer INSTANCE = new ValueSerializer(); ! final public static transient int VERSION0 = 0x0; public ValueSerializer() { } ! public void putValues(DataOutputStream os, Object[] values, int n) throws IOException { ! os.writeInt(VERSION0); for (int i = 0; i < n; i++) { --- 366,378 ---- public static transient final IValueSerializer INSTANCE = new ValueSerializer(); ! final public static transient short VERSION0 = 0x0; public ValueSerializer() { } ! public void putValues(DataOutputBuffer os, Object[] values, int n) throws IOException { ! os.packShort(VERSION0); for (int i = 0; i < n; i++) { *************** *** 379,384 **** Entry entry = (Entry) values[i]; ! LongPacker.packLong(os, entry.commitTime); ! LongPacker.packLong(os, entry.addr); } --- 380,387 ---- Entry entry = (Entry) values[i]; ! // LongPacker.packLong(os, entry.commitTime); ! // LongPacker.packLong(os, entry.addr); ! os.packLong(entry.commitTime); ! os.packLong(entry.addr); } *************** *** 386,393 **** } ! public void getValues(DataInputStream is, Object[] values, int n) throws IOException { ! final int version = is.readInt(); if (version != VERSION0) --- 389,396 ---- } ! public void getValues(DataInput is, Object[] values, int n) throws IOException { ! final short version = ShortPacker.unpackShort(is); if (version != VERSION0) Index: Name2Addr.java =================================================================== RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/journal/Name2Addr.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Name2Addr.java 27 Mar 2007 14:34:23 -0000 1.8 --- Name2Addr.java 12 Apr 2007 23:59:34 -0000 1.9 *************** *** 1,6 **** package com.bigdata.journal; ! import java.io.DataInputStream; ! import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; --- 1,6 ---- package com.bigdata.journal; ! import java.io.DataInput; ! import java.io.DataOutput; import java.io.IOException; import java.util.HashMap; *************** *** 11,17 **** --- 11,19 ---- import org.CognitiveWeb.extser.LongPacker; + import org.CognitiveWeb.extser.ShortPacker; import com.bigdata.objndx.BTree; import com.bigdata.objndx.BTreeMetadata; + import com.bigdata.objndx.DataOutputBuffer; import com.bigdata.objndx.IIndex; import com.bigdata.objndx.IValueSerializer; *************** *** 359,363 **** /** * The values are {@link Entry}s. ! * * @author <a href="mailto:tho...@us...">Bryan Thompson</a> * @version $Id$ --- 361,365 ---- /** * The values are {@link Entry}s. ! * * @author <a href="mailto:tho...@us...">Bryan Thompson</a> * @version $Id$ *************** *** 369,384 **** public static transient final IValueSerializer INSTANCE = new ValueSerializer(); ! /** ! * Note: It is faster to use packed longs, at least on write with ! * test data (bulk load of wordnet nouns). ! */ ! final static boolean packedLongs = true; public ValueSerializer() { } ! public void putValues(DataOutputStream os, Object[] values, int n) throws IOException { for (int i = 0; i < n; i++) { --- 371,384 ---- public static transient final IValueSerializer INSTANCE = new ValueSerializer(); ! final public static transient short VERSION0 = 0x0; public ValueSerializer() { } ! public void putValues(DataOutputBuffer os, Object[] values, int n) throws IOException { + os.packShort(VERSION0); + for (int i = 0; i < n; i++) { *************** *** 387,399 **** os.writeUTF(entry.name); ! if (packedLongs) { ! ! LongPacker.packLong(os, entry.addr); ! ! } else { ! ! os.writeLong(entry.addr); ! } } --- 387,401 ---- os.writeUTF(entry.name); ! Addr.pack(os, entry.addr); ! // if (packedLongs) { ! // ! // LongPacker.packLong(os, entry.addr); ! // ! // } else { ! // ! // os.writeLong(entry.addr); ! // ! // } } *************** *** 401,407 **** } ! public void getValues(DataInputStream is, Object[] values, int n) throws IOException { for (int i = 0; i < n; i++) { --- 403,414 ---- } ! public void getValues(DataInput is, Object[] values, int n) throws IOException { + final short version = ShortPacker.unpackShort(is); + + if (version != VERSION0) + throw new RuntimeException("Unknown version: " + version); + for (int i = 0; i < n; i++) { *************** *** 410,422 **** final long addr; ! if (packedLongs) { ! ! addr = Long.valueOf(LongPacker.unpackLong(is)); ! ! } else { ! ! addr = Long.valueOf(is.readLong()); ! ! } values[i] = new Entry(name,addr); --- 417,431 ---- final long addr; ! // if (packedLongs) { ! // ! // addr = Long.valueOf(LongPacker.unpackLong(is)); ! // ! // } else { ! // ! // addr = Long.valueOf(is.readLong()); ! // ! // } ! ! addr = Addr.unpack(is); values[i] = new Entry(name,addr); |