Upgrade sdb

Mic92 · Feb 16, 2019 · 936efa6 · 936efa6
1 parent a795cd6
commit 936efa6
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 8 deletions.
diff --git a/libr/include/sdb/ht_uu.h b/libr/include/sdb/ht_uu.h
@@ -8,4 +8,6 @@
 #define HT_TYPE 0
 #include "ht_inc.h"
 
+SDB_API HtName_(Ht)* Ht_(new0)(void);
+
 #endif
diff --git a/libr/include/sdb/sdb.h b/libr/include/sdb/sdb.h
@@ -222,6 +222,7 @@ SDB_API ut8 sdb_hash_byte(const char *s);
 // SDB_API int sdb_js0n(const unsigned char *js, RangstrType len, RangstrType *out);
 SDB_API bool sdb_isjson(const char *k);
 SDB_API char *sdb_json_get_str (const char *json, const char *path);
+SDB_API bool sdb_json_get_bool(const char *json, const char *path);
 
 SDB_API char *sdb_json_get(Sdb* s, const char *key, const char *p, ut32 *cas);
 SDB_API bool sdb_json_set(Sdb* s, const char *k, const char *p, const char *v, ut32 cas);

diff --git a/shlr/sdb/src/ht_inc.c b/shlr/sdb/src/ht_inc.c
@@ -46,10 +46,17 @@ static inline void freefn(HtName_(Ht) *ht, HT_(Kv) *kv) {
 	}
 }
 
+static inline ut32 next_idx(ut32 idx) {
+	if (idx != UT32_MAX && idx < S_ARRAY_SIZE (ht_primes_sizes) - 1) {
+		return idx + 1;
+	}
+	return UT32_MAX;
+}
+
 static inline ut32 compute_size(ut32 idx, ut32 sz) {
 	// when possible, use the precomputed prime numbers which help with
 	// collisions, otherwise, at least make the number odd with |1
-	return idx != UT32_MAX ? ht_primes_sizes[idx] : (sz | 1);
+	return idx != UT32_MAX && idx < S_ARRAY_SIZE(ht_primes_sizes) ? ht_primes_sizes[idx] : (sz | 1);
 }
 
 static inline bool is_kv_equal(HtName_(Ht) *ht, const KEY_TYPE key, const ut32 key_len, const HT_(Kv) *kv) {
@@ -144,11 +151,16 @@ SDB_API void Ht_(free)(HtName_(Ht)* ht) {
 static void internal_ht_grow(HtName_(Ht)* ht) {
 	HtName_(Ht)* ht2;
 	HtName_(Ht) swap;
-	ut32 idx = ht->prime_idx != UT32_MAX ? ht->prime_idx + 1 : UT32_MAX;
+	ut32 idx = next_idx (ht->prime_idx);
 	ut32 sz = compute_size (idx, ht->size * 2);
 	ut32 i;
 
 	ht2 = internal_ht_new (sz, idx, &ht->opt);
+	if (!ht2) {
+		// we can't grow the ht anymore. Never mind, we'll be slower,
+		// but everything can continue to work
+		return;
+	}
 
 	for (i = 0; i < ht->size; i++) {
 		HT_(Bucket) *bt = &ht->table[i];

diff --git a/shlr/sdb/src/ht_uu.c b/shlr/sdb/src/ht_uu.c
@@ -1,3 +1,16 @@
 #include "ht_uu.h"
 
 #include "ht_inc.c"
+
+SDB_API HtName_(Ht)* Ht_(new0)(void) {
+	HT_(Options) opt = {
+		.cmp = NULL,
+		.hashfn = NULL,
+		.dupkey = NULL,
+		.dupvalue = NULL,
+		.calcsizeK = NULL,
+		.calcsizeV = NULL,
+		.freefn = NULL
+	};
+	return Ht_(new_opt) (&opt);
+}
diff --git a/shlr/sdb/src/ht_uu.h b/shlr/sdb/src/ht_uu.h
@@ -8,4 +8,6 @@
 #define HT_TYPE 0
 #include "ht_inc.h"
 
+SDB_API HtName_(Ht)* Ht_(new0)(void);
+
 #endif
diff --git a/shlr/sdb/src/json.c b/shlr/sdb/src/json.c
@@ -13,7 +13,13 @@ SDB_API char *sdb_json_get_str (const char *json, const char *path) {
 	return rangstr_dup (&rs);
 }
 
-SDB_API char *sdb_json_get (Sdb *s, const char *k, const char *p, ut32 *cas) {
+SDB_API bool sdb_json_get_bool(const char *json, const char *path) {
+	Rangstr rs = json_get (json, path);
+	const char *p = rs->p + rs->f;
+	return (rangstr_length (&rs) == 4 && !strncmp (p, "true", 4));
+}
+
+SDB_API char *sdb_json_get(Sdb *s, const char *k, const char *p, ut32 *cas) {
 	Rangstr rs;
 	char *u, *v = sdb_get (s, k, cas);
 	if (!v) {

diff --git a/shlr/sdb/src/json/rangstr.c b/shlr/sdb/src/json/rangstr.c
@@ -56,7 +56,7 @@ SDB_IPI int rangstr_int (Rangstr *s) {
 	}
 	if (s->p[s->f]=='-') {
 		mul = -1;
-		i += s->f+1;
+		i += s->f + 1;
 	} else {
 		i += s->f;
 	}
@@ -71,13 +71,11 @@ SDB_IPI int rangstr_int (Rangstr *s) {
 }
 
 SDB_IPI char *rangstr_dup (Rangstr *rs) {
-	int len;
-	char *p;
 	if (!rs->p) {
 		return NULL;
 	}
-	len = rangstr_length (rs);
-	p = malloc (len + 1);
+	int len = rangstr_length (rs);
+	char *p = malloc (len + 1);
 	if (p) {
 		memcpy (p, rs->p + rs->f, len);
 		p[len] = 0;

diff --git a/shlr/sdb/src/sdb.h b/shlr/sdb/src/sdb.h
@@ -222,6 +222,7 @@ SDB_API ut8 sdb_hash_byte(const char *s);
 // SDB_API int sdb_js0n(const unsigned char *js, RangstrType len, RangstrType *out);
 SDB_API bool sdb_isjson(const char *k);
 SDB_API char *sdb_json_get_str (const char *json, const char *path);
+SDB_API bool sdb_json_get_bool(const char *json, const char *path);
 
 SDB_API char *sdb_json_get(Sdb* s, const char *key, const char *p, ut32 *cas);
 SDB_API bool sdb_json_set(Sdb* s, const char *k, const char *p, const char *v, ut32 cas);