From f253b867cbb4ca2289de4c83ceb6c3eff395aae0 Mon Sep 17 00:00:00 2001 From: lichuang Date: Fri, 11 Jun 2021 16:03:29 +0800 Subject: [PATCH 1/3] [TD-4694]merge tsdbCompactImpl to community version --- src/tsdb/src/tsdbCompact.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c index 2e8e81b65e..c98e9175b8 100644 --- a/src/tsdb/src/tsdbCompact.c +++ b/src/tsdb/src/tsdbCompact.c @@ -14,8 +14,6 @@ */ #include "tsdbint.h" -#ifndef _TSDB_PLUGINS - typedef struct { STable * pTable; SBlockIdx * pBlkIdx; @@ -523,5 +521,3 @@ static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCol return 0; } - -#endif \ No newline at end of file From b0f88f44ac6753907f7d681e2aa55cca774ef44f Mon Sep 17 00:00:00 2001 From: lichuang Date: Fri, 11 Jun 2021 18:53:08 +0800 Subject: [PATCH 2/3] [TD-4694]merge tsdbCompactImpl to community version --- src/tsdb/src/tsdbCompact.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c index c98e9175b8..0d2a2bb46f 100644 --- a/src/tsdb/src/tsdbCompact.c +++ b/src/tsdb/src/tsdbCompact.c @@ -521,3 +521,4 @@ static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCol return 0; } + \ No newline at end of file From 28e3f45c9b516b30b0de71c3a7f244bac354dd01 Mon Sep 17 00:00:00 2001 From: lichuang Date: Fri, 11 Jun 2021 20:00:15 +0800 Subject: [PATCH 3/3] [TD-4694]merge tsdbCompactImpl to community version --- src/tsdb/src/tsdbCompact.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c index 0d2a2bb46f..c98e9175b8 100644 --- a/src/tsdb/src/tsdbCompact.c +++ b/src/tsdb/src/tsdbCompact.c @@ -521,4 +521,3 @@ static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCol return 0; } - \ No newline at end of file