diff --git a/src/inc/sdb.h b/src/inc/sdb.h index a0e0a1b2f2e8815f5425a65f6f793fad4b0bc847..389aecfb7b6a3ea047251d45d853b8f3e873021d 100644 --- a/src/inc/sdb.h +++ b/src/inc/sdb.h @@ -105,7 +105,7 @@ extern SSdbPeer *sdbPeer[]; #endif -void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, uint8_t keyType, char *directory, +void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, char *directory, void *(*appTool)(char, void *, char *, int, int *)); void *sdbGetRow(void *handle, void *key); diff --git a/src/sdb/inc/sdbint.h b/src/sdb/inc/sdbint.h index c5b4f4e4aeccf6bd8664e067e7d74146e023b10b..3327c1f7317cc6483346a7a7a7259b88a69ef6f7 100644 --- a/src/sdb/inc/sdbint.h +++ b/src/sdb/inc/sdbint.h @@ -127,7 +127,7 @@ typedef struct { } SMnodeStatus; typedef struct { - uint8_t dbId; + char dbId; char type; uint64_t version; short dataLen; diff --git a/src/sdb/src/sdbEngine.c b/src/sdb/src/sdbEngine.c index a9d76122f22db00d5eeb292ea2b744e73043959a..024360501f908a1a4e9a68f789969f88c136d098 100644 --- a/src/sdb/src/sdbEngine.c +++ b/src/sdb/src/sdbEngine.c @@ -287,7 +287,7 @@ sdb_exit1: return -1; } -void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, uint8_t keyType, char *directory, +void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, char *directory, void *(*appTool)(char, void *, char *, int, int *)) { SSdbTable *pTable = (SSdbTable *)malloc(sizeof(SSdbTable)); if (pTable == NULL) return NULL; @@ -810,11 +810,10 @@ void sdbResetTable(SSdbTable *pTable) { SRowHead *rowHead = NULL; void * pMetaRow = NULL; int64_t oldId = pTable->id; - //TODO: check - //int oldNumOfRows = pTable->numOfRows; + int oldNumOfRows = pTable->numOfRows; if (sdbOpenSdbFile(pTable) < 0) return; - //pTable->numOfRows = oldNumOfRows; + pTable->numOfRows = oldNumOfRows; total_size = sizeof(SRowHead) + pTable->maxRowSize + sizeof(TSCKSUM); rowHead = (SRowHead *)malloc(total_size);