提交 c26f9ff6 编写于 作者: H hjxilinx

minor style changes

上级 fdfd05f2
...@@ -23,7 +23,6 @@ extern "C" { ...@@ -23,7 +23,6 @@ extern "C" {
#include "taosmsg.h" #include "taosmsg.h"
#include "tsdb.h" #include "tsdb.h"
extern uint32_t sdbDebugFlag;
extern short sdbPeerPort; extern short sdbPeerPort;
extern short sdbSyncPort; extern short sdbSyncPort;
extern int sdbMaxNodes; extern int sdbMaxNodes;
......
...@@ -49,10 +49,10 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i ...@@ -49,10 +49,10 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i
* if it is referenced by other object, it will be remain in cache * if it is referenced by other object, it will be remain in cache
* @param handle cache object * @param handle cache object
* @param data not the key, actually referenced data * @param data not the key, actually referenced data
* @param remove force model, reduce the ref count and move the data into * @param _remove force model, reduce the ref count and move the data into
* pTrash * pTrash
*/ */
void taosRemoveDataFromCache(void *handle, void **data, bool remove); void taosRemoveDataFromCache(void *handle, void **data, bool _remove);
/** /**
* update data in cache * update data in cache
......
...@@ -26,10 +26,10 @@ extern "C" { ...@@ -26,10 +26,10 @@ extern "C" {
#include "tutil.h" #include "tutil.h"
#include "taosmsg.h" #include "taosmsg.h"
#define DEFAULT_PAGE_SIZE 16384 // 16k larger than the SHistoInfo #define DEFAULT_PAGE_SIZE 16384 // 16k larger than the SHistoInfo
#define MIN_BUFFER_SIZE (1 << 19) #define MIN_BUFFER_SIZE (1 << 19)
#define MAX_TMPFILE_PATH_LENGTH 512 #define MAX_TMPFILE_PATH_LENGTH PATH_MAX
#define INITIAL_ALLOCATION_BUFFER_SIZE 64 #define INITIAL_ALLOCATION_BUFFER_SIZE 64
// forward declare // forward declare
struct tTagSchema; struct tTagSchema;
......
...@@ -12,9 +12,12 @@ ...@@ -12,9 +12,12 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TDENGINE_TKEY_H
#define TDENGINE_TKEY_H
#ifndef _TAOS_KEY_H_ #ifdef __cplusplus
#define _TAOS_KEY_H_ extern "C" {
#endif
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
...@@ -27,4 +30,8 @@ char *base64_encode(const unsigned char *value, int vlen); ...@@ -27,4 +30,8 @@ char *base64_encode(const unsigned char *value, int vlen);
char *taosDesEncode(int64_t key, char *src, int len); char *taosDesEncode(int64_t key, char *src, int len);
char *taosDesDecode(int64_t key, char *src, int len); char *taosDesDecode(int64_t key, char *src, int len);
#ifdef __cplusplus
}
#endif #endif
#endif
\ No newline at end of file
...@@ -53,8 +53,7 @@ void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems); ...@@ -53,8 +53,7 @@ void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems);
void assignVal(char *val, char *src, int32_t len, int32_t type); void assignVal(char *val, char *src, int32_t len, int32_t type);
void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size); void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
// variant, each number/string/field_id has a corresponding struct during // variant, each number/string/field_id has a corresponding struct during parsing sql
// parsing sql
typedef struct tVariant { typedef struct tVariant {
uint32_t nType; uint32_t nType;
int32_t nLen; // only used for string, for number, it is useless int32_t nLen; // only used for string, for number, it is useless
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册