hyperdex 1.4.5.3.g9d31c19 → 1.4.5.5.gf1ae4e6

data/ext/client.c

@@ -40,7 +40,6 @@
 
 extern VALUE mod_hyperdex;
 static VALUE mod_hyperdex_client;
-static VALUE class_exception;
 static VALUE Set;
 static VALUE class_client;
 static VALUE class_predicate;
@@ -71,7 +70,9 @@ hyperdex_ruby_client_throw_exception(enum hyperdex_client_returncode status,
                                      const char* error_message)
 {
     VALUE args[2] = { INT2NUM(status), rb_str_new2(error_message) };
-    rb_exc_raise(rb_class_new_instance(2, args, class_exception));
+    VALUE klass   = rb_path2class("HyperDex::Client");
+
+    rb_exc_raise(rb_funcall2(klass, rb_intern("exception"), 2, args));
 }
 
 /******************************* Predicate class ******************************/
@@ -904,9 +905,6 @@ Init_hyperdex_client()
     /* setup the module */
     mod_hyperdex_client = rb_define_module_under(mod_hyperdex, "Client");
 
-    /* create the Exception class */
-    class_exception = rb_define_class_under(mod_hyperdex_client, "HyperDexClientException", rb_eStandardError);
-
     /* create the Client class */
     class_client = rb_define_class_under(mod_hyperdex_client, "Client", rb_cObject);
 

data/lib/hyperdex/client.rb

@@ -11,6 +11,10 @@ module HyperDex::Client
 		end
 	end
 
+	def self.exception(status, message)
+		HyperDex::Client::Exception::Map[status].new(message)
+	end
+
 	def self.build_attribute(attr)
 		type = attr[:datatype]
 		value = attr[:value].read_string(attr[:value_sz])
@@ -22,10 +26,8 @@ module HyperDex::Client
 		when :INT64
 			i = ::FFI::MemoryPointer.new(:int64_t)
 			if HyperDex::FFI::DS.unpack_int(attr[:value], attr[:value_sz], i) < 0
-				raise HyperDex::Client::HyperDexClientException.new(
-				        HyperDex::Client::SERVERERROR,
-				        "server sent malformed int attribute (#{value.inspect})"
-				      )
+				raise HyperDex::Client::ServerError,
+				      "server sent malformed int attribute (#{value.inspect})"
 			end
 
 			i.read_int64
@@ -33,10 +35,8 @@ module HyperDex::Client
 		when :FLOAT
 			d = ::FFI::MemoryPointer.new(:double)
 			if HyperDex::FFI::DS.unpack_float(attr[:value], attr[:value_sz], d) < 0
-				raise HyperDex::Client::HyperDexClientException.new(
-				        HyperDex::Client::SERVERERROR,
-				        "server sent malformed float attribute (#{value.inspect})"
-				      )
+				raise HyperDex::Client::ServerError,
+				      "server sent malformed float attribute (#{value.inspect})"
 			end
 
 			d.read_double
@@ -45,10 +45,8 @@ module HyperDex::Client
 			begin
 				JSON.parse(value)
 			rescue JSON::ParserError
-				raise HyperDex::Client::HyperDexClientException.new(
-				        HyperDex::Client::SERVERERROR,
-				        "server sent malformed attribute(document)"
-				      )
+				raise HyperDex::Client::ServerError,
+				      "server sent malformed attribute(document)"
 			end
 
 		when :LIST_STRING
@@ -59,10 +57,8 @@ module HyperDex::Client
 			res = []
 			while (result = HyperDex::FFI::DS.iterate_list_string_next(iter, ptr, len)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed list(string)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed list(string)"
 				end
 
 				str = ptr.read_pointer
@@ -78,10 +74,8 @@ module HyperDex::Client
 			res = []
 			while (result = HyperDex::FFI::DS.iterate_list_int_next(iter, int)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed list(int)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed list(int)"
 				end
 
 				res << int.read_int64
@@ -96,10 +90,8 @@ module HyperDex::Client
 			res = []
 			while (result = HyperDex::FFI::DS.iterate_list_float_next(iter, dbl)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed list(float)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed list(float)"
 				end
 
 				res << dbl.read_double
@@ -115,10 +107,8 @@ module HyperDex::Client
 			res = Set.new
 			while (result = HyperDex::FFI::DS.iterate_set_string_next(iter, ptr, len)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed set(string)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed set(string)"
 				end
 
 				str = ptr.read_pointer
@@ -134,10 +124,8 @@ module HyperDex::Client
 			res = Set.new
 			while (result = HyperDex::FFI::DS.iterate_set_int_next(iter, int)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed set(int)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed set(int)"
 				end
 
 				res << int.read_int64
@@ -152,10 +140,8 @@ module HyperDex::Client
 			res = Set.new
 			while (result = HyperDex::FFI::DS.iterate_set_float_next(iter, dbl)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed set(float)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed set(float)"
 				end
 
 				res << dbl.read_double
@@ -173,10 +159,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_string_string_next(iter, kptr, klen, vptr, vlen)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(string, string)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(string, string)"
 				end
 
 				kstr = kptr.read_pointer
@@ -197,10 +181,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_string_int_next(iter, kptr, klen, vint)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(string, int)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(string, int)"
 				end
 
 				kstr = kptr.read_pointer
@@ -219,10 +201,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_string_float_next(iter, kptr, klen, vdbl)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(string, float)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(string, float)"
 				end
 
 				kstr = kptr.read_pointer
@@ -241,10 +221,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_int_string_next(iter, kint, vptr, vlen)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(int, string)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(int, string)"
 				end
 
 				vstr = vptr.read_pointer
@@ -262,10 +240,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_int_int_next(iter, kint, vint)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(int, int)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(int, int)"
 				end
 
 				res[kint.read_int64] = vint.read_int64
@@ -281,10 +257,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_int_float_next(iter, kint, vdbl)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(int, float)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(int, float)"
 				end
 
 				res[kint.read_int64] = vdbl.read_double
@@ -301,10 +275,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_float_string_next(iter, kdbl, vptr, vlen)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(float, string)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(float, string)"
 				end
 
 				vstr = vptr.read_pointer
@@ -322,10 +294,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_float_int_next(iter, kdbl, vint)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(float, int)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(float, int)"
 				end
 
 				res[kdbl.read_double] = vint.read_int64
@@ -341,10 +311,8 @@ module HyperDex::Client
 			res = {}
 			while (result = HyperDex::FFI::DS.iterate_map_float_float_next(iter, kdbl, vdbl)) > 0
 				if result < 0
-					raise HyperDex::Client::HyperDexClientException.new(
-					        HyperDex::Client::SERVERERROR,
-					        "server sent malformed map(int, float)"
-					      )
+					raise HyperDex::Client::ServerError,
+					      "server sent malformed map(int, float)"
 				end
 
 				res[kdbl.read_double] = vdbl.read_double
@@ -353,10 +321,8 @@ module HyperDex::Client
 			res
 
 		else
-			raise HyperDex::Client::HyperDexClientException.new(
-			        HyperDex::Client::SERVERERROR,
-			        "server sent malformed attributes"
-			      )
+			raise HyperDex::Client::ServerError,
+			      "server sent malformed attributes"
 		end
 	end
 
@@ -372,6 +338,6 @@ end
 
 require_relative 'client/client'
 require_relative 'client/deferred'
-require_relative 'client/hyperdex_client_exception'
+require_relative 'client/exception'
 require_relative 'client/iterator'
 require_relative 'client/response'

data/lib/hyperdex/client/client.rb

@@ -16,10 +16,7 @@ class HyperDex::Client::Client
 		rc = ::FFI::MemoryPointer.new(HyperDex::FFI::Client.enum_type(:hyperdex_client_returncode).native_type)
 		while (ret = HyperDex::FFI::Client.hyperdex_client_loop(@client, timeout, rc)) < 0
 			if rc.read_int32 != HyperDex::Client::INTERRUPTED
-				raise HyperDex::Client::HyperDexClientException.new(
-				        rc.read_int32,
-				        self.error_message
-				      )
+				raise HyperDex::Client.exception(rc.read_int32, self.error_message)
 			end
 		end
 
@@ -28,10 +25,8 @@ class HyperDex::Client::Client
 
 	def poll_fd
 		if (fd = HyperDex::FFI::Client.hyperdex_client_poll(@client)) < 0
-			raise HyperDex::Client::HyperDexClientException.new(
-			        HyperDex::Client::EXCEPTION,
-			        "CAN'T HAPPEN: hyperdex_client_poll failed!"
-			      )
+			raise HyperDex::Client::PollFailed,
+			      self.error_messsage
 		end
 
 		fd

data/lib/hyperdex/client/exception.rb

@@ -0,0 +1,109 @@
+module HyperDex::Client
+	class Exception < StandardError
+		@status = HyperDex::Client::EXCEPTION
+
+		def status
+			self.class.status
+		end
+
+		def self.status
+			self.class.instance_variable_get(:@status)
+		end
+
+		def symbol
+			HyperDex::FFI::Client.
+			  hyperdex_client_returncode_to_string(status).
+			  read_string
+		end
+	end
+
+	HyperDexClientException = Exception
+
+	class UnknownSpaceError < Exception
+		@status = HyperDex::Client::UNKNOWNSPACE
+	end
+
+	class CoordFailError < Exception
+		@status = HyperDex::Client::COORDFAIL
+	end
+
+	class ServerError < Exception
+		@status = HyperDex::Client::SERVERERROR
+	end
+
+	class PollFailedError < Exception
+		@status = HyperDex::Client::POLLFAILED
+	end
+
+	class OverflowError < Exception
+		@status = HyperDex::Client::OVERFLOW
+	end
+
+	class ReconfigureError < Exception
+		@status = HyperDex::Client::RECONFIGURE
+	end
+
+	class TimeoutError < Exception
+		@status = HyperDex::Client::TIMEOUT
+	end
+
+	class UnknownAttrError < Exception
+		@status = HyperDex::Client::UNKNOWNATTR
+	end
+
+	class DupeAttrError < Exception
+		@status = HyperDex::Client::DUPEATTR
+	end
+
+	class NonePendingError < Exception
+		@status = HyperDex::Client::NONEPENDING
+	end
+
+	class DontUseKeyError < Exception
+		@status = HyperDex::Client::DONTUSEKEY
+	end
+
+	class WrongTypeError < Exception
+		@status = HyperDex::Client::WRONGTYPE
+	end
+
+	class NoMemError < Exception
+		@status = HyperDex::Client::NOMEM
+	end
+
+	class InterruptedError < Exception
+		@status = HyperDex::Client::INTERRUPTED
+	end
+
+	class ClusterJumpError < Exception
+		@status = HyperDex::Client::CLUSTER_JUMP
+	end
+
+	class OfflineError < Exception
+		@status = HyperDex::Client::OFFLINE
+	end
+
+	class InternalError < Exception
+		@status = HyperDex::Client::INTERNAL
+	end
+
+	class GarbageError < Exception
+		@status = HyperDex::Client::GARBAGE
+	end
+
+	EXCEPTION_STATUS_MAP = ObjectSpace.each_object(Class).reduce({}) do |h, ex|
+		if ex.ancestors.include?(::HyperDex::Client::Exception)
+			h[ex.status] = ex
+		end
+		h
+	end
+
+	def self.exception(status, message)
+		klass = EXCEPTION_STATUS_MAP[status]
+		if klass.nil?
+			klass = HyperDex::Client::Exception
+		end
+
+		klass.new(message)
+	end
+end

data/lib/hyperdex/client/iterator.rb

@@ -12,9 +12,7 @@ class HyperDex::Client::Iterator < HyperDex::Client::Response
 		elsif status == HyperDex::Client::SUCCESS
 			@backlog << encode_return
 		else
-			@backlog << HyperDex::Client::HyperDexClientException.new(
-			              status, @client.error_message
-			            )
+			@backlog << HyperDex::Client::exception(status, @client.error_message)
 		end
 	end
 

data/lib/hyperdex/client/response.rb

@@ -61,10 +61,7 @@ class HyperDex::Client::Response
 		when HyperDex::Client::CMPFAIL
 			false
 		else
-			raise HyperDex::Client::HyperDexClientException.new(
-			        status,
-			        @client.error_message
-			      )
+			raise HyperDex::Client.exception(status, @client.error_message)
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperdex
 version: !ruby/object:Gem::Version
-  version: 1.4.5.3.g9d31c19
+  version: 1.4.5.5.gf1ae4e6
   prerelease: 8
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-enum-generator
@@ -241,7 +241,7 @@ files:
 - lib/hyperdex/client.rb
 - lib/hyperdex/client/client.rb
 - lib/hyperdex/client/deferred.rb
-- lib/hyperdex/client/hyperdex_client_exception.rb
+- lib/hyperdex/client/exception.rb
 - lib/hyperdex/client/iterator.rb
 - lib/hyperdex/client/response.rb
 - lib/hyperdex/ffi.rb
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1553449030944828785
+      hash: -2098128700064581276
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/hyperdex/client/hyperdex_client_exception.rb

@@ -1,9 +0,0 @@
-class HyperDex::Client::HyperDexClientException
-	attr_accessor :status, :symbol
-
-	def initialize(status, message)
-		super(message)
-		@status = status
-		@symbol = HyperDex::FFI::Client.hyperdex_client_returncode_to_string(status).read_string
-	end
-end