Rewrite HashIndex using tuple_compare

include/mhash.h

@@ -170,6 +170,27 @@ _mh(next_slot)(mh_int_t slot, mh_int_t inc, mh_int_t size)
 	return slot >= size ? slot - size : slot;
 }
 
+#if defined(mh_hash_key) && defined(mh_eq_key)
+static inline mh_int_t
+_mh(find)(struct _mh(t) *h, const mh_key_t *key, mh_arg_t arg)
+{
+	(void) arg;
+
+	mh_int_t k = mh_hash_key(key, arg);
+	mh_int_t i = k % h->n_buckets;
+	mh_int_t inc = 1 + k % (h->n_buckets - 1);
+	for (;;) {
+		if ((mh_exist(h, i) && mh_eq_key(key, mh_node(h, i), arg)))
+			return i;
+
+		if (!mh_dirty(h, i))
+			return h->n_buckets;
+
+		i = _mh(next_slot)(i, inc, h->n_buckets);
+	}
+}
+#endif
+
 static inline mh_int_t
 _mh(get)(struct _mh(t) *h, const mh_node_t *node,
 	 mh_arg_t arg)
@@ -506,7 +527,9 @@ _mh(dump)(struct _mh(t) *h)
 #undef mh_arg_t
 #undef mh_name
 #undef mh_hash
+#undef mh_hash_key
 #undef mh_eq
+#undef mh_eqKey
 #undef mh_node
 #undef mh_dirty
 #undef mh_place

src/box/hash_index.h

@@ -31,33 +31,35 @@
 
 #include "index.h"
 
+struct mh_index_t;
 
 class HashIndex: public Index {
 public:
-	static HashIndex *
-	factory(struct key_def *key_def, struct space *space);
-
 	HashIndex(struct key_def *key_def, struct space *space);
+	~HashIndex();
 
 	virtual void beginBuild();
 	virtual void buildNext(struct tuple *tuple);
 	virtual void endBuild();
 	virtual void build(Index *pk);
-	virtual size_t size() const  = 0;
+	virtual size_t size() const;
 	virtual struct tuple *min() const;
 	virtual struct tuple *max() const;
-	virtual struct tuple *random(u32 rnd) const = 0;
-	virtual struct tuple *findByKey(const char *key, u32 part_count) const  = 0;
+	virtual struct tuple *random(u32 rnd) const;
+	virtual struct tuple *findByKey(const char *key, u32 part_count) const;
 	virtual struct tuple *replace(struct tuple *old_tuple,
 				      struct tuple *new_tuple,
-				      enum dup_replace_mode mode)  = 0;
+				      enum dup_replace_mode mode);
 
-	virtual struct iterator *allocIterator() const = 0;
+	virtual struct iterator *allocIterator() const;
 	virtual void initIterator(struct iterator *iterator,
 				  enum iterator_type type,
-				  const char *key, u32 part_count) const  = 0;
+				  const char *key, u32 part_count) const;
+
+	virtual void reserve(u32 n_tuples);
 
-	virtual void reserve(u32 n_tuples) = 0;
+protected:
+	struct mh_index_t *hash;
 };
 
 #endif /* TARANTOOL_BOX_HASH_INDEX_H_INCLUDED */

src/box/index.cc

@@ -143,7 +143,7 @@ Index::factory(enum index_type type, struct key_def *key_def, struct space *spac
 {
 	switch (type) {
 	case HASH:
-		return HashIndex::factory(key_def, space);
+		return new HashIndex(key_def, space);
 	case TREE:
 		return TreeIndex::factory(key_def, space);
 	case BITSET: