未验证 提交 129770d5 编写于 作者: wmmhello's avatar wmmhello 提交者: GitHub

Merge pull request #19031 from taosdata/refact/submit_req_marks

fix:error in windows
...@@ -204,6 +204,12 @@ extern int64_t smlFactorS[3]; ...@@ -204,6 +204,12 @@ extern int64_t smlFactorS[3];
typedef int32_t (*_equal_fn_sml)(const void *, const void *); typedef int32_t (*_equal_fn_sml)(const void *, const void *);
SSmlHandle *smlBuildSmlInfo(TAOS *taos);
void smlDestroyInfo(SSmlHandle *info);
void smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int8_t *offset);
void smlJsonParseObj(char **start, SSmlLineInfo *element, int8_t *offset);
SArray *smlJsonParseTags(char *start, char *end);
bool smlParseNumberOld(SSmlKv *kvVal, SSmlMsgBuf *msg);
void* nodeListGet(NodeList* list, const void *key, int32_t len, _equal_fn_sml fn); void* nodeListGet(NodeList* list, const void *key, int32_t len, _equal_fn_sml fn);
int nodeListSet(NodeList** list, const void *key, int32_t len, void* value, _equal_fn_sml fn); int nodeListSet(NodeList** list, const void *key, int32_t len, void* value, _equal_fn_sml fn);
int nodeListSize(NodeList* list); int nodeListSize(NodeList* list);
......
...@@ -1021,7 +1021,7 @@ static void smlDestroyTableInfo(SSmlTableInfo *tag) { ...@@ -1021,7 +1021,7 @@ static void smlDestroyTableInfo(SSmlTableInfo *tag) {
taosMemoryFree(tag); taosMemoryFree(tag);
} }
static void smlDestroyInfo(SSmlHandle *info) { void smlDestroyInfo(SSmlHandle *info) {
if (!info) return; if (!info) return;
qDestroyQuery(info->pQuery); qDestroyQuery(info->pQuery);
...@@ -1063,7 +1063,7 @@ static void smlDestroyInfo(SSmlHandle *info) { ...@@ -1063,7 +1063,7 @@ static void smlDestroyInfo(SSmlHandle *info) {
taosMemoryFreeClear(info); taosMemoryFreeClear(info);
} }
static SSmlHandle *smlBuildSmlInfo(TAOS *taos) { SSmlHandle *smlBuildSmlInfo(TAOS *taos) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
SSmlHandle *info = (SSmlHandle *)taosMemoryCalloc(1, sizeof(SSmlHandle)); SSmlHandle *info = (SSmlHandle *)taosMemoryCalloc(1, sizeof(SSmlHandle));
if (NULL == info) { if (NULL == info) {
......
...@@ -27,7 +27,7 @@ while(*(start)){\ ...@@ -27,7 +27,7 @@ while(*(start)){\
(start)++;\ (start)++;\
} }
static SArray *smlJsonParseTags(char *start, char *end){ SArray *smlJsonParseTags(char *start, char *end){
SArray *tags = taosArrayInit(4, sizeof(SSmlKv)); SArray *tags = taosArrayInit(4, sizeof(SSmlKv));
while(start < end){ while(start < end){
SSmlKv kv = {0}; SSmlKv kv = {0};
...@@ -233,7 +233,7 @@ static char* smlJsonGetObj(char *payload){ ...@@ -233,7 +233,7 @@ static char* smlJsonGetObj(char *payload){
return NULL; return NULL;
} }
static inline void smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int8_t *offset){ void smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int8_t *offset){
int index = 0; int index = 0;
while(*(*start)){ while(*(*start)){
if((*start)[0] != '"'){ if((*start)[0] != '"'){
...@@ -335,7 +335,7 @@ static inline void smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int ...@@ -335,7 +335,7 @@ static inline void smlJsonParseObjFirst(char **start, SSmlLineInfo *element, int
} }
} }
static inline void smlJsonParseObj(char **start, SSmlLineInfo *element, int8_t *offset){ void smlJsonParseObj(char **start, SSmlLineInfo *element, int8_t *offset){
int index = 0; int index = 0;
while(*(*start)){ while(*(*start)){
if((*start)[0] != '"'){ if((*start)[0] != '"'){
......
...@@ -25,10 +25,7 @@ ...@@ -25,10 +25,7 @@
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wsign-compare"
#include "../src/clientSmlLine.c" #include "../inc/clientSml.h"
#include "../src/clientSmlJson.c"
#include "../src/clientSmlTelnet.c"
#include "../src/clientSml.c"
#include "taos.h" #include "taos.h"
int main(int argc, char **argv) { int main(int argc, char **argv) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册