From c40c2172595d4e0d7c7f67fab48a8f5eb4567ca9 Mon Sep 17 00:00:00 2001
From: jinhai <hai.jin@zilliz.com>
Date: Tue, 9 Apr 2019 11:34:37 +0800
Subject: [PATCH] Update for group handle

Former-commit-id: e5f782eda6b90b4c4da4a87003df54ec168f38a4
---
 pyengine/engine/controller/meta_manager.py    | 23 +++++++++----------
 pyengine/engine/controller/storage_manager.py |  2 +-
 pyengine/engine/controller/vector_engine.py   |  8 ++-----
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/pyengine/engine/controller/meta_manager.py b/pyengine/engine/controller/meta_manager.py
index 83280b12..ab556387 100644
--- a/pyengine/engine/controller/meta_manager.py
+++ b/pyengine/engine/controller/meta_manager.py
@@ -1,24 +1,23 @@
 from engine.model.group_table import GroupTable
 from engine.model.file_table import FileTable
 from engine.controller.error_code import ErrorCode
+from engine import db
 
 class MetaManager(object):
 
-    def Sync(self):
+    @staticmethod
+    def Sync():
         db.session.commit()
 
-    def AddGroup(self, group_name, dimension):
-        group = GroupTable.query.filter(GroupTable.group_name==group_id).first()
-        if group:
-            return ErrorCode.ALREADY_EXIST, group_name
-        else:
-            new_group = GroupTable(group_name, dimension)
-            GroupHandler.CreateGroupDirectory(group_id)
+    @staticmethod
+    def AddGroup(group_name, dimension):
+        new_group = GroupTable(group_name, dimension)
+
+        # add into database
+        db.session.add(new_group)
+        db.session.commit()
 
-            # add into database
-            db.session.add(new_group)
-            self.Sync()
-            return ErrorCode.SUCCESS_CODE, group_name
+        return ErrorCode.SUCCESS_CODE, group_name
 
     @staticmethod
     def GetGroup(group_name):
diff --git a/pyengine/engine/controller/storage_manager.py b/pyengine/engine/controller/storage_manager.py
index f01f5b44..450d1b75 100644
--- a/pyengine/engine/controller/storage_manager.py
+++ b/pyengine/engine/controller/storage_manager.py
@@ -3,7 +3,7 @@ from engine.settings import DATABASE_DIRECTORY
 
 class StorageManager(object):
     @staticmethod
-    def CreateGroup(group_name):
+    def AddGroup(group_name):
         path = StorageManager.GetGroupDirectory(group_name)
         path = path.strip()
         path=path.rstrip("\\")
diff --git a/pyengine/engine/controller/vector_engine.py b/pyengine/engine/controller/vector_engine.py
index 73f599c2..91719cb3 100644
--- a/pyengine/engine/controller/vector_engine.py
+++ b/pyengine/engine/controller/vector_engine.py
@@ -27,12 +27,8 @@ class VectorEngine(object):
         if(error == ErrorCode.SUCCESS_CODE):
             return ErrorCode.FAULT_CODE, group_name
         else:
-            StorageManager.CreateGroup(group_name)
-            new_group = GroupTable(group_name, dimension)
-
-            # add into database
-            db.session.add(new_group)
-            db.session.commit()
+            StorageManager.AddGroup(group_name)
+            MetaManager.AddGroup(group_name, dimension)
             return VectorEngine.SUCCESS_CODE, group_name
 
 
-- 
GitLab