Add dn_simdhash_ght_try_insert

Author: kg

src/native/containers/dn-simdhash-ght-compatible.c

@@ -164,6 +164,46 @@ dn_simdhash_ght_insert_replace (
 	}
 }
 
+dn_simdhash_add_result
+dn_simdhash_ght_try_insert (
+	dn_simdhash_ght_t *hash,
+	void *key, void *value,
+	dn_simdhash_insert_mode mode
+)
+{
+	check_self(hash);
+	uint32_t key_hash = DN_SIMDHASH_KEY_HASHER(DN_SIMDHASH_GET_DATA(hash), key);
+
+	dn_simdhash_insert_result ok = DN_SIMDHASH_TRY_INSERT_INTERNAL(hash, key, key_hash, value, mode);
+	if (ok == DN_SIMDHASH_INSERT_NEED_TO_GROW) {
+		uint8_t grow_ok;
+		dn_simdhash_buffers_t old_buffers = dn_simdhash_ensure_capacity_internal(hash, dn_simdhash_capacity(hash) + 1, &grow_ok);
+		// The ghashtable API doesn't have a way to signal failure, so just assert that we didn't fail to grow
+		if (!grow_ok)
+			return DN_SIMDHASH_OUT_OF_MEMORY;
+
+		if (old_buffers.buckets) {
+			DN_SIMDHASH_REHASH_INTERNAL(hash, old_buffers);
+			dn_simdhash_free_buffers(old_buffers);
+		}
+		ok = DN_SIMDHASH_TRY_INSERT_INTERNAL(hash, key, key_hash, value, mode);
+	}
+
+	switch (ok) {
+		case DN_SIMDHASH_INSERT_OK_ADDED_NEW:
+			hash->count++;
+			return DN_SIMDHASH_ADD_INSERTED;
+		case DN_SIMDHASH_INSERT_OK_OVERWROTE_EXISTING:
+			return DN_SIMDHASH_ADD_OVERWROTE;
+		case DN_SIMDHASH_INSERT_KEY_ALREADY_PRESENT:
+			return DN_SIMDHASH_ADD_FAILED;
+		case DN_SIMDHASH_INSERT_NEED_TO_GROW:
+		default:
+			assert(!"Internal error in dn_simdhash_ght_insert_replace");
+			return DN_SIMDHASH_OUT_OF_MEMORY;
+	}
+}
+
 void *
 dn_simdhash_ght_get_value_or_default (
 	dn_simdhash_ght_t *hash, void * key

src/native/containers/dn-simdhash-ght-compatible.h

@@ -34,6 +34,13 @@ dn_simdhash_ght_get_value_or_default (
 	dn_simdhash_ght_t *hash, void * key
 );
 
+dn_simdhash_add_result
+dn_simdhash_ght_try_insert (
+	dn_simdhash_ght_t *hash,
+	void *key, void *value,
+	dn_simdhash_insert_mode mode
+);
+
 // compatibility shims for the g_hash_table_ versions in glib.h
 #define dn_simdhash_ght_insert(h,k,v)  dn_simdhash_ght_insert_replace ((h),(k),(v),FALSE)
 #define dn_simdhash_ght_replace(h,k,v) dn_simdhash_ght_insert_replace ((h),(k),(v),TRUE)

src/native/containers/dn-simdhash-specialization.h

@@ -305,17 +305,6 @@ DN_SIMDHASH_FIND_VALUE_INTERNAL (DN_SIMDHASH_T_PTR hash, DN_SIMDHASH_KEY_T key,
 	return NULL;
 }
 
-typedef enum dn_simdhash_insert_mode {
-	// Ensures that no matching key exists in the hash, then adds the key/value pair
-	DN_SIMDHASH_INSERT_MODE_ENSURE_UNIQUE,
-	// If a matching key exists in the hash, overwrite its value but leave the key alone
-	DN_SIMDHASH_INSERT_MODE_OVERWRITE_VALUE,
-	// If a matching key exists in the hash, overwrite both the key and the value
-	DN_SIMDHASH_INSERT_MODE_OVERWRITE_KEY_AND_VALUE,
-	// Do not scan for existing matches before adding the new key/value pair.
-	DN_SIMDHASH_INSERT_MODE_REHASHING,
-} dn_simdhash_insert_mode;
-
 static void
 do_overwrite (
 	DN_SIMDHASH_T_PTR hash, uint32_t bucket_index, bucket_t *bucket_address, int index_in_bucket,

src/native/containers/dn-simdhash.h

@@ -48,16 +48,29 @@ typedef struct dn_simdhash_t dn_simdhash_t;
 
 typedef struct dn_simdhash_meta_t {
 	// type metadata for generic implementation
+	// NOTE: key_size and value_size are not used consistently by every part of the implementation,
+	//  a specialization is still strongly typed based on its KEY_T and VALUE_T. But they need to match.
 	uint32_t bucket_capacity, bucket_size_bytes, key_size, value_size,
 	// Allocate this many bytes of extra data inside the dn_simdhash_t
 		data_size;
 } dn_simdhash_meta_t;
 
+typedef enum dn_simdhash_insert_mode {
+	// Ensures that no matching key exists in the hash, then adds the key/value pair
+	DN_SIMDHASH_INSERT_MODE_ENSURE_UNIQUE,
+	// If a matching key exists in the hash, overwrite its value but leave the key alone
+	DN_SIMDHASH_INSERT_MODE_OVERWRITE_VALUE,
+	// If a matching key exists in the hash, overwrite both the key and the value
+	DN_SIMDHASH_INSERT_MODE_OVERWRITE_KEY_AND_VALUE,
+	// Do not scan for existing matches before adding the new key/value pair.
+	DN_SIMDHASH_INSERT_MODE_REHASHING,
+} dn_simdhash_insert_mode;
+
 typedef enum dn_simdhash_add_result {
-    DN_SIMDHASH_OUT_OF_MEMORY = -1,
-    DN_SIMDHASH_ADD_FAILED = 0,
-    DN_SIMDHASH_ADD_INSERTED = 1,
-    DN_SIMDHASH_ADD_OVERWROTE = 2,
+	DN_SIMDHASH_OUT_OF_MEMORY = -1,
+	DN_SIMDHASH_ADD_FAILED = 0,
+	DN_SIMDHASH_ADD_INSERTED = 1,
+	DN_SIMDHASH_ADD_OVERWROTE = 2,
 } dn_simdhash_add_result;
 
 typedef enum dn_simdhash_insert_result {