Merge pull request #6 from ggtakec/master

Updated changelog for v1.0.56
yahoojapan · Apr 10, 2017 · 9315138 · 9315138
2 parents e8109f9 + e723725
commit 9315138
Show file tree

Hide file tree

Showing 10 changed files with 1,609 additions and 859 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+k2hash (1.0.56) trusty; urgency=low
+
+  * Strict/Robust queue processing for conflicting
+  * Fixed deadlock at updating key with subkeys
+
+ -- Takeshi Nakatani <ggtakec@gmail.com>  Tue, 28 Mar 2017 10:52:24 +0900
+
 k2hash (1.0.55) trusty; urgency=low
 
   * Updated fullock submodule v1.0.24

diff --git a/lib/k2hash.cc b/lib/k2hash.cc
@@ -1022,7 +1022,7 @@ bool k2h_free_keyarray(char** pkeys)
 }
 
 // Utility for converting
-static PK2HATTRPCK k2h_cvt_attrs_to_bin(K2HAttrs* pAttrs, int& attrspckcnt)
+PK2HATTRPCK k2h_cvt_attrs_to_bin(K2HAttrs* pAttrs, int& attrspckcnt)
 {
 	if(!pAttrs || 0 == pAttrs->size()){
 		attrspckcnt = 0;

diff --git a/lib/k2hqueue.cc b/lib/k2hqueue.cc
@@ -540,7 +540,7 @@ bool K2HLowOpsQueue::Push(const unsigned char* bydata, size_t datalen, K2HAttrs*
 		ERR_K2HPRN("This object is not safe.");
 		return false;
 	}
-	return pK2HShm->AddQueue(marker, marker_len, bydata, datalen, isFIFO, false);	// [NOTE] not update chain, check update file
+	return pK2HShm->AddQueue(marker, marker_len, bydata, datalen, isFIFO);
 }
 
 //