xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix compile error with gcc4.8+

This commit is contained in:
yihaoDeng 2021-04-22 17:08:52 +08:00
parent 9af52d8f24
commit baba270e7a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/query/inc/qScript.h
View File

@ -19,7 +19,6 @@
#include <lua.h> #include <lua.h>
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
#include <openssl/sha.h>
#include "tutil.h" #include "tutil.h"
#include "hash.h" #include "hash.h"
@ -28,6 +27,9 @@
#define MAX_FUNC_NAME 64 #define MAX_FUNC_NAME 64
#define USER_FUNC_NAME "funcName"
#define USER_FUNC_NAME_LIMIT 48
enum ScriptState { enum ScriptState {
SCRIPT_STATE_INIT, SCRIPT_STATE_INIT,
SCRIPT_STATE_ADD, SCRIPT_STATE_ADD,
@ -42,7 +44,7 @@ typedef struct {
} ScriptEnv; } ScriptEnv;
typedef struct ScriptCtx { typedef struct ScriptCtx {
char funcName[MAX_FUNC_NAME]; char funcName[USER_FUNC_NAME_LIMIT];
int8_t state; int8_t state;
ScriptEnv *pEnv; ScriptEnv *pEnv;
int8_t isAgg; // agg function or not int8_t isAgg; // agg function or not

4
src/query/src/qScript.c
View File

@ -22,10 +22,6 @@
static ScriptEnvPool *pool = NULL; static ScriptEnvPool *pool = NULL;
#define USER_FUNC_NAME "funcName"
#define USER_FUNC_NAME_LIMIT 48
static ScriptEnv* getScriptEnvFromPool(); static ScriptEnv* getScriptEnvFromPool();
static void addScriptEnvToPool(ScriptEnv *pEnv); static void addScriptEnvToPool(ScriptEnv *pEnv);