[cweb-CVS] bigdata-rdf/src/java/com/bigdata/rdf/serializers TermIdSerializer.java, 1.1, 1.2 StatementSerializer.java, 1.1, 1.2 RdfValueSerializer.java, 1.2, 1.3 DefaultRdfValueSerializer.java, 1.1, NONE

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/serializers
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv2483/src/java/com/bigdata/rdf/serializers

Modified Files:
	TermIdSerializer.java StatementSerializer.java 
	RdfValueSerializer.java 
Removed Files:
	DefaultRdfValueSerializer.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: TermIdSerializer.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/serializers/TermIdSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TermIdSerializer.java	9 Feb 2007 20:18:56 -0000	1.1
--- TermIdSerializer.java	12 Apr 2007 23:59:21 -0000	1.2
***************
*** 44,53 ****
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInputStream;
! import java.io.DataOutputStream;
  import java.io.IOException;
  
  import org.CognitiveWeb.extser.LongPacker;
  
  import com.bigdata.objndx.IValueSerializer;
  
--- 44,53 ----
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInput;
  import java.io.IOException;
  
  import org.CognitiveWeb.extser.LongPacker;
  
+ import com.bigdata.objndx.DataOutputBuffer;
  import com.bigdata.objndx.IValueSerializer;
  
***************
*** 73,77 ****
      public TermIdSerializer() {}
      
!     public void getValues(DataInputStream is, Object[] values, int n)
              throws IOException {
  
--- 73,77 ----
      public TermIdSerializer() {}
      
!     public void getValues(DataInput is, Object[] values, int n)
              throws IOException {
  
***************
*** 92,96 ****
      }
  
!     public void putValues(DataOutputStream os, Object[] values, int n)
              throws IOException {
  
--- 92,96 ----
      }
  
!     public void putValues(DataOutputBuffer os, Object[] values, int n)
              throws IOException {
  
***************
*** 99,103 ****
              if(packedLongs) {
  
!                 LongPacker.packLong(os, ((Long) values[i]).longValue());
                  
              } else {
--- 99,104 ----
              if(packedLongs) {
  
! //                LongPacker.packLong(os, ((Long) values[i]).longValue());
!                 os.packLong(((Long) values[i]).longValue());
                  
              } else {

--- DefaultRdfValueSerializer.java DELETED ---

Index: RdfValueSerializer.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/serializers/RdfValueSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RdfValueSerializer.java	29 Mar 2007 17:01:47 -0000	1.2
--- RdfValueSerializer.java	12 Apr 2007 23:59:21 -0000	1.3
***************
*** 44,49 ****
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInputStream;
! import java.io.DataOutputStream;
  import java.io.IOException;
  
--- 44,49 ----
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInput;
! import java.io.DataOutput;
  import java.io.IOException;
  
***************
*** 51,54 ****
--- 51,55 ----
  import org.openrdf.model.Value;
  
+ import com.bigdata.objndx.DataOutputBuffer;
  import com.bigdata.objndx.IIndex;
  import com.bigdata.objndx.IValueSerializer;
***************
*** 89,93 ****
      public RdfValueSerializer() {}
      
!     protected void writeUTF(DataOutputStream os,String s) throws IOException {
          
          if (utfCompression) {
--- 90,94 ----
      public RdfValueSerializer() {}
      
!     protected void writeUTF(DataOutputBuffer os,String s) throws IOException {
          
          if (utfCompression) {
***************
*** 95,99 ****
              byte[] data = UnicodeCompressor.compress(s);
  
!             LongPacker.packLong(os, data.length);
  
              os.write(data);
--- 96,101 ----
              byte[] data = UnicodeCompressor.compress(s);
  
! //            LongPacker.packLong(os, data.length);
!             os.packLong(data.length);
  
              os.write(data);
***************
*** 107,111 ****
      }
      
!     protected String readUTF(DataInputStream is) throws IOException {
          
          if(utfCompression) {
--- 109,113 ----
      }
      
!     protected String readUTF(DataInput is) throws IOException {
          
          if(utfCompression) {
***************
*** 127,131 ****
      }
      
!     public void getValues(DataInputStream is, Object[] vals, int n)
              throws IOException {
  
--- 129,133 ----
      }
      
!     public void getValues(DataInput is, Object[] vals, int n)
              throws IOException {
  
***************
*** 168,172 ****
      }
  
!     public void putValues(DataOutputStream os, Object[] vals, int n)
              throws IOException {
  
--- 170,174 ----
      }
  
!     public void putValues(DataOutputBuffer os, Object[] vals, int n)
              throws IOException {
  

Index: StatementSerializer.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/serializers/StatementSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StatementSerializer.java	9 Feb 2007 20:18:56 -0000	1.1
--- StatementSerializer.java	12 Apr 2007 23:59:21 -0000	1.2
***************
*** 44,51 ****
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInputStream;
! import java.io.DataOutputStream;
  import java.io.IOException;
  
  import com.bigdata.objndx.IValueSerializer;
  
--- 44,51 ----
  package com.bigdata.rdf.serializers;
  
! import java.io.DataInput;
  import java.io.IOException;
  
+ import com.bigdata.objndx.DataOutputBuffer;
  import com.bigdata.objndx.IValueSerializer;
  
***************
*** 67,76 ****
      }
  
!     public void getValues(DataInputStream is, Object[] values, int n)
              throws IOException {
          return;
      }
  
!     public void putValues(DataOutputStream os, Object[] values, int n)
              throws IOException {
          return;
--- 67,76 ----
      }
  
!     public void getValues(DataInput is, Object[] values, int n)
              throws IOException {
          return;
      }
  
!     public void putValues(DataOutputBuffer os, Object[] values, int n)
              throws IOException {
          return;