From c43570e21512c9590ebc0a817d5e2d2ccd86a1f5 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sun, 6 Dec 2020 23:01:09 +0800
Subject: [PATCH] fix conflict

---
 src/tsdb/src/tsdbFile.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
index b039d42fa4..411c1d796e 100644
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
@@ -151,7 +151,6 @@ SFileGroup *tsdbCreateFGroup(STsdbRepo *pRepo, int fid, int level) {
   // SET FILE GROUP
   fg.fileId = fid;
 
-<<<<<<< HEAD
   // CREATE FILES
   for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
     SFile *pFile = &(fg.files[type]);
@@ -168,19 +167,6 @@ SFileGroup *tsdbCreateFGroup(STsdbRepo *pRepo, int fid, int level) {
     if (tsdbUpdateFileHeader(pFile) < 0) {
       tsdbCloseFile(pFile);
       return NULL;
-=======
-  SFileGroup *pGroup = tsdbSearchFGroup(pFileH, fid, TD_EQ);
-  if (pGroup == NULL) {  // if not exists, create one
-    pFGroup->fileId = fid;
-    for (int type = 0; type < TSDB_FILE_TYPE_MAX; type++) {
-      if (tsdbCreateFile(&pFGroup->files[type], pRepo, fid, type) < 0) {
-        for (int i = type; i >= 0; i--) {
-          remove(pFGroup->files[i].fname);
-        }
-
-        return NULL;
-      }
->>>>>>> origin/develop
     }
 
     tsdbCloseFile(pFile);
@@ -189,7 +175,6 @@ SFileGroup *tsdbCreateFGroup(STsdbRepo *pRepo, int fid, int level) {
     id = TFILE_ID(&(pFile->file));
   }
 
-<<<<<<< HEAD
   // PUT GROUP INTO FILE HANDLE
   pthread_rwlock_wrlock(&pFileH->fhlock);
   pFileH->pFGroup[pFileH->nFGroups++] = fg;
@@ -199,9 +184,6 @@ SFileGroup *tsdbCreateFGroup(STsdbRepo *pRepo, int fid, int level) {
   SFileGroup *pfg = tsdbSearchFGroup(pFileH, fid, TD_EQ);
   ASSERT(pfg != NULL);
   return pfg;
-=======
-  return pGroup;
->>>>>>> origin/develop
 }
 
 void tsdbRemoveFileGroup(STsdbRepo *pRepo, SFileGroup *pFGroup) {