cakedb 0.0.1 → 0.0.2

data/lib/cakedb.rb

@@ -4,7 +4,7 @@ require 'socket'
 
 class CakeDB
   def initialize( server="127.0.0.1", port=8888 )
-    puts "Connection Initiated"
+    #puts "Connection Initiated"
     @server = TCPSocket.new(server, port)
     @sids = {}
   end
@@ -23,7 +23,7 @@ class CakeDB
 
   def write(stream,payload)
     sid = get_sid(stream)
-    puts sid
+    #puts sid
     @server.write [(payload.bytesize + 2),2,sid].pack("L>S>S>")
     @server.write payload
     @server.flush
@@ -38,20 +38,24 @@ class CakeDB
     return details
   end
 
-  def read(stream, ts)
+  def read(stream, ts, tsend=nil, mode=4)
     #Issue the query
-    sid = @sids[stream]
-    puts sid
-    @server.write [10,4,sid,ts].pack("L>S>S>Q>") 
+    sid = get_sid(stream)
+    headersz = 10
+    if tsend 
+      headersz=18
+    end
+    @server.write [headersz,mode,sid,ts].pack("L>S>S>Q>") 
     @server.flush
+    result = Array.new
 
     #How much data we gotta get?
     recv_total = @server.recv(4).unpack("L>")[0]
+    puts "total is #{recv_total}"
     if recv_total > 0
       counter = 0
       #Recive the result
       while recv_total > 0
-        counter+=1 
 	#Get the header - 12 bytes
 	header_whole = @server.recv(12)
 	header = header_whole.unpack("Q>L>")
@@ -65,25 +69,41 @@ class CakeDB
 	end
 
 	#recieve the data, header says how much
-        result = @server.recv(header[1])
+        result[counter] = @server.recv(header[1])
 	
 	#Keep reading till we have everything we expect
-        while(result.bytesize < header[1])
-          result += @server.recv(header[1] - result.bytesize)
-          puts "Incomplete read: #{result.bytesize} / #{header[1]}"
+        while(result[counter].bytesize < header[1])
+          result[counter] += @server.recv(header[1] - resultt[counter].bytesize)
+          puts "Incomplete read: #{resultt[counter].bytesize} / #{header[1]}"
 	end
-	if result.bytesize != header[1]
+	if result[counter].bytesize != header[1]
           puts "Incomplete read on payload receive"
-	  puts "Raw Data: #{result}"  
+	  puts "Raw Data: #{resultt[counter]}"  
 	  puts "Length: #{header[1]} bytes"
-	  puts "Raw Data length: #{result.bytesize - 12}"
+	  puts "Raw Data length: #{resultt[counter].bytesize - 12}"
 	  puts "Total Length: #{recv_total}"
 	  exit(1)
         end
-	return result
+	recv_total = recv_total - header[1] - 12
+	counter+=1
       end
+      return result
     else
       # I SEE NOTHING!
     end
   end
+
+  def allSince(stream, ts)
+    #allSince is mode 4
+    return read(stream, ts, nil, 4)
+  end
+
+  def lastAt(stream, ts)
+    #lastAt is mode 6
+    return read(stream, ts, nil, 6)
+  end
+    #Perform a range query
+  def rangeQuery(stream, ts, tsend)
+    return read(stream, ts, tsend, 3)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cakedb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: