optimized hashtable and fixed a bug

2 files changed, 7 insertions, 5 deletions

diff --git a/src/hashtable.c b/src/hashtable.c
index 2ec766d..84676a9 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -27,7 +27,6 @@ hashtable_t* init_hashtable(unsigned int capacity, hashtable_t* parent) {
 	return ht;
 }
 void destroy_hashtable(hashtable_t* hashtable) {
-	/* TODO: optimize this */
 	for (int i = 0; i < hashtable->capacity; i++) {
 		if (hashtable->pairs[i].key != NULL) {
 			free(hashtable->pairs[i].key);
@@ -48,9 +47,11 @@ unsigned int get_hash(char* str) {
 unsigned int hashtable_add_pair(hashtable_t* hashtable, pair_t pair) {
 	unsigned int hash = get_hash(pair.key);
 	for (int i = 0; i < hashtable->capacity; i++) {
-		pair_t p = hashtable->pairs[hash % hashtable->capacity];
+		unsigned int ha = hash + i;
+		unsigned int ia = ha % hashtable->capacity;
+		pair_t p = hashtable->pairs[ia];
 		if (p.key == NULL || strcmp(p.key, pair.key) == 0) {
-			hashtable->pairs[hash % hashtable->capacity] = pair;
+			hashtable->pairs[ia] = pair;
 			return hash;
 		}
 	}
@@ -69,7 +70,9 @@ unsigned int hashtable_update_pair_recurse(hashtable_t* origin, pair_t pair) {
 pair_t hashtable_get_pair(hashtable_t* hashtable, char* key) {
 	unsigned int hash = get_hash(key);
 	for (int i = 0; i < hashtable->capacity; i++) {
-		pair_t p = hashtable->pairs[hash % hashtable->capacity];
+		unsigned int ha = hash + i;
+		unsigned int ia = ha % hashtable->capacity;
+		pair_t p = hashtable->pairs[ia];
 		if (p.key != NULL && strcmp(p.key, key) == 0) {
 			return p;
 		}
diff --git a/src/hashtable.h b/src/hashtable.h
index 6f0dc51..aa387d5 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -9,7 +9,6 @@ pair_t init_pair(char* key, void* value);
 typedef struct HashTable {
 	pair_t* pairs;
 	int capacity;
-	int itemCount;
 	struct HashTable* parent;
 } hashtable_t;
 hashtable_t* init_hashtable(unsigned int capacity, hashtable_t* parent);