From 332827ab51973a2079ff75e91e0e789d00d87f04 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Wed, 21 Jan 2015 15:24:57 +0300
Subject: [PATCH] Unify a naming scheme for engine declarations and
definitions.
---
src/box/CMakeLists.txt | 12 +++----
src/box/box.cc | 4 +--
src/box/index.cc | 4 ---
src/box/{bitset_index.cc => memtx_bitset.cc} | 29 ++++++++-------
src/box/{bitset_index.h => memtx_bitset.h} | 16 ++++-----
src/box/{engine_memtx.cc => memtx_engine.cc} | 19 +++++-----
src/box/{engine_memtx.h => memtx_engine.h} | 7 ++--
src/box/{hash_index.cc => memtx_hash.cc} | 30 ++++++++--------
src/box/{hash_index.h => memtx_hash.h} | 12 +++----
src/box/{rtree_index.cc => memtx_rtree.cc} | 28 +++++++--------
src/box/{rtree_index.h => memtx_rtree.h} | 12 +++----
src/box/{tree_index.cc => memtx_tree.cc} | 36 +++++++++----------
src/box/{tree_index.h => memtx_tree.h} | 6 ++--
.../{engine_sophia.cc => sophia_engine.cc} | 2 +-
src/box/{engine_sophia.h => sophia_engine.h} | 6 ++--
src/box/sophia_index.cc | 2 +-
test/box/errinj_index.result | 6 ++--
17 files changed, 112 insertions(+), 119 deletions(-)
rename src/box/{bitset_index.cc => memtx_bitset.cc} (90%)
rename src/box/{bitset_index.h => memtx_bitset.h} (87%)
rename src/box/{engine_memtx.cc => memtx_engine.cc} (95%)
rename src/box/{engine_memtx.h => memtx_engine.h} (91%)
rename src/box/{hash_index.cc => memtx_hash.cc} (92%)
rename src/box/{hash_index.h => memtx_hash.h} (89%)
rename src/box/{rtree_index.cc => memtx_rtree.cc} (93%)
rename src/box/{rtree_index.h => memtx_rtree.h} (89%)
rename src/box/{tree_index.cc => memtx_tree.cc} (93%)
rename src/box/{tree_index.h => memtx_tree.h} (96%)
rename src/box/{engine_sophia.cc => sophia_engine.cc} (99%)
rename src/box/{engine_sophia.h => sophia_engine.h} (92%)
diff --git a/src/box/CMakeLists.txt b/src/box/CMakeLists.txt
index f357e83fa9..41928864d6 100644
--- a/src/box/CMakeLists.txt
+++ b/src/box/CMakeLists.txt
@@ -29,13 +29,13 @@ add_library(box
tuple_update.cc
key_def.cc
index.cc
- hash_index.cc
- tree_index.cc
- rtree_index.cc
- bitset_index.cc
+ memtx_hash.cc
+ memtx_tree.cc
+ memtx_rtree.cc
+ memtx_bitset.cc
engine.cc
- engine_memtx.cc
- engine_sophia.cc
+ memtx_engine.cc
+ sophia_engine.cc
sophia_index.cc
space.cc
alter.cc
diff --git a/src/box/box.cc b/src/box/box.cc
index bc54e2f15a..b1898ecc74 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -41,8 +41,8 @@
#include "session.h"
#include "schema.h"
#include "engine.h"
-#include "engine_memtx.h"
-#include "engine_sophia.h"
+#include "memtx_engine.h"
+#include "sophia_engine.h"
#include "space.h"
#include "port.h"
#include "request.h"
diff --git a/src/box/index.cc b/src/box/index.cc
index c577549b8e..5246cb0d0b 100644
--- a/src/box/index.cc
+++ b/src/box/index.cc
@@ -27,10 +27,6 @@
* SUCH DAMAGE.
*/
#include "index.h"
-#include "hash_index.h"
-#include "tree_index.h"
-#include "bitset_index.h"
-#include "sophia_index.h"
#include "tuple.h"
#include "say.h"
#include "schema.h"
diff --git a/src/box/bitset_index.cc b/src/box/memtx_bitset.cc
similarity index 90%
rename from src/box/bitset_index.cc
rename to src/box/memtx_bitset.cc
index 4b04adb8d5..c5a9d89acc 100644
--- a/src/box/bitset_index.cc
+++ b/src/box/memtx_bitset.cc
@@ -27,12 +27,11 @@
* SUCH DAMAGE.
*/
-#include "bitset_index.h"
+#include "memtx_bitset.h"
#include <string.h>
#include "tuple.h"
-#include "bitset/index.h"
static inline struct tuple *
value_to_tuple(size_t value);
@@ -90,7 +89,7 @@ bitset_index_iterator_next(struct iterator *iterator)
return value_to_tuple(value);
}
-BitsetIndex::BitsetIndex(struct key_def *key_def)
+MemtxBitset::MemtxBitset(struct key_def *key_def)
: Index(key_def)
{
assert(!this->key_def->is_unique);
@@ -99,25 +98,25 @@ BitsetIndex::BitsetIndex(struct key_def *key_def)
panic_syserror("bitset_index_create");
}
-BitsetIndex::~BitsetIndex()
+MemtxBitset::~MemtxBitset()
{
bitset_index_destroy(&index);
}
size_t
-BitsetIndex::size() const
+MemtxBitset::size() const
{
return bitset_index_size(&index);
}
size_t
-BitsetIndex::memsize() const
+MemtxBitset::memsize() const
{
return 0;
}
struct iterator *
-BitsetIndex::allocIterator() const
+MemtxBitset::allocIterator() const
{
struct bitset_index_iterator *it = (struct bitset_index_iterator *)
malloc(sizeof(*it));
@@ -134,11 +133,11 @@ BitsetIndex::allocIterator() const
}
struct tuple *
-BitsetIndex::findByKey(const char *key, uint32_t part_count) const
+MemtxBitset::findByKey(const char *key, uint32_t part_count) const
{
(void) key;
(void) part_count;
- tnt_raise(ClientError, ER_UNSUPPORTED, "BitsetIndex", "findByKey()");
+ tnt_raise(ClientError, ER_UNSUPPORTED, "MemtxBitset", "findByKey()");
return NULL;
}
@@ -163,7 +162,7 @@ make_key(const char *field, uint32_t *key_len)
}
struct tuple *
-BitsetIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
+MemtxBitset::replace(struct tuple *old_tuple, struct tuple *new_tuple,
enum dup_replace_mode mode)
{
assert(!key_def->is_unique);
@@ -190,7 +189,7 @@ BitsetIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
size_t value = tuple_to_value(new_tuple);
if (bitset_index_insert(&index, key, key_len, value) < 0) {
tnt_raise(ClientError, ER_MEMORY_ISSUE, 0,
- "BitsetIndex", "insert");
+ "MemtxBitset", "insert");
}
}
@@ -198,7 +197,7 @@ BitsetIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
}
void
-BitsetIndex::initIterator(struct iterator *iterator, enum iterator_type type,
+MemtxBitset::initIterator(struct iterator *iterator, enum iterator_type type,
const char *key, uint32_t part_count) const
{
assert(iterator->free == bitset_index_iterator_free);
@@ -241,19 +240,19 @@ BitsetIndex::initIterator(struct iterator *iterator, enum iterator_type type,
break;
default:
tnt_raise(ClientError, ER_UNSUPPORTED,
- "BitsetIndex", "requested iterator type");
+ "MemtxBitset", "requested iterator type");
}
if (rc != 0) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
- 0, "BitsetIndex", "iterator expression");
+ 0, "MemtxBitset", "iterator expression");
}
if (bitset_index_init_iterator((bitset_index *) &index,
&it->bitset_it,
&expr) != 0) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
- 0, "BitsetIndex", "iterator state");
+ 0, "MemtxBitset", "iterator state");
}
bitset_expr_destroy(&expr);
diff --git a/src/box/bitset_index.h b/src/box/memtx_bitset.h
similarity index 87%
rename from src/box/bitset_index.h
rename to src/box/memtx_bitset.h
index 2941b4b1d4..85dc8affdf 100644
--- a/src/box/bitset_index.h
+++ b/src/box/memtx_bitset.h
@@ -1,6 +1,5 @@
-#ifndef TARANTOOL_BOX_INDEX_BITSET_H_INCLUDED
-#define TARANTOOL_BOX_INDEX_BITSET_H_INCLUDED
-
+#ifndef TARANTOOL_BOX_MEMTX_BITSET_H_INCLUDED
+#define TARANTOOL_BOX_MEMTX_BITSET_H_INCLUDED
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -31,20 +30,19 @@
*/
/**
- * @brief Objective C wrapper for bitset_index
+ * @brief Index API wrapper for bitset_index
* @see bitset/index.h
*/
-
#include "index.h"
#include "bitset/index.h"
struct bitset_index;
struct bitset_expr;
-class BitsetIndex: public Index {
+class MemtxBitset: public Index {
public:
- BitsetIndex(struct key_def *key_def);
- virtual ~BitsetIndex();
+ MemtxBitset(struct key_def *key_def);
+ virtual ~MemtxBitset();
virtual size_t size() const;
virtual struct tuple *findByKey(const char *key, uint32_t part_count) const;
virtual struct tuple *replace(struct tuple *old_tuple,
@@ -60,4 +58,4 @@ class BitsetIndex: public Index {
struct bitset_index index;
};
-#endif /* TARANTOOL_BOX_INDEX_BITSET_H_INCLUDED */
+#endif /* TARANTOOL_BOX_MEMTX_BITSET_H_INCLUDED */
diff --git a/src/box/engine_memtx.cc b/src/box/memtx_engine.cc
similarity index 95%
rename from src/box/engine_memtx.cc
rename to src/box/memtx_engine.cc
index c021d8431d..eb956a725d 100644
--- a/src/box/engine_memtx.cc
+++ b/src/box/memtx_engine.cc
@@ -26,15 +26,14 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+#include "memtx_engine.h"
#include "tuple.h"
-#include "engine.h"
-#include "engine_memtx.h"
#include "txn.h"
#include "index.h"
-#include "hash_index.h"
-#include "tree_index.h"
-#include "rtree_index.h"
-#include "bitset_index.h"
+#include "memtx_hash.h"
+#include "memtx_tree.h"
+#include "memtx_rtree.h"
+#include "memtx_bitset.h"
#include "space.h"
#include "salad/rlist.h"
#include <stdlib.h>
@@ -103,13 +102,13 @@ MemtxFactory::createIndex(struct key_def *key_def)
{
switch (key_def->type) {
case HASH:
- return new HashIndex(key_def);
+ return new MemtxHash(key_def);
case TREE:
- return new TreeIndex(key_def);
+ return new MemtxTree(key_def);
case RTREE:
- return new RTreeIndex(key_def);
+ return new MemtxRTree(key_def);
case BITSET:
- return new BitsetIndex(key_def);
+ return new MemtxBitset(key_def);
default:
assert(false);
return NULL;
diff --git a/src/box/engine_memtx.h b/src/box/memtx_engine.h
similarity index 91%
rename from src/box/engine_memtx.h
rename to src/box/memtx_engine.h
index 693b6362a7..c3c6681258 100644
--- a/src/box/engine_memtx.h
+++ b/src/box/memtx_engine.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_BOX_ENGINE_MEMTX_H_INCLUDED
-#define TARANTOOL_BOX_ENGINE_MEMTX_H_INCLUDED
+#ifndef TARANTOOL_BOX_MEMTX_ENGINE_H_INCLUDED
+#define TARANTOOL_BOX_MEMTX_ENGINE_H_INCLUDED
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -28,6 +28,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+#include "engine.h"
struct MemtxFactory: public EngineFactory {
MemtxFactory();
@@ -40,4 +41,4 @@ struct MemtxFactory: public EngineFactory {
virtual void snapshot(enum engine_snapshot_event, int64_t);
};
-#endif /* TARANTOOL_BOX_ENGINE_MEMTX_H_INCLUDED */
+#endif /* TARANTOOL_BOX_MEMTX_ENGINE_H_INCLUDED */
diff --git a/src/box/hash_index.cc b/src/box/memtx_hash.cc
similarity index 92%
rename from src/box/hash_index.cc
rename to src/box/memtx_hash.cc
index 3591a3ff43..61ac03c7c2 100644
--- a/src/box/hash_index.cc
+++ b/src/box/memtx_hash.cc
@@ -26,7 +26,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "hash_index.h"
+#include "memtx_hash.h"
#include "say.h"
#include "tuple.h"
#include "errinj.h"
@@ -153,7 +153,7 @@ typedef struct tuple * mh_node_t;
#define mh_bytemap 1
#include "salad/mhash.h"
-/* {{{ HashIndex Iterators ****************************************/
+/* {{{ MemtxHash Iterators ****************************************/
struct hash_iterator {
struct iterator base; /* Must be the first member. */
@@ -197,43 +197,43 @@ hash_iterator_eq(struct iterator *it)
/* }}} */
-/* {{{ HashIndex -- implementation of all hashes. **********************/
+/* {{{ MemtxHash -- implementation of all hashes. **********************/
-HashIndex::HashIndex(struct key_def *key_def)
+MemtxHash::MemtxHash(struct key_def *key_def)
: Index(key_def)
{
hash = mh_index_new();
if (hash == NULL) {
tnt_raise(ClientError, ER_MEMORY_ISSUE, sizeof(hash),
- "HashIndex", "hash");
+ "MemtxHash", "hash");
}
}
-HashIndex::~HashIndex()
+MemtxHash::~MemtxHash()
{
mh_index_delete(hash);
}
void
-HashIndex::reserve(uint32_t size_hint)
+MemtxHash::reserve(uint32_t size_hint)
{
mh_index_reserve(hash, size_hint, key_def);
}
size_t
-HashIndex::size() const
+MemtxHash::size() const
{
return mh_size(hash);
}
size_t
-HashIndex::memsize() const
+MemtxHash::memsize() const
{
return mh_index_memsize(hash);
}
struct tuple *
-HashIndex::random(uint32_t rnd) const
+MemtxHash::random(uint32_t rnd) const
{
uint32_t k = mh_index_random(hash, rnd);
if (k != mh_end(hash))
@@ -242,7 +242,7 @@ HashIndex::random(uint32_t rnd) const
}
struct tuple *
-HashIndex::findByKey(const char *key, uint32_t part_count) const
+MemtxHash::findByKey(const char *key, uint32_t part_count) const
{
assert(key_def->is_unique && part_count == key_def->part_count);
(void) part_count;
@@ -255,7 +255,7 @@ HashIndex::findByKey(const char *key, uint32_t part_count) const
}
struct tuple *
-HashIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
+MemtxHash::replace(struct tuple *old_tuple, struct tuple *new_tuple,
enum dup_replace_mode mode)
{
uint32_t errcode;
@@ -302,14 +302,14 @@ HashIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
}
struct iterator *
-HashIndex::allocIterator() const
+MemtxHash::allocIterator() const
{
struct hash_iterator *it = (struct hash_iterator *)
calloc(1, sizeof(*it));
if (it == NULL) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
sizeof(struct hash_iterator),
- "HashIndex", "iterator");
+ "MemtxHash", "iterator");
}
it->base.next = hash_iterator_ge;
@@ -318,7 +318,7 @@ HashIndex::allocIterator() const
}
void
-HashIndex::initIterator(struct iterator *ptr, enum iterator_type type,
+MemtxHash::initIterator(struct iterator *ptr, enum iterator_type type,
const char *key, uint32_t part_count) const
{
assert(part_count == 0 || key != NULL);
diff --git a/src/box/hash_index.h b/src/box/memtx_hash.h
similarity index 89%
rename from src/box/hash_index.h
rename to src/box/memtx_hash.h
index 424e66ec16..51848d3f40 100644
--- a/src/box/hash_index.h
+++ b/src/box/memtx_hash.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_BOX_HASH_INDEX_H_INCLUDED
-#define TARANTOOL_BOX_HASH_INDEX_H_INCLUDED
+#ifndef TARANTOOL_BOX_MEMTX_HASH_H_INCLUDED
+#define TARANTOOL_BOX_MEMTX_HASH_H_INCLUDED
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -33,10 +33,10 @@
struct mh_index_t;
-class HashIndex: public Index {
+class MemtxHash: public Index {
public:
- HashIndex(struct key_def *key_def);
- ~HashIndex();
+ MemtxHash(struct key_def *key_def);
+ ~MemtxHash();
virtual void reserve(uint32_t size_hint);
virtual size_t size() const;
@@ -56,4 +56,4 @@ class HashIndex: public Index {
struct mh_index_t *hash;
};
-#endif /* TARANTOOL_BOX_HASH_INDEX_H_INCLUDED */
+#endif /* TARANTOOL_BOX_MEMTX_HASH_H_INCLUDED */
diff --git a/src/box/rtree_index.cc b/src/box/memtx_rtree.cc
similarity index 93%
rename from src/box/rtree_index.cc
rename to src/box/memtx_rtree.cc
index a54ec9ffc2..b6f0be027e 100644
--- a/src/box/rtree_index.cc
+++ b/src/box/memtx_rtree.cc
@@ -26,7 +26,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "rtree_index.h"
+#include "memtx_rtree.h"
#include "tuple.h"
#include "space.h"
#include "errinj.h"
@@ -95,7 +95,7 @@ inline void extract_rectangle(struct rtree_rect *rect,
}
rtree_rect_normalize(rect);
}
-/* {{{ TreeIndex Iterators ****************************************/
+/* {{{ MemtxRTree Iterators ****************************************/
struct index_rtree_iterator {
struct iterator base;
@@ -119,7 +119,7 @@ index_rtree_iterator_next(struct iterator *i)
/* }}} */
-/* {{{ TreeIndex **********************************************************/
+/* {{{ MemtxRTree **********************************************************/
static void *
rtree_page_alloc()
@@ -133,7 +133,7 @@ rtree_page_free(void *page)
{
return mempool_free(&rtree_page_pool, page);
}
-RTreeIndex::~RTreeIndex()
+MemtxRTree::~MemtxRTree()
{
// Iterator has to be destroye prior to tree
if (m_position != NULL) {
@@ -143,7 +143,7 @@ RTreeIndex::~RTreeIndex()
rtree_destroy(&tree);
}
-RTreeIndex::RTreeIndex(struct key_def *key_def)
+MemtxRTree::MemtxRTree(struct key_def *key_def)
: Index(key_def)
{
assert(key_def->part_count == 1);
@@ -159,19 +159,19 @@ RTreeIndex::RTreeIndex(struct key_def *key_def)
}
size_t
-RTreeIndex::size() const
+MemtxRTree::size() const
{
return rtree_number_of_records(&tree);
}
size_t
-RTreeIndex::memsize() const
+MemtxRTree::memsize() const
{
return rtree_used_size(&tree);
}
struct tuple *
-RTreeIndex::findByKey(const char *key, uint32_t part_count) const
+MemtxRTree::findByKey(const char *key, uint32_t part_count) const
{
rtree_rect rect;
struct rtree_iterator iterator;
@@ -219,13 +219,13 @@ RTreeIndex::findByKey(const char *key, uint32_t part_count) const
}
struct tuple *result = NULL;
if (rtree_search(&tree, &rect, SOP_OVERLAPS, &iterator))
- result = (struct tuple *)rtree_iterator_next(&iterator);
+ result = (struct tuple *)rtree_iterator_next(&iterator);
rtree_iterator_destroy(&iterator);
return result;
}
struct tuple *
-RTreeIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
+MemtxRTree::replace(struct tuple *old_tuple, struct tuple *new_tuple,
enum dup_replace_mode)
{
struct rtree_rect rect;
@@ -242,7 +242,7 @@ RTreeIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
}
struct iterator *
-RTreeIndex::allocIterator() const
+MemtxRTree::allocIterator() const
{
index_rtree_iterator *it = new index_rtree_iterator;
memset(it, 0, sizeof(*it));
@@ -250,7 +250,7 @@ RTreeIndex::allocIterator() const
if (it == NULL) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
sizeof(struct index_rtree_iterator),
- "RTreeIndex", "iterator");
+ "MemtxRTree", "iterator");
}
it->base.next = index_rtree_iterator_next;
it->base.free = index_rtree_iterator_free;
@@ -258,7 +258,7 @@ RTreeIndex::allocIterator() const
}
void
-RTreeIndex::initIterator(struct iterator *iterator, enum iterator_type type,
+MemtxRTree::initIterator(struct iterator *iterator, enum iterator_type type,
const char *key, uint32_t part_count) const
{
struct rtree_rect rect;
@@ -348,7 +348,7 @@ RTreeIndex::initIterator(struct iterator *iterator, enum iterator_type type,
}
void
-RTreeIndex::beginBuild()
+MemtxRTree::beginBuild()
{
rtree_purge(&tree);
}
diff --git a/src/box/rtree_index.h b/src/box/memtx_rtree.h
similarity index 89%
rename from src/box/rtree_index.h
rename to src/box/memtx_rtree.h
index 451e0d7777..c72732a9e5 100644
--- a/src/box/rtree_index.h
+++ b/src/box/memtx_rtree.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_BOX_RTREE_INDEX_H_INCLUDED
-#define TARANTOOL_BOX_RTREE_INDEX_H_INCLUDED
+#ifndef TARANTOOL_BOX_MEMTX_RTREE_H_INCLUDED
+#define TARANTOOL_BOX_MEMTX_RTREE_H_INCLUDED
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -33,11 +33,11 @@
#include <salad/rtree.h>
-class RTreeIndex: public Index
+class MemtxRTree: public Index
{
public:
- RTreeIndex(struct key_def *key_def);
- ~RTreeIndex();
+ MemtxRTree(struct key_def *key_def);
+ ~MemtxRTree();
virtual void beginBuild();
virtual size_t size() const;
@@ -56,4 +56,4 @@ class RTreeIndex: public Index
struct rtree tree;
};
-#endif /* TARANTOOL_BOX_RTREE_INDEX_H_INCLUDED */
+#endif /* TARANTOOL_BOX_MEMTX_RTREE_H_INCLUDED */
diff --git a/src/box/tree_index.cc b/src/box/memtx_tree.cc
similarity index 93%
rename from src/box/tree_index.cc
rename to src/box/memtx_tree.cc
index 122e068bba..46a47ce07d 100644
--- a/src/box/tree_index.cc
+++ b/src/box/memtx_tree.cc
@@ -26,7 +26,7 @@
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include "tree_index.h"
+#include "memtx_tree.h"
#include "tuple.h"
#include "space.h"
#include "errinj.h"
@@ -71,7 +71,7 @@ int tree_index_qcompare(const void* a, const void *b, void *c)
*(struct tuple **)b, (struct key_def *)c);
}
-/* {{{ TreeIndex Iterators ****************************************/
+/* {{{ MemtxTree Iterators ****************************************/
struct tree_iterator {
struct iterator base;
const struct bps_tree_index *tree;
@@ -186,7 +186,7 @@ tree_iterator_bwd_skip_one_check_next_equality(struct iterator *iterator)
}
/* }}} */
-/* {{{ TreeIndex **********************************************************/
+/* {{{ MemtxTree **********************************************************/
static void *
extent_alloc()
@@ -201,7 +201,7 @@ extent_free(void *extent)
return mempool_free(&tree_extent_pool, extent);
}
-TreeIndex::TreeIndex(struct key_def *key_def_arg)
+MemtxTree::MemtxTree(struct key_def *key_def_arg)
: Index(key_def_arg), build_array(0), build_array_size(0),
build_array_alloc_size(0)
{
@@ -220,33 +220,33 @@ TreeIndex::TreeIndex(struct key_def *key_def_arg)
bps_tree_index_create(&tree, key_def, extent_alloc, extent_free);
}
-TreeIndex::~TreeIndex()
+MemtxTree::~MemtxTree()
{
bps_tree_index_destroy(&tree);
free(build_array);
}
size_t
-TreeIndex::size() const
+MemtxTree::size() const
{
return bps_tree_index_size(&tree);
}
size_t
-TreeIndex::memsize() const
+MemtxTree::memsize() const
{
return bps_tree_index_mem_used(&tree);
}
struct tuple *
-TreeIndex::random(uint32_t rnd) const
+MemtxTree::random(uint32_t rnd) const
{
struct tuple **res = bps_tree_index_random(&tree, rnd);
return res ? *res : 0;
}
struct tuple *
-TreeIndex::findByKey(const char *key, uint32_t part_count) const
+MemtxTree::findByKey(const char *key, uint32_t part_count) const
{
assert(key_def->is_unique && part_count == key_def->part_count);
@@ -258,7 +258,7 @@ TreeIndex::findByKey(const char *key, uint32_t part_count) const
}
struct tuple *
-TreeIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
+MemtxTree::replace(struct tuple *old_tuple, struct tuple *new_tuple,
enum dup_replace_mode mode)
{
uint32_t errcode;
@@ -271,7 +271,7 @@ TreeIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
bps_tree_index_insert(&tree, new_tuple, &dup_tuple);
if (!tree_res) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
- BPS_TREE_EXTENT_SIZE, "TreeIndex", "replace");
+ BPS_TREE_EXTENT_SIZE, "MemtxTree", "replace");
}
errcode = replace_check_dup(old_tuple, dup_tuple, mode);
@@ -292,14 +292,14 @@ TreeIndex::replace(struct tuple *old_tuple, struct tuple *new_tuple,
}
struct iterator *
-TreeIndex::allocIterator() const
+MemtxTree::allocIterator() const
{
struct tree_iterator *it = (struct tree_iterator *)
calloc(1, sizeof(*it));
if (it == NULL) {
tnt_raise(ClientError, ER_MEMORY_ISSUE,
sizeof(struct tree_iterator),
- "TreeIndex", "iterator");
+ "MemtxTree", "iterator");
}
it->key_def = key_def;
@@ -310,7 +310,7 @@ TreeIndex::allocIterator() const
}
void
-TreeIndex::initIterator(struct iterator *iterator, enum iterator_type type,
+MemtxTree::initIterator(struct iterator *iterator, enum iterator_type type,
const char *key, uint32_t part_count) const
{
assert(part_count == 0 || key != NULL);
@@ -379,13 +379,13 @@ TreeIndex::initIterator(struct iterator *iterator, enum iterator_type type,
}
void
-TreeIndex::beginBuild()
+MemtxTree::beginBuild()
{
assert(bps_tree_index_size(&tree) == 0);
}
void
-TreeIndex::reserve(uint32_t size_hint)
+MemtxTree::reserve(uint32_t size_hint)
{
if (size_hint < build_array_alloc_size)
return;
@@ -395,7 +395,7 @@ TreeIndex::reserve(uint32_t size_hint)
}
void
-TreeIndex::buildNext(struct tuple *tuple)
+MemtxTree::buildNext(struct tuple *tuple)
{
if (!build_array) {
build_array = (struct tuple**)malloc(BPS_TREE_EXTENT_SIZE);
@@ -415,7 +415,7 @@ TreeIndex::buildNext(struct tuple *tuple)
}
void
-TreeIndex::endBuild()
+MemtxTree::endBuild()
{
qsort_arg(build_array, build_array_size, sizeof(struct tuple *), tree_index_qcompare, key_def);
bps_tree_index_build(&tree, build_array, build_array_size);
diff --git a/src/box/tree_index.h b/src/box/memtx_tree.h
similarity index 96%
rename from src/box/tree_index.h
rename to src/box/memtx_tree.h
index dd8c7985f2..51e091ce54 100644
--- a/src/box/tree_index.h
+++ b/src/box/memtx_tree.h
@@ -51,10 +51,10 @@ tree_index_compare_key(const tuple *a, const key_data *b, struct key_def *key_de
#include "salad/bps_tree.h"
-class TreeIndex: public Index {
+class MemtxTree: public Index {
public:
- TreeIndex(struct key_def *key_def);
- virtual ~TreeIndex();
+ MemtxTree(struct key_def *key_def);
+ virtual ~MemtxTree();
virtual void beginBuild();
virtual void reserve(uint32_t size_hint);
diff --git a/src/box/engine_sophia.cc b/src/box/sophia_engine.cc
similarity index 99%
rename from src/box/engine_sophia.cc
rename to src/box/sophia_engine.cc
index 4da8630361..98fece2ff4 100644
--- a/src/box/engine_sophia.cc
+++ b/src/box/sophia_engine.cc
@@ -31,7 +31,7 @@
#include "tuple.h"
#include "scoped_guard.h"
#include "engine.h"
-#include "engine_sophia.h"
+#include "sophia_engine.h"
#include "txn.h"
#include "index.h"
#include "sophia_index.h"
diff --git a/src/box/engine_sophia.h b/src/box/sophia_engine.h
similarity index 92%
rename from src/box/engine_sophia.h
rename to src/box/sophia_engine.h
index 5c1176a83e..a9c1bc4a74 100644
--- a/src/box/engine_sophia.h
+++ b/src/box/sophia_engine.h
@@ -1,5 +1,5 @@
-#ifndef TARANTOOL_BOX_ENGINE_SOPHIA_H_INCLUDED
-#define TARANTOOL_BOX_ENGINE_SOPHIA_H_INCLUDED
+#ifndef TARANTOOL_BOX_SOPHIA_ENGINE_H_INCLUDED
+#define TARANTOOL_BOX_SOPHIA_ENGINE_H_INCLUDED
/*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
@@ -48,4 +48,4 @@ struct SophiaFactory: public EngineFactory {
void sophia_info(void (*)(const char*, const char*, void*), void*);
void sophia_raise(void*);
-#endif /* TARANTOOL_BOX_ENGINE_SOPHIA_H_INCLUDED */
+#endif /* TARANTOOL_BOX_SOPHIA_ENGINE_H_INCLUDED */
diff --git a/src/box/sophia_index.cc b/src/box/sophia_index.cc
index 135bebc032..eaef744a82 100644
--- a/src/box/sophia_index.cc
+++ b/src/box/sophia_index.cc
@@ -34,7 +34,7 @@
#include "schema.h"
#include "space.h"
#include "cfg.h"
-#include "engine_sophia.h"
+#include "sophia_engine.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <sophia.h>
diff --git a/test/box/errinj_index.result b/test/box/errinj_index.result
index d79edc5b1e..47b26fc5a5 100644
--- a/test/box/errinj_index.result
+++ b/test/box/errinj_index.result
@@ -93,7 +93,7 @@ res
...
for i = 501,2500 do s:insert{i, i} end
---
-- error: Failed to allocate 16384 bytes in TreeIndex for replace
+- error: Failed to allocate 16384 bytes in MemtxTree for replace
...
s:delete{1}
---
@@ -156,7 +156,7 @@ check_iter_and_size()
...
for i = 2501,3500 do s:insert{i, i} end
---
-- error: Failed to allocate 16384 bytes in TreeIndex for replace
+- error: Failed to allocate 16384 bytes in MemtxTree for replace
...
s:delete{2}
---
@@ -185,7 +185,7 @@ res
...
for i = 3501,4500 do s:insert{i, i} end
---
-- error: Failed to allocate 16384 bytes in TreeIndex for replace
+- error: Failed to allocate 16384 bytes in MemtxTree for replace
...
s:delete{3}
---
--
GitLab