From 9baa27267c37c5affd98aa93caa182316fdacc15 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Wed, 15 Apr 2015 16:34:42 +0300
Subject: [PATCH] Rename Index::memsize() to Index::bsize()
Required for #194
---
src/box/index.h | 2 +-
src/box/lua/index.cc | 4 ++--
src/box/lua/index.h | 2 +-
src/box/lua/schema.lua | 8 ++++----
src/box/memtx_bitset.cc | 2 +-
src/box/memtx_bitset.h | 2 +-
src/box/memtx_hash.cc | 2 +-
src/box/memtx_hash.h | 2 +-
src/box/memtx_rtree.cc | 4 ++--
src/box/memtx_rtree.h | 2 +-
src/box/memtx_tree.cc | 2 +-
src/box/memtx_tree.h | 2 +-
src/box/sophia_index.cc | 2 +-
src/box/sophia_index.h | 2 +-
src/box/space.cc | 2 +-
src/box/space.h | 2 +-
src/ffisyms.cc | 2 +-
test/big/hash.result | 7 +++++++
test/big/hash.test.lua | 4 ++++
test/big/tree_pk.result | 7 +++++++
test/big/tree_pk.test.lua | 4 ++++
21 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/src/box/index.h b/src/box/index.h
index 959ec461f2..84e3dd9a28 100644
--- a/src/box/index.h
+++ b/src/box/index.h
@@ -184,7 +184,7 @@ class Index: public Object {
virtual struct tuple *replace(struct tuple *old_tuple,
struct tuple *new_tuple,
enum dup_replace_mode mode) = 0;
- virtual size_t memsize() const = 0;
+ virtual size_t bsize() const = 0;
/**
* Create a structure to represent an iterator. Must be
* initialized separately.
diff --git a/src/box/lua/index.cc b/src/box/lua/index.cc
index 0d2336a9d6..ae010f76cd 100644
--- a/src/box/lua/index.cc
+++ b/src/box/lua/index.cc
@@ -48,10 +48,10 @@ check_index(uint32_t space_id, uint32_t index_id)
}
size_t
-boxffi_index_memsize(uint32_t space_id, uint32_t index_id)
+boxffi_index_bsize(uint32_t space_id, uint32_t index_id)
{
try {
- return check_index(space_id, index_id)->memsize();
+ return check_index(space_id, index_id)->bsize();
} catch (Exception *) {
return (size_t) -1; /* handled by box.error() in Lua */
}
diff --git a/src/box/lua/index.h b/src/box/lua/index.h
index adb76c27f0..ec176bb963 100644
--- a/src/box/lua/index.h
+++ b/src/box/lua/index.h
@@ -56,7 +56,7 @@ boxffi_index_iterator(uint32_t space_id, uint32_t index_id, int type,
const char *key);
size_t
-boxffi_index_memsize(uint32_t space_id, uint32_t index_id);
+boxffi_index_bsize(uint32_t space_id, uint32_t index_id);
struct tuple*
boxffi_iterator_next(struct iterator *itr);
diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index 54b09f82a1..72d8458396 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -23,7 +23,7 @@ ffi.cdef[[
size_t
boxffi_index_len(uint32_t space_id, uint32_t index_id);
size_t
- boxffi_index_memsize(uint32_t space_id, uint32_t index_id);
+ boxffi_index_bsize(uint32_t space_id, uint32_t index_id);
struct tuple *
boxffi_index_random(uint32_t space_id, uint32_t index_id, uint32_t rnd);
struct tuple *
@@ -590,9 +590,9 @@ function box.schema.space.bless(space)
end
return tonumber(ret)
end
- -- index.memsize
- index_mt.memsize = function(index)
- local ret = builtin.boxffi_index_memsize(index.space_id, index.id)
+ -- index.bsize
+ index_mt.bsize = function(index)
+ local ret = builtin.boxffi_index_bsize(index.space_id, index.id)
if ret == -1 then
box.error()
end
diff --git a/src/box/memtx_bitset.cc b/src/box/memtx_bitset.cc
index c5a9d89acc..64147c67ce 100644
--- a/src/box/memtx_bitset.cc
+++ b/src/box/memtx_bitset.cc
@@ -110,7 +110,7 @@ MemtxBitset::size() const
}
size_t
-MemtxBitset::memsize() const
+MemtxBitset::bsize() const
{
return 0;
}
diff --git a/src/box/memtx_bitset.h b/src/box/memtx_bitset.h
index 85dc8affdf..b6b0435aa5 100644
--- a/src/box/memtx_bitset.h
+++ b/src/box/memtx_bitset.h
@@ -49,7 +49,7 @@ class MemtxBitset: public Index {
struct tuple *new_tuple,
enum dup_replace_mode mode);
- virtual size_t memsize() const;
+ virtual size_t bsize() const;
virtual struct iterator *allocIterator() const;
virtual void initIterator(struct iterator *iterator,
enum iterator_type type,
diff --git a/src/box/memtx_hash.cc b/src/box/memtx_hash.cc
index 93b7c63c65..f0fd2cc475 100644
--- a/src/box/memtx_hash.cc
+++ b/src/box/memtx_hash.cc
@@ -230,7 +230,7 @@ MemtxHash::size() const
}
size_t
-MemtxHash::memsize() const
+MemtxHash::bsize() const
{
return matras_extents_count(&hash_table->mtable) * HASH_INDEX_EXTENT_SIZE;
}
diff --git a/src/box/memtx_hash.h b/src/box/memtx_hash.h
index 7112569812..448b576a52 100644
--- a/src/box/memtx_hash.h
+++ b/src/box/memtx_hash.h
@@ -50,7 +50,7 @@ class MemtxHash: public Index {
virtual void initIterator(struct iterator *iterator,
enum iterator_type type,
const char *key, uint32_t part_count) const;
- virtual size_t memsize() const;
+ virtual size_t bsize() const;
protected:
struct light_index_core *hash_table;
diff --git a/src/box/memtx_rtree.cc b/src/box/memtx_rtree.cc
index 6a6bc037e7..7106aa0f7c 100644
--- a/src/box/memtx_rtree.cc
+++ b/src/box/memtx_rtree.cc
@@ -185,9 +185,9 @@ MemtxRTree::size() const
}
size_t
-MemtxRTree::memsize() const
+MemtxRTree::bsize() const
{
- return rtree_used_size(&tree);
+ return rtree_used_size(&tree);
}
struct tuple *
diff --git a/src/box/memtx_rtree.h b/src/box/memtx_rtree.h
index c72732a9e5..f4aa0ca614 100644
--- a/src/box/memtx_rtree.h
+++ b/src/box/memtx_rtree.h
@@ -46,7 +46,7 @@ class MemtxRTree: public Index
struct tuple *new_tuple,
enum dup_replace_mode mode);
- virtual size_t memsize() const;
+ virtual size_t bsize() const;
virtual struct iterator *allocIterator() const;
virtual void initIterator(struct iterator *iterator,
enum iterator_type type,
diff --git a/src/box/memtx_tree.cc b/src/box/memtx_tree.cc
index af0a95b297..cc418738db 100644
--- a/src/box/memtx_tree.cc
+++ b/src/box/memtx_tree.cc
@@ -204,7 +204,7 @@ MemtxTree::size() const
}
size_t
-MemtxTree::memsize() const
+MemtxTree::bsize() const
{
return bps_tree_index_mem_used(&tree);
}
diff --git a/src/box/memtx_tree.h b/src/box/memtx_tree.h
index 5102e2458c..00019cc7b1 100644
--- a/src/box/memtx_tree.h
+++ b/src/box/memtx_tree.h
@@ -68,7 +68,7 @@ class MemtxTree: public Index {
struct tuple *new_tuple,
enum dup_replace_mode mode);
- virtual size_t memsize() const;
+ virtual size_t bsize() const;
virtual struct iterator *allocIterator() const;
virtual void initIterator(struct iterator *iterator,
enum iterator_type type,
diff --git a/src/box/sophia_index.cc b/src/box/sophia_index.cc
index 5bb10b2de8..54ed7fa21d 100644
--- a/src/box/sophia_index.cc
+++ b/src/box/sophia_index.cc
@@ -194,7 +194,7 @@ SophiaIndex::size() const
}
size_t
-SophiaIndex::memsize() const
+SophiaIndex::bsize() const
{
void *c = sp_ctl(env);
char name[128];
diff --git a/src/box/sophia_index.h b/src/box/sophia_index.h
index 8a9bacc0c0..cbef29754e 100644
--- a/src/box/sophia_index.h
+++ b/src/box/sophia_index.h
@@ -46,7 +46,7 @@ class SophiaIndex: public Index {
virtual void initIterator(struct iterator *iterator,
enum iterator_type type,
const char *key, uint32_t part_count) const;
- virtual size_t memsize() const;
+ virtual size_t bsize() const;
void *env;
void *db;
diff --git a/src/box/space.cc b/src/box/space.cc
index 261c455041..1a2054a09e 100644
--- a/src/box/space.cc
+++ b/src/box/space.cc
@@ -185,7 +185,7 @@ space_stat(struct space *sp)
if (index) {
space_stat.index[i].id = i;
space_stat.index[i].keys = index->size();
- space_stat.index[i].memsize = index->memsize();
+ space_stat.index[i].bsize = index->bsize();
} else
space_stat.index[i].id = -1;
}
diff --git a/src/box/space.h b/src/box/space.h
index dd513be625..fc326c4bd0 100644
--- a/src/box/space.h
+++ b/src/box/space.h
@@ -271,7 +271,7 @@ space_run_triggers(struct space *space, bool yesno);
struct index_stat {
int32_t id;
int64_t keys;
- int64_t memsize;
+ int64_t bsize;
};
struct space_stat {
diff --git a/src/ffisyms.cc b/src/ffisyms.cc
index b2917b1798..5062a2af1c 100644
--- a/src/ffisyms.cc
+++ b/src/ffisyms.cc
@@ -34,7 +34,7 @@ void *ffi_symbols[] = {
(void *) tuple_next,
(void *) tuple_unref,
(void *) boxffi_index_len,
- (void *) boxffi_index_memsize,
+ (void *) boxffi_index_bsize,
(void *) boxffi_index_random,
(void *) boxffi_index_get,
(void *) boxffi_index_iterator,
diff --git a/test/big/hash.result b/test/big/hash.result
index d511bdc077..b5a1ecc0e5 100644
--- a/test/big/hash.result
+++ b/test/big/hash.result
@@ -13,6 +13,9 @@ hash = box.schema.space.create('tweedledum')
tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
---
...
+bsize = tmp:bsize()
+---
+...
-- Insert valid fields
hash:insert{0, 'value1 v1.0', 'value2 v1.0'}
---
@@ -30,6 +33,10 @@ hash:insert{3, 'value1 v1.0', 'value2 v1.0'}
---
- [3, 'value1 v1.0', 'value2 v1.0']
...
+tmp:bsize() > bsize
+---
+- true
+...
-- Insert invalid fields
hash:insert{'invalid key', 'value1 v1.0', 'value2 v1.0'}
---
diff --git a/test/big/hash.test.lua b/test/big/hash.test.lua
index 3df6f0be42..bf505b3c3f 100644
--- a/test/big/hash.test.lua
+++ b/test/big/hash.test.lua
@@ -9,12 +9,16 @@ dofile('utils.lua')
hash = box.schema.space.create('tweedledum')
tmp = hash:create_index('primary', { type = 'hash', parts = {1, 'num'}, unique = true })
+bsize = tmp:bsize()
+
-- Insert valid fields
hash:insert{0, 'value1 v1.0', 'value2 v1.0'}
hash:insert{1, 'value1 v1.0', 'value2 v1.0'}
hash:insert{2, 'value1 v1.0', 'value2 v1.0'}
hash:insert{3, 'value1 v1.0', 'value2 v1.0'}
+tmp:bsize() > bsize
+
-- Insert invalid fields
hash:insert{'invalid key', 'value1 v1.0', 'value2 v1.0'}
diff --git a/test/big/tree_pk.result b/test/big/tree_pk.result
index d75f06d5a0..a8a3f3cf35 100644
--- a/test/big/tree_pk.result
+++ b/test/big/tree_pk.result
@@ -7,6 +7,9 @@ s0 = box.schema.space.create('tweedledum')
i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
---
...
+bsize = i0:bsize()
+---
+...
-- integer keys
s0:insert{1, 'tuple'}
---
@@ -24,6 +27,10 @@ box.snapshot()
---
- ok
...
+i0:bsize() > bsize
+---
+- true
+...
s0:insert{3, 'tuple 3'}
---
- [3, 'tuple 3']
diff --git a/test/big/tree_pk.test.lua b/test/big/tree_pk.test.lua
index fc48c6f7e7..6a696143ff 100644
--- a/test/big/tree_pk.test.lua
+++ b/test/big/tree_pk.test.lua
@@ -3,12 +3,16 @@ dofile('utils.lua')
s0 = box.schema.space.create('tweedledum')
i0 = s0:create_index('primary', { type = 'tree', parts = {1, 'num'}, unique = true })
+bsize = i0:bsize()
+
-- integer keys
s0:insert{1, 'tuple'}
box.snapshot()
s0:insert{2, 'tuple 2'}
box.snapshot()
+i0:bsize() > bsize
+
s0:insert{3, 'tuple 3'}
s0.index['primary']:get{1}
s0.index['primary']:get{2}
--
GitLab