diff --git a/src/box/sql.c b/src/box/sql.c index c7b87e57a28f2fb510d612a78d987b6da12ebad2..9aca618ced47e935b8bd9a5e8969a202b09d0bd7 100644 --- a/src/box/sql.c +++ b/src/box/sql.c @@ -340,8 +340,7 @@ int tarantoolSqlite3EphemeralCount(struct BtCursor *pCur, i64 *pnEntry) assert(pCur->curFlags & BTCF_TEphemCursor); struct index *primary_index = space_index(pCur->space, 0 /* PK */); - *pnEntry = index_count(primary_index, pCur->iter_type, pCur->key, - pCur->nKey); + *pnEntry = index_count(primary_index, pCur->iter_type, NULL, 0); return SQLITE_OK; } @@ -349,8 +348,7 @@ int tarantoolSqlite3Count(BtCursor *pCur, i64 *pnEntry) { assert(pCur->curFlags & BTCF_TaCursor); - *pnEntry = index_count(pCur->index, pCur->iter_type, pCur->key, - pCur->nKey); + *pnEntry = index_count(pCur->index, pCur->iter_type, NULL, 0); return SQLITE_OK; } @@ -1031,7 +1029,6 @@ key_alloc(BtCursor *cur, size_t key_size) } cur->key = new_key; } - cur->nKey = key_size; return 0; } diff --git a/src/box/sql/cursor.h b/src/box/sql/cursor.h index da711a7deff4cdcebef4909e2848890c5a5fdc3c..d40ca87c87cb6cd9c614b19ab2adcb6fcecdc9e9 100644 --- a/src/box/sql/cursor.h +++ b/src/box/sql/cursor.h @@ -41,7 +41,6 @@ typedef struct BtCursor BtCursor; * for ordinary space, or to TEphemCursor for ephemeral space. */ struct BtCursor { - i64 nKey; /* Size of pKey, or last integer key */ u8 curFlags; /* zero or more BTCF_* flags defined below */ u8 eState; /* One of the CURSOR_XXX constants (see below) */ u8 hints; /* As configured by CursorSetHints() */