Skip to content

Commit

Permalink
fixing misc bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@acrosa
Chris Riccomini authored and acrosa committed Jul 19, 2010
1 parent e010728 commit ab235bd
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 16 deletions.
7 changes: 7 additions & 0 deletions lib/connection/connection.rb
View file
Expand Up @@ -41,6 +41,13 @@ def bootstrap
rescue StandardError => e
raise("There was an error trying to bootstrap from the specified servers: #{e}")
end

# def parse_schema_from(xml)
# doc = REXML::Document.new(xml)
# schema_doc = XPath.first(doc, "//stores/store[name = \"#{self.db_name}\"]")
# schema = JSON.parse(schema_doc.elements['value-serializer'].elements['schema-info'].text)
# end


def connect_to_random_node
nodes = self.nodes.sort_by { rand }
Expand Down
98 changes: 82 additions & 16 deletions lib/voldemort-serializer.rb
View file
@@ -1,5 +1,6 @@
require 'rubygems'
require 'json'
require 'voldemort-rb'

class VoldemortSerializer
attr_accessor :has_version
Expand Down Expand Up @@ -69,21 +70,21 @@ def to_bytes(object)
end

bytes << write(object, type_def)

return bytes
end

def write(object, type)
bytes = ''

if(type.kind_of? Hash)
if(!object.kind_of? Hash)
if(object != nil && !object.kind_of?(Hash))
# TODO throw exception
else
bytes << write_map(object, type)
end
elsif(type.kind_of? Array)
if(!object.kind_of? Array)
if(object != nil && !object.kind_of?(Array))
# TODO throw exception
else
bytes << write_list(object, type)
Expand Down Expand Up @@ -114,11 +115,11 @@ def write_boolean(object)
bytes = ''

if(object == nil)
bytes << 0xFF # bits: 1111 1111 (-1 for a byte)
bytes << [BYTE_MIN_VAL].pack('c')
elsif(object)
bytes << 0x1
bytes << [0x1].pack('c')
else
bytes << 0x0
bytes << [0x0].pack('c')
end

return bytes
Expand Down Expand Up @@ -170,7 +171,9 @@ def write_int32(object)
object = INT_MIN_VAL
end

bytes << [object].pack('i')
# reverse here to switch little endian to big endian
# this is because pack('N') is choking on 'bigint', wtf?
bytes << [object].pack('i').reverse
end

return bytes
Expand Down Expand Up @@ -261,17 +264,21 @@ def write_map(object, type)
bytes = ''

if(object == nil)
bytes << 0xFF # bits: 1111 1111 (-1 for a byte)
bytes << [-1].pack('c')
else
bytes << 0x1
bytes << [1].pack('c')

if(object.length != type.length)
# TODO throw exception here.. invalid map serialization, expected: but got
else
type.each_pair do |key, val|
type.sort.each do |type_pair|
key = type_pair.first
subtype = type_pair.last

if(!object.has_key? key)
# TODO throw "missing property exception"
else
bytes << write(object[key], val)
bytes << write(object[key], subtype)
end
end
end
Expand Down Expand Up @@ -344,12 +351,15 @@ def read(bytes, type)
end

def read_map(bytes, type)
if(read_slice(1, bytes) == -1)
# convert to char to string, and string to int
if(read_slice(1, bytes).unpack('c').to_s.to_i == -1)
return nil
else
object = {}

type.each_pair do |name, sub_type|
type.sort.each do |type_pair|
name = type_pair.first
sub_type = type_pair.last
object[name] = read(bytes, sub_type)
end

Expand All @@ -371,7 +381,7 @@ def read_list(bytes, type)
end

def read_boolean(bytes)
b = read_slice(1, bytes).first.to_i
b = read_slice(1, bytes).unpack('c').first

if(b < 0)
return nil
Expand Down Expand Up @@ -403,7 +413,9 @@ def read_int16(bytes)
end

def read_int32(bytes)
i = read_slice(4, bytes).unpack("i").first.to_i
# reverse here to switch little endian to big endian
# this is because pack('N') is choking on 'bigint', wtf?
i = read_slice(4, bytes).reverse.unpack("i").first.to_i

if(i == INT_MIN_VAL)
return nil
Expand Down Expand Up @@ -509,6 +521,8 @@ def assert(a, b)
assert(double_invert(get_serde("{'a': 'string', 'b': 'int32'}"), {'a' => 'hai', 'b' => 23}), {'a' => 'hai', 'b' => 23})
assert(double_invert(get_serde("{'a': 'int8', 'b': ['int32']}"), {'a' => nil, 'b' => [23, 45000]}), {'a' => nil, 'b' => [23, 45000]})
assert(double_invert(get_serde("'date'"), Time.at(1279216126, 000)), Time.at(1279216126, 000))
assert(double_invert(get_serde("'boolean'"), true), true)
assert(double_invert(get_serde("'boolean'"), false), false)

# test nulls
assert(double_invert(get_serde("'string'"), nil), nil)
Expand All @@ -518,4 +532,56 @@ def assert(a, b)
assert(double_invert(get_serde("'int64'"), nil), nil)
assert(double_invert(get_serde("'float32'"), nil), nil)
assert(double_invert(get_serde("'float64'"), nil), nil)
assert(double_invert(get_serde("'date'"), nil), nil)
assert(double_invert(get_serde("'date'"), nil), nil)
assert(double_invert(get_serde("'boolean'"), nil), nil)
assert(double_invert(get_serde("['int32']"), nil), nil)
assert(double_invert(get_serde("{'a': 'string'}"), nil), nil)

v = VoldemortClient.new('json-test', 'localhost:6666')

kserde = get_serde("'int32'")
vserde = get_serde("{
\"string\": 'string',
\"int8\": 'int8',
\"int16\": \"int16\",
\"int32\": 'int32',
\"int64\": \"int64\",
'float32': 'float32',
'float64': 'float64',
\"list\": ['int32'],
'map': {\"key\": 'string'},
\"date\": 'date',
'boolean': 'boolean'
}")
=begin
v.put(kserde.to_bytes(1213), vserde.to_bytes({
"string" => 'a',
"int8" => 1,
"int16" => 1,
"int32" => 1,
"int64" => 1,
'float32' => 1,
'float64' => 1,
"list" => [1, 2],
'map' => {"key" => 'a'},
"date" => Time.now,
'boolean' => true
}))
=end
v.put(kserde.to_bytes(1213), vserde.to_bytes({
"string" => nil,
"int8" => nil,
"int16" => nil,
"int32" => nil,
"int64" => nil,
'float32' => nil,
'float64' => nil,
"list" => nil,
'map' => nil,
"date" => nil,
'boolean' => nil
}))

d = vserde.to_object(v.get(kserde.to_bytes(1213)))
d = JSON.generate(d)
puts "-- #{d}"

0 comments on commit ab235bd

Please sign in to comment.