From 3b8ba79917c8e0b0fb5c42b2ef35ef92ad5acab6 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Thu, 10 Sep 2015 22:04:31 +0300
Subject: [PATCH] fiber: rename a fiber key
---
src/box/sophia_engine.cc | 2 +-
src/box/sophia_index.cc | 6 +++---
src/fiber.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/box/sophia_engine.cc b/src/box/sophia_engine.cc
index 8c8bc727f4..7275234177 100644
--- a/src/box/sophia_engine.cc
+++ b/src/box/sophia_engine.cc
@@ -238,7 +238,7 @@ sophia_poll(SophiaEngine *e)
struct fiber *fiber =
(struct fiber *)sp_getstring(req, "arg", NULL);
assert(fiber != NULL);
- fiber_set_key(fiber, FIBER_RESULT, req);
+ fiber_set_key(fiber, FIBER_KEY_MSG, req);
fiber_call(fiber);
return 1;
}
diff --git a/src/box/sophia_index.cc b/src/box/sophia_index.cc
index 632ace5ed4..d1a07216cc 100644
--- a/src/box/sophia_index.cc
+++ b/src/box/sophia_index.cc
@@ -299,7 +299,7 @@ SophiaIndex::findByKey(const char *key, uint32_t part_count = 0) const
if (rc == 0) {
sp_destroy(obj);
fiber_yield();
- obj = fiber_get_key(fiber(), FIBER_RESULT);
+ obj = fiber_get_key(fiber(), FIBER_KEY_MSG);
if (obj == NULL)
return NULL;
rc = sp_getint(obj, "status");
@@ -660,7 +660,7 @@ sophia_iterator_next(struct iterator *ptr)
return NULL;
sp_destroy(obj);
fiber_yield();
- obj = fiber_get_key(fiber(), FIBER_RESULT);
+ obj = fiber_get_key(fiber(), FIBER_KEY_MSG);
if (obj == NULL)
return NULL;
int rc = sp_getint(obj, "status");
@@ -761,7 +761,7 @@ SophiaIndex::initIterator(struct iterator *ptr,
}
sp_destroy(obj);
fiber_yield();
- obj = fiber_get_key(fiber(), FIBER_RESULT);
+ obj = fiber_get_key(fiber(), FIBER_KEY_MSG);
if (obj == NULL) {
it->current = NULL;
return;
diff --git a/src/fiber.h b/src/fiber.h
index 17a6acbf32..ff9ebb982e 100644
--- a/src/fiber.h
+++ b/src/fiber.h
@@ -113,7 +113,7 @@ enum fiber_key {
FIBER_KEY_TXN = 2,
/** User global privilege and authentication token */
FIBER_KEY_USER = 3,
- FIBER_RESULT = 4,
+ FIBER_KEY_MSG = 4,
FIBER_KEY_MAX = 5
};
--
GitLab