[PATCH 1/2] index: remove unused C++ wrappers

Vladimir Davydov vdavydov.dev at gmail.com
Mon Feb 5 16:25:40 MSK 2018


---
 src/box/index.h | 105 --------------------------------------------------------
 1 file changed, 105 deletions(-)

diff --git a/src/box/index.h b/src/box/index.h
index 34416fc8..54a27f6f 100644
--- a/src/box/index.h
+++ b/src/box/index.h
@@ -598,80 +598,6 @@ struct IteratorGuard
  * They throw an exception in case of error.
  */
 
-static inline size_t
-index_size_xc(struct index *index)
-{
-	ssize_t ret = index_size(index);
-	if (ret < 0)
-		diag_raise();
-	return ret;
-}
-
-static inline size_t
-index_bsize_xc(struct index *index)
-{
-	ssize_t ret = index_bsize(index);
-	if (ret < 0)
-		diag_raise();
-	return ret;
-}
-
-static inline struct tuple *
-index_min_xc(struct index *index, const char *key, uint32_t part_count)
-{
-	struct tuple *result;
-	if (index_min(index, key, part_count, &result) < 0)
-		diag_raise();
-	return result;
-}
-
-static inline struct tuple *
-index_max_xc(struct index *index, const char *key, uint32_t part_count)
-{
-	struct tuple *result;
-	if (index_max(index, key, part_count, &result) < 0)
-		diag_raise();
-	return result;
-}
-
-static inline struct tuple *
-index_random_xc(struct index *index, uint32_t rnd)
-{
-	struct tuple *result;
-	if (index_random(index, rnd, &result) < 0)
-		diag_raise();
-	return result;
-}
-
-static inline size_t
-index_count_xc(struct index *index, enum iterator_type type,
-	       const char *key, uint32_t part_count)
-{
-	ssize_t ret = index_count(index, type, key, part_count);
-	if (ret < 0)
-		diag_raise();
-	return ret;
-}
-
-static inline struct tuple *
-index_get_xc(struct index *index, const char *key, uint32_t part_count)
-{
-	struct tuple *result;
-	if (index_get(index, key, part_count, &result) < 0)
-		diag_raise();
-	return result;
-}
-
-static inline struct tuple *
-index_replace_xc(struct index *index, struct tuple *old_tuple,
-		 struct tuple *new_tuple, enum dup_replace_mode mode)
-{
-	struct tuple *result;
-	if (index_replace(index, old_tuple, new_tuple, mode, &result) < 0)
-		diag_raise();
-	return result;
-}
-
 static inline struct iterator *
 index_create_iterator_xc(struct index *index, enum iterator_type type,
 			 const char *key, uint32_t part_count)
@@ -683,37 +609,6 @@ index_create_iterator_xc(struct index *index, enum iterator_type type,
 	return it;
 }
 
-static inline struct snapshot_iterator *
-index_create_snapshot_iterator_xc(struct index *index)
-{
-	struct snapshot_iterator *it =
-		index->vtab->create_snapshot_iterator(index);
-	if (it == NULL)
-		diag_raise();
-	return it;
-}
-
-static inline void
-index_reserve_xc(struct index *index, uint32_t size_hint)
-{
-	if (index->vtab->reserve(index, size_hint) < 0)
-		diag_raise();
-}
-
-static inline void
-index_build_next_xc(struct index *index, struct tuple *tuple)
-{
-	if (index->vtab->build_next(index, tuple) < 0)
-		diag_raise();
-}
-
-static inline void
-index_build_xc(struct index *index, struct index *pk)
-{
-	if (index_build(index, pk) != 0)
-		diag_raise();
-}
-
 static inline struct tuple *
 iterator_next_xc(struct iterator *it)
 {
-- 
2.11.0




More information about the Tarantool-patches mailing list