inmemory_kv 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97aba7afbf83a32217a12502a710f7a5de71409
-  data.tar.gz: c95c7ecdd68a37366c98ec405fc77453e2097e16
+  metadata.gz: ee6413bdf95e2e902b4abb882e72284a8742c7bc
+  data.tar.gz: cdc96cbf5654abbd99aa4a263271e8a29e12c374
 SHA512:
-  metadata.gz: 66ae0a210562dbae12f555c15313981b1187a4bf68ec83b02d7f4b3eab2863c90af88716508ed5f768acd315407f20fe9101f43376b211da43b8fa6afaf5703a
-  data.tar.gz: 431d21bef61a4a003ec7a73d97ae10c51ed51c70d2270358bdc79e4054f416976345e9e89c03c6a774855d5ad590deefb1a7c6b52a6bffd5ac0607930ad37eff
+  metadata.gz: b442b6dabd287018b2e519d98eb182340f9e5653f6bc31f973492a965af6be7d4c3dc9324e5353efef71d42f42602f4b383da804cdb19f0504664dedcfac5883
+  data.tar.gz: 1826699cf819121d272488f187dd05367ca85db0944ff9b2ab7eecb95a3771a37cace4e895c4b82afaf1186aec7bbd4ef3063c3a583be8655423ae826023e17f

data/README.md

@@ -90,3 +90,6 @@ sts['3'] != cpy['3']
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Changelog
+0.1.5 - raise error on memory allocation failure

data/ext/inmemory_kv.c

@@ -262,9 +262,11 @@ hash_insert(hash_table* tab, u32 hash) {
 	u32 i, pos, buc, npos;
 	if (tab->size == tab->alloced) {
 		u32 new_alloced = tab->alloced ? tab->alloced * 1.5 : 32;
-		tab->entries = realloc(tab->entries,
+		hash_entry* new_entries = realloc(tab->entries,
 				sizeof(hash_entry)*new_alloced);
-		assert(tab->entries);
+		if (new_entries == NULL)
+			return end;
+		tab->entries = new_entries;
 		memset(tab->entries + tab->alloced, 0,
 				sizeof(hash_entry)*(new_alloced - tab->alloced));
 		for (i=tab->alloced; i<new_alloced-1; i++) {
@@ -275,8 +277,11 @@ hash_insert(hash_table* tab, u32 hash) {
 	}
 	if (tab->size >= tab->nbuckets * 2) {
 		u32 new_nbuckets = tab->nbuckets ? (tab->nbuckets+1)*2-1 : 15;
+		u32* new_buckets = calloc(new_nbuckets, sizeof(u32));
+		if (new_buckets == NULL)
+			return end;
 		free(tab->buckets);
-		tab->buckets = calloc(new_nbuckets, sizeof(u32));
+		tab->buckets = new_buckets;
 		for (i=0; i<tab->alloced; i++) {
 			if (tab->entries[i].item == NULL)
 				continue;
@@ -373,7 +378,7 @@ static hash_item*
 kv_insert(inmemory_kv *kv, const char* key, u32 key_size, const char* val, u32 val_size) {
 	u32 hash = kv_hash(key, key_size);
 	u32 pos;
-	hash_item* item;
+	hash_item *item, *old_item = NULL;
 	pos = hash_hash_first(&kv->tab, hash);
 	while (pos != end) {
 		item = kv->tab.entries[pos].item;
@@ -385,15 +390,13 @@ kv_insert(inmemory_kv *kv, const char* key, u32 key_size, const char* val, u32 v
 	}
 	if (pos == end) {
 		pos = hash_insert(&kv->tab, hash);
+		if (pos == end)
+			return NULL;
 		item = NULL;
 	} else {
 		hash_up(&kv->tab, pos);
 		if (!item_compatible(item, val_size) || item->rc > 0) {
-			kv->total_size -= item_size(item);
-			if (item->rc > 0)
-				item->rc--;
-			else
-				free(item);
+			old_item = item;
 			item = NULL;
 		}
 	}
@@ -401,16 +404,24 @@ kv_insert(inmemory_kv *kv, const char* key, u32 key_size, const char* val, u32 v
 		u32 new_size = item_need_size(key_size, val_size);
 #ifdef HAVE_MALLOC_USABLE_SIZE
 		item = malloc(new_size);
-		assert(item);
+		if (item == NULL)
+			return NULL;
 		new_size = malloc_usable_size(item);
-		item->rc = 0;
 #else
 		new_size = (new_size + 7) & 7;
 		item = malloc(new_size);
-		assert(item);
-		item->rc = 0;
+		if (item == NULL)
+			return NULL;
 		item->item_size = new_size;
 #endif
+		if (old_item != NULL) {
+			kv->total_size -= item_size(old_item);
+			if (old_item->rc > 0)
+				old_item->rc--;
+			else
+				free(old_item);
+		}
+		item->rc = 0;
 		kv->total_size += new_size;
 		item_set_sizes(item, key_size, val_size);
 		item->pos = pos;
@@ -632,7 +643,9 @@ rb_kv_set(VALUE self, VALUE vkey, VALUE vval) {
 	val = RSTRING_PTR(vval);
 	vsize = RSTRING_LEN(vval);
 
-	kv_insert(kv, key, ksize, val, vsize);
+	if (kv_insert(kv, key, ksize, val, vsize) == NULL) {
+		rb_raise(rb_eNoMemError, "could not malloc");
+	}
 
 	return vval;
 }
@@ -701,6 +714,9 @@ rb_kv_unshift(VALUE self, VALUE vkey, VALUE vval) {
 	vsize = RSTRING_LEN(vval);
 
 	item = kv_insert(kv, key, ksize, val, vsize);
+	if (item == NULL) {
+		rb_raise(rb_eNoMemError, "could not malloc");
+	}
 	kv_down(kv, item);
 
 	return vval;

data/lib/inmemory_kv/version.rb

@@ -1,3 +1,3 @@
 module InMemoryKV
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inmemory_kv
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sokolov Yura aka funny_falcon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler