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

fix:error in windows

This commit is contained in:
wangmm0220 2022-12-19 17:04:44 +08:00
parent b3e6cfdca7
commit 55a06b63b7
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/client/inc/clientSml.h
View File

@ -204,6 +204,12 @@ extern int64_t smlFactorS[3];
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);
int nodeListSet(NodeList** list, const void *key, int32_t len, void* value, _equal_fn_sml fn);
int nodeListSize(NodeList* list);

4
source/client/src/clientSml.c
View File

@ -1021,7 +1021,7 @@ static void smlDestroyTableInfo(SSmlTableInfo *tag) {
taosMemoryFree(tag);
}
static void smlDestroyInfo(SSmlHandle *info) {
void smlDestroyInfo(SSmlHandle *info) {
if (!info) return;
qDestroyQuery(info->pQuery);
@ -1063,7 +1063,7 @@ static void smlDestroyInfo(SSmlHandle *info) {
taosMemoryFreeClear(info);
}
static SSmlHandle *smlBuildSmlInfo(TAOS *taos) {
SSmlHandle *smlBuildSmlInfo(TAOS *taos) {
int32_t code = TSDB_CODE_SUCCESS;
SSmlHandle *info = (SSmlHandle *)taosMemoryCalloc(1, sizeof(SSmlHandle));
if (NULL == info) {

6
source/client/src/clientSmlJson.c
View File

@ -27,7 +27,7 @@ while(*(start)){\
(start)++;\
}
static SArray *smlJsonParseTags(char *start, char *end){
SArray *smlJsonParseTags(char *start, char *end){
SArray *tags = taosArrayInit(4, sizeof(SSmlKv));
while(start < end){
SSmlKv kv = {0};
@ -233,7 +233,7 @@ static char* smlJsonGetObj(char *payload){
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;
while(*(*start)){
if((*start)[0] != '"'){
@ -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;
while(*(*start)){
if((*start)[0] != '"'){

5
source/client/test/smlTest.cpp
View File

@ -25,10 +25,7 @@
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
#include "../src/clientSmlLine.c"
#include "../src/clientSmlJson.c"
#include "../src/clientSmlTelnet.c"
#include "../src/clientSml.c"
#include "../inc/clientSml.h"
#include "taos.h"
int main(int argc, char **argv) {