refact code
This commit is contained in:
parent
48ea3963e7
commit
5bacfb4f94
|
@ -22,13 +22,13 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "inc/tsdbUtil.h"
|
#include "inc/tsdbUtil2.h"
|
||||||
|
|
||||||
#include "inc/tsdbFile.h"
|
#include "inc/tsdbFile2.h"
|
||||||
|
|
||||||
#include "inc/tsdbFSet.h"
|
#include "inc/tsdbFSet2.h"
|
||||||
|
|
||||||
#include "inc/tsdbFS.h"
|
#include "inc/tsdbFS2.h"
|
||||||
|
|
||||||
#include "inc/tsdbSttFileRW.h"
|
#include "inc/tsdbSttFileRW.h"
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbDataFileRW.h"
|
#include "tsdbDataFileRW.h"
|
||||||
#include "tsdbFS.h"
|
#include "tsdbFS2.h"
|
||||||
#include "tsdbIter.h"
|
#include "tsdbIter.h"
|
||||||
#include "tsdbSttFileRW.h"
|
#include "tsdbSttFileRW.h"
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbDef.h"
|
#include "tsdbDef.h"
|
||||||
#include "tsdbFSet.h"
|
#include "tsdbFSet2.h"
|
||||||
#include "tsdbSttFileRW.h"
|
#include "tsdbSttFileRW.h"
|
||||||
#include "tsdbUtil.h"
|
#include "tsdbUtil2.h"
|
||||||
|
|
||||||
#ifndef _TSDB_DATA_FILE_RW_H
|
#ifndef _TSDB_DATA_FILE_RW_H
|
||||||
#define _TSDB_DATA_FILE_RW_H
|
#define _TSDB_DATA_FILE_RW_H
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbFSet.h"
|
#include "tsdbFSet2.h"
|
||||||
|
|
||||||
#ifndef _TSDB_FILE_SYSTEM_H
|
#ifndef _TSDB_FILE_SYSTEM_H
|
||||||
#define _TSDB_FILE_SYSTEM_H
|
#define _TSDB_FILE_SYSTEM_H
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbFile.h"
|
#include "tsdbFile2.h"
|
||||||
|
|
||||||
#ifndef _TSDB_FILE_SET_H
|
#ifndef _TSDB_FILE_SET_H
|
||||||
#define _TSDB_FILE_SET_H
|
#define _TSDB_FILE_SET_H
|
|
@ -14,10 +14,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbDataFileRW.h"
|
#include "tsdbDataFileRW.h"
|
||||||
#include "tsdbFS.h"
|
#include "tsdbFS2.h"
|
||||||
#include "tsdbIter.h"
|
#include "tsdbIter.h"
|
||||||
#include "tsdbSttFileRW.h"
|
#include "tsdbSttFileRW.h"
|
||||||
#include "tsdbUtil.h"
|
#include "tsdbUtil2.h"
|
||||||
|
|
||||||
#ifndef _TD_TSDB_MERGE_H_
|
#ifndef _TD_TSDB_MERGE_H_
|
||||||
#define _TD_TSDB_MERGE_H_
|
#define _TD_TSDB_MERGE_H_
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tsdbFS.h"
|
#include "tsdbFS2.h"
|
||||||
#include "tsdbUtil.h"
|
#include "tsdbUtil2.h"
|
||||||
|
|
||||||
#ifndef _TSDB_STT_FILE_RW_H
|
#ifndef _TSDB_STT_FILE_RW_H
|
||||||
#define _TSDB_STT_FILE_RW_H
|
#define _TSDB_STT_FILE_RW_H
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inc/tsdbCommit.h"
|
#include "inc/tsdbCommit2.h"
|
||||||
|
|
||||||
// extern dependencies
|
// extern dependencies
|
||||||
typedef struct {
|
typedef struct {
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inc/tsdbFS.h"
|
#include "inc/tsdbFS2.h"
|
||||||
|
|
||||||
extern int vnodeScheduleTask(int (*execute)(void *), void *arg);
|
extern int vnodeScheduleTask(int (*execute)(void *), void *arg);
|
||||||
extern int vnodeScheduleTaskEx(int tpid, int (*execute)(void *), void *arg);
|
extern int vnodeScheduleTaskEx(int tpid, int (*execute)(void *), void *arg);
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inc/tsdbFSet.h"
|
#include "inc/tsdbFSet2.h"
|
||||||
|
|
||||||
static int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl) {
|
static int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl) {
|
||||||
if (!(lvl[0] = taosMemoryMalloc(sizeof(SSttLvl)))) return TSDB_CODE_OUT_OF_MEMORY;
|
if (!(lvl[0] = taosMemoryMalloc(sizeof(SSttLvl)))) return TSDB_CODE_OUT_OF_MEMORY;
|
|
@ -13,7 +13,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "inc/tsdbFile.h"
|
#include "inc/tsdbFile2.h"
|
||||||
|
|
||||||
// to_json
|
// to_json
|
||||||
static int32_t head_to_json(const STFile *file, cJSON *json);
|
static int32_t head_to_json(const STFile *file, cJSON *json);
|
Loading…
Reference in New Issue