Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/kvrocks
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 730032dcfe04c76538534a67ed11f79c6dc39112
Choose a base ref
..
head repository: apache/kvrocks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46fe25a945622a1f3af25f42e1bb5ae5e4f4f1b8
Choose a head ref
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/scripting.cc
  2. +1 −1 src/scripting.h
2 changes: 1 addition & 1 deletion src/scripting.cc
Original file line number Diff line number Diff line change
@@ -776,7 +776,7 @@ std::string replyToRedisReply(lua_State *lua) {
* by the non-error-trapping version of redis.pcall(), which is redis.call(),
* this function will raise the Lua error so that the execution of the
* script will be halted. */
int raiseError(lua_State *lua) {
[[noreturn]] void raiseError(lua_State *lua) {
lua_pushstring(lua, "err");
lua_gettable(lua, -2);
lua_error(lua);
2 changes: 1 addition & 1 deletion src/scripting.h
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ const char *redisProtocolToLuaType_Bool(lua_State *lua, const char *reply, int t
const char *redisProtocolToLuaType_Double(lua_State *lua, const char *reply);
std::string replyToRedisReply(lua_State *lua);
void pushError(lua_State *lua, const char *err);
int raiseError(lua_State *lua);
[[noreturn]] void raiseError(lua_State *lua);
void sortArray(lua_State *lua);
void setGlobalArray(lua_State *lua, const std::string &var, const std::vector<std::string> &elems);