gnista 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bab3ebb294b61581358c5cec1b5c35d58278068f
-  data.tar.gz: 46ce784095d0f7ebfa35ed4292c8666572ba6f71
+  metadata.gz: 18a1c35381152407bbbdd6694e04424893936c13
+  data.tar.gz: 94f3a0363f878f04a6d2b4572a1a10b56ec93f2f
 SHA512:
-  metadata.gz: b6758ef75988f46af845a974ab7e50398fc87251c1b070dfa4d2fd96679d0de075df5f3fb3bc2446b506b591811317943536173805ae0a1afc0a316abe9f9ccc
-  data.tar.gz: dc6f0af77d91f73180f466556b1275e9c7b86650a849aedf4e4cb524ff4b16f8ac48b5eec1c710d0230fa7b6b84c8f3aba8436f4fff8de0e3392726c84aa6672
+  metadata.gz: b5d83b90fbe736a4d9f7ae3f22c268ccd5ab1d930276fc84f78ee2f93cf51ef9c53403a503e539320f6d1fd5d9f6498ee0601e064f3c1d091b2dc67d4c520ca8
+  data.tar.gz: 3c5e593188384bd0f7d2e61652c35d4f04ba32e1033ee2141e4e8ac549fea19129752f28db81c87bda863ec8788df53bd3e36509cba11d905fa9e7d6e72cd01b

data/HISTORY.md

@@ -1,5 +1,20 @@
+# Version 0.0.2
+
+Release date 2013-09-12
+
+### Added
+
+* ```each``` in logreader now provides a __type__ parameter containing either :put or :delete.
+
+### Fixed
+
+* Fix memory leak on ```each/get``` failure.
+* Two allocations per call instead of one each entry in ```each```.
+* ```each``` in logreader returns nil instead of empty string.
+
+
 # Version 0.0.1
 
 Release date 2013-09-11
 
-### Changed / Added / Fixed / Removed
+__Initial release__

data/README.md

@@ -35,7 +35,8 @@ logwriter.del "key" # delete entry
 logwriter.flush
 
 logreader = Gnista::Logreader.new "mylog.log"
-logreader.each {|key,value| puts key, value }
+logreader.each {|key,value,type| puts key, value, type }
+# => "key", "value"/nil, :put/:delete
 
 Gnista::Hash.write "mylog.hash", "mylog.log" # no preferred hash size
 Gnista::Hash.write "mylog.hash", "mylog.log", 4 # 32 bit murmurhash3_x86_32
@@ -59,15 +60,17 @@ hash.close
 
 ## Contributing
 
+__Step-by-step:__
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Write some code
+4. Build and test
+5. Commit your changes (`git commit -am 'Add some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request
+
 Use the following commands to build the native extensions and test:
 
 	$ rake make
 	$ rake test
-
-Then:
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/ext/gnista/gnista.c

@@ -7,18 +7,18 @@ typedef int bool;
 
 
 typedef struct instance_logwriter {
-  	sparkey_logwriter *logwriter;
-  	int open;
+	sparkey_logwriter *logwriter;
+	int open;
 } instance_logwriter;
 
 typedef struct instance_logreader {
-  	sparkey_logreader *logreader;
-  	int open;
+	sparkey_logreader *logreader;
+	int open;
 } instance_logreader;
 
 typedef struct instance_hashreader {
-  	sparkey_hashreader *hashreader;
-  	int open;
+	sparkey_hashreader *hashreader;
+	int open;
 } instance_hashreader;
 
 /********************************************************************************/
@@ -44,7 +44,7 @@ static void dealloc_logwriter(void *p) {
 	instance_logwriter *i_logwriter = p;
 
 	if (i_logwriter->open) {
-	    sparkey_returncode returncode;
+		sparkey_returncode returncode;
 		returncode = sparkey_logwriter_close(&i_logwriter->logwriter);
 
 		if (returncode != SPARKEY_SUCCESS) {
@@ -57,7 +57,7 @@ static void dealloc_logwriter(void *p) {
 
 static VALUE alloc_logwriter(VALUE klass) {
 	instance_logwriter *i_logwriter = ALLOC(instance_logwriter);
-  	return Data_Wrap_Struct(klass, 0, dealloc_logwriter, i_logwriter);
+	return Data_Wrap_Struct(klass, 0, dealloc_logwriter, i_logwriter);
 }
 
 static instance_logwriter* get_logwriter(VALUE self) {
@@ -182,7 +182,7 @@ static void dealloc_logreader(void *p) {
 
 static VALUE alloc_logreader(VALUE klass) {
 	instance_logreader *i_logreader = ALLOC(instance_logreader);
-  	return Data_Wrap_Struct(klass, 0, dealloc_logreader, i_logreader);
+	return Data_Wrap_Struct(klass, 0, dealloc_logreader, i_logreader);
 }
 
 static instance_logreader* get_logreader(VALUE self) {
@@ -229,41 +229,54 @@ static VALUE method_logreader_each(VALUE self) {
 		raise_sparkey(returncode);
 	}
 
+	VALUE put_sym = ID2SYM(rb_intern("put"));
+	VALUE del_sym = ID2SYM(rb_intern("delete"));
+	uint8_t *keybuf = malloc(sparkey_logreader_maxkeylen(i_logreader->logreader));
+	uint8_t *valuebuf = malloc(sparkey_logreader_maxvaluelen(i_logreader->logreader));
 	while (1) {
 		returncode = sparkey_logiter_next(logiter, i_logreader->logreader);
 
 		if (sparkey_logiter_state(logiter) != SPARKEY_ITER_ACTIVE) {
-		 	break;
+			break;
 		}
 
 		uint64_t wanted_keylen = sparkey_logiter_keylen(logiter);
-		uint8_t *keybuf = malloc(wanted_keylen);
 		uint64_t actual_keylen;
 		returncode = sparkey_logiter_fill_key(logiter, i_logreader->logreader, wanted_keylen, keybuf, &actual_keylen);
 
 		if (returncode != SPARKEY_SUCCESS) {
+			free(keybuf);
+			free(valuebuf);
 			raise_sparkey(returncode);
 		} else if (wanted_keylen != actual_keylen) {
+			free(keybuf);
+			free(valuebuf);
 			rb_raise(GnistaException, "Corrupted read in logreader.");
 		}
 
-		uint64_t wanted_valuelen = sparkey_logiter_valuelen(logiter);
-		uint8_t *valuebuf = malloc(wanted_valuelen);
-		uint64_t actual_valuelen;
-		returncode = sparkey_logiter_fill_value(logiter, i_logreader->logreader, wanted_valuelen, valuebuf, &actual_valuelen);
-
-		if (returncode != SPARKEY_SUCCESS) {
-			raise_sparkey(returncode);
-		} else if (wanted_valuelen != actual_valuelen) {
-			rb_raise(GnistaException, "Corrupted read in logreader.");
+		if (sparkey_logiter_type(logiter) == SPARKEY_ENTRY_PUT) {
+			uint64_t wanted_valuelen = sparkey_logiter_valuelen(logiter);
+			uint64_t actual_valuelen;
+			returncode = sparkey_logiter_fill_value(logiter, i_logreader->logreader, wanted_valuelen, valuebuf, &actual_valuelen);
+
+			if (returncode != SPARKEY_SUCCESS) {
+				free(keybuf);
+				free(valuebuf);
+				raise_sparkey(returncode);
+			} else if (wanted_valuelen != actual_valuelen) {
+				free(keybuf);
+				free(valuebuf);
+				rb_raise(GnistaException, "Corrupted read in logreader.");
+			}
+
+			rb_yield_values(3, rb_str_new((char *)keybuf, actual_keylen), rb_str_new((char *)valuebuf, actual_valuelen), put_sym);
+		} else {
+			rb_yield_values(3, rb_str_new((char *)keybuf, actual_keylen), Qnil, del_sym);
 		}
-
-		rb_yield_values(2, rb_str_new((char *)keybuf, actual_keylen), rb_str_new((char *)valuebuf, actual_valuelen));
-
-		free(keybuf);
-		free(valuebuf);
 	}
 
+	free(keybuf);
+	free(valuebuf);
 	sparkey_logiter_close(&logiter);
 
 	return Qnil;
@@ -294,7 +307,7 @@ static void dealloc_hashreader(void *p) {
 
 static VALUE alloc_hashreader(VALUE klass) {
 	instance_hashreader *i_hashreader = ALLOC(instance_hashreader);
-  	return Data_Wrap_Struct(klass, 0, dealloc_hashreader, i_hashreader);
+	return Data_Wrap_Struct(klass, 0, dealloc_hashreader, i_hashreader);
 }
 
 static instance_hashreader* get_hashreader(VALUE self) {
@@ -362,48 +375,57 @@ static VALUE method_hash_each(VALUE self) {
 	instance_hashreader *i_hashreader = get_hashreader(self);
 	sparkey_logiter *logiter;
 	check_open(i_hashreader->open);
+	sparkey_logreader *logreader = sparkey_hash_getreader(i_hashreader->hashreader);
 
-	returncode = sparkey_logiter_create(&logiter, sparkey_hash_getreader(i_hashreader->hashreader));
+	returncode = sparkey_logiter_create(&logiter, logreader);
 
 	if (returncode != SPARKEY_SUCCESS) {
 		raise_sparkey(returncode);
 	}
 
+	uint8_t *keybuf = malloc(sparkey_logreader_maxkeylen(logreader));
+	uint8_t *valuebuf = malloc(sparkey_logreader_maxvaluelen(logreader));
 	while (1) {
 		returncode = sparkey_logiter_hashnext(logiter, i_hashreader->hashreader);
 
 		if (sparkey_logiter_state(logiter) != SPARKEY_ITER_ACTIVE) {
-		 	break;
+			break;
 		}
 
 		uint64_t wanted_keylen = sparkey_logiter_keylen(logiter);
-		uint8_t *keybuf = malloc(wanted_keylen);
 		uint64_t actual_keylen;
 		returncode = sparkey_logiter_fill_key(logiter, sparkey_hash_getreader(i_hashreader->hashreader), wanted_keylen, keybuf, &actual_keylen);
 
 		if (returncode != SPARKEY_SUCCESS) {
+			free(keybuf);
+			free(valuebuf);
 			raise_sparkey(returncode);
 		} else if (wanted_keylen != actual_keylen) {
+			free(keybuf);
+			free(valuebuf);
 			rb_raise(GnistaException, "Corrupt entry in logreader.");
 		}
 
 		uint64_t wanted_valuelen = sparkey_logiter_valuelen(logiter);
-		uint8_t *valuebuf = malloc(wanted_valuelen);
 		uint64_t actual_valuelen;
 		returncode = sparkey_logiter_fill_value(logiter, sparkey_hash_getreader(i_hashreader->hashreader), wanted_valuelen, valuebuf, &actual_valuelen);
 
 		if (returncode != SPARKEY_SUCCESS) {
+			free(keybuf);
+			free(valuebuf);
 			raise_sparkey(returncode);
 		} else if (wanted_valuelen != actual_valuelen) {
+			free(keybuf);
+			free(valuebuf);
 			rb_raise(GnistaException, "Corrupt entry in logreader.");
 		}
 
 		rb_yield_values(2, rb_str_new((char *)keybuf, actual_keylen), rb_str_new((char *)valuebuf, actual_valuelen));
 
-		free(keybuf);
-		free(valuebuf);
 	}
 
+	free(keybuf);
+	free(valuebuf);
 	sparkey_logiter_close(&logiter);
 
 	return Qnil;
@@ -426,7 +448,7 @@ static VALUE method_hash_get(VALUE self, VALUE key) {
 	returncode = sparkey_hash_get(i_hashreader->hashreader, (uint8_t*)RSTRING_PTR(key), RSTRING_LEN(key), logiter);
 
 	if (sparkey_logiter_state(logiter) != SPARKEY_ITER_ACTIVE) {
-	 	return Qnil;
+		return Qnil;
 	}
 
 	uint64_t wanted_valuelen = sparkey_logiter_valuelen(logiter);
@@ -435,14 +457,18 @@ static VALUE method_hash_get(VALUE self, VALUE key) {
 	returncode = sparkey_logiter_fill_value(logiter, sparkey_hash_getreader(i_hashreader->hashreader), wanted_valuelen, valuebuf, &actual_valuelen);
 
 	if (returncode != SPARKEY_SUCCESS) {
+		free(valuebuf);
 		raise_sparkey(returncode);
 	} else if (wanted_valuelen != actual_valuelen) {
+		free(valuebuf);
 		rb_raise(GnistaException, "Corrupt entry in hash.");
 	}
 
 	sparkey_logiter_close(&logiter);
 
-	return rb_str_new((char *)valuebuf, actual_valuelen);
+	VALUE v = rb_str_new((char *)valuebuf, actual_valuelen);
+	free(valuebuf);
+	return v;
 }
 
 static VALUE method_hash_maxkeylen(VALUE self) {

data/lib/gnista/version.rb

@@ -1,3 +1,3 @@
 module Gnista
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test_commands.rb

@@ -10,12 +10,10 @@ describe Gnista do
 
   before do
     @logwriter = Gnista::Logwriter.new log_path
-    @logreader = Gnista::Logreader.new log_path
   end
 
   after do
     @logwriter.close
-    @logreader.close
     FileUtils.rm log_path
   end
 
@@ -35,20 +33,28 @@ describe Gnista do
 
   it "can iterate each log entry" do
     @logwriter.put "key1", "value1"
-    @logwriter.put "key2", "value2"
+    @logwriter.delete "key2"
+    @logwriter.flush
+
+    lograder = Gnista::Logreader.new log_path
 
     a = true
-    @logreader.each do |key,value|
+    lograder.each do |key,value,type|
       if a
         key.must_equal "key1"
         value.must_equal "value1"
+        type.must_equal :put
         a = false
       else
         key.must_equal "key2"
-        value.must_equal "value2"
+        value.must_be_nil
+        type.must_equal :delete
       end
     end
 
+    a.must_equal false
+
+    lograder.close
   end
 
   it "can read hash max key/value length" do
@@ -84,6 +90,8 @@ describe Gnista do
       end
     end
 
+    a.must_equal false
+
     hash.close
     FileUtils.rm hash_path
   end
@@ -122,7 +130,12 @@ describe Gnista do
 
   it "can be open or closed" do
     @logwriter.open?.must_equal true
-    @logreader.open?.must_equal true
+
+    logreader = Gnista::Logreader.new log_path
+    logreader.open?.must_equal true
+    logreader.close
+    logreader.open?.must_equal false
+
     Gnista::Hash.write hash_path, log_path
     hash = Gnista::Hash.new hash_path, log_path
     hash.open?.must_equal true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnista
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Emanuel Andersson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler