From 7d18b6b019c8d3d92d8d498114994634fbc85f88 Mon Sep 17 00:00:00 2001 From: jinhai Date: Wed, 20 Mar 2019 11:54:33 +0800 Subject: [PATCH] Update database operation --- README.md | 17 +++++++++++++++++ pyengine/engine/__init__.py | 3 ++- pyengine/engine/model/FileTable.py | 18 ++++++++++++++++++ pyengine/engine/model/GroupTable.py | 14 ++++++++++++++ pyengine/engine/model/IndexTable.py | 16 ---------------- pyengine/engine/settings.py | 4 ++-- 6 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 pyengine/engine/model/FileTable.py create mode 100644 pyengine/engine/model/GroupTable.py delete mode 100644 pyengine/engine/model/IndexTable.py diff --git a/README.md b/README.md index aebd13ec05..b46ef88f61 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,20 @@ - `conda install faiss-gpu cuda90 -c pytorch # For CUDA9.0` - `conda install flask` - `pip install flask-restful` + +### Create Database + +- Install MySQL + - `sudo apt-get update` + - `sudo apt-get install mariadb-server` + +- Create user and database: + - `create user vecwise;` + - `create database vecdata;` + - `grant all privileges on vecdata.* to 'vecwise'@'%';` + - `flush privileges;` + +- Create table: + - `python` # enter python3 interaction environment + - `from engine import db` + - `db.create_all()` diff --git a/pyengine/engine/__init__.py b/pyengine/engine/__init__.py index 4a5bd0ff04..45c7445724 100644 --- a/pyengine/engine/__init__.py +++ b/pyengine/engine/__init__.py @@ -10,6 +10,7 @@ app.config.from_object('engine.settings') print ("Create database instance") db = SQLAlchemy(app) -from engine.model.IndexTable import IndexTable +from engine.model.GroupTable import GroupTable +from engine.model.FileTable import FileTable from engine.controller import IndexManage diff --git a/pyengine/engine/model/FileTable.py b/pyengine/engine/model/FileTable.py new file mode 100644 index 0000000000..3b860d067e --- /dev/null +++ b/pyengine/engine/model/FileTable.py @@ -0,0 +1,18 @@ +from engine import db + +class FileTable(db.Model): + __tablename__ = 'file_table' + id = db.Column(db.Integer, primary_key=True) + group_name = db.Column(db.String(100)) + filename = db.Column(db.String(100)) + type = (db.Integer) + row_number = db.Column(db.Integer) + + def __init__(self, group_name, filename, type): + self.group_name = group_name + self.filename = filename + self.type = type + self.row_number = 0 + + def __repr__(self): + return '' % self.tablename \ No newline at end of file diff --git a/pyengine/engine/model/GroupTable.py b/pyengine/engine/model/GroupTable.py new file mode 100644 index 0000000000..c66ee31566 --- /dev/null +++ b/pyengine/engine/model/GroupTable.py @@ -0,0 +1,14 @@ +from engine import db + +class GroupTable(db.Model): + __tablename__ = 'group_table' + id = db.Column(db.Integer, primary_key=True) + group_name = db.Column(db.String(100)) + file_number = db.Column(db.Integer) + + def __init__(self, group_name): + self.group_name = group_name + self.file_number = 0 + + def __repr__(self): + return '' % self.group_name \ No newline at end of file diff --git a/pyengine/engine/model/IndexTable.py b/pyengine/engine/model/IndexTable.py deleted file mode 100644 index e5d144c2cb..0000000000 --- a/pyengine/engine/model/IndexTable.py +++ /dev/null @@ -1,16 +0,0 @@ -from engine import db - -class IndexTable(db.Model): - __tablename__ = 'index_table' - id = db.Column(db.Integer, primary_key=True) - tablename = db.Column(db.String(100)) - filename = db.Column(db.String(100)) - type = (db.Integer) - - def __init__(self, tablename, filename, type): - self.tablename = tablename - self.filename = filename - self.type = type - - def __repr__(self): - return '' % self.tablename \ No newline at end of file diff --git a/pyengine/engine/settings.py b/pyengine/engine/settings.py index 33376ece7d..932352a6e8 100644 --- a/pyengine/engine/settings.py +++ b/pyengine/engine/settings.py @@ -2,5 +2,5 @@ DEBUG = True SQLALCHEMY_TRACK_MODIFICATIONS = False -SECRET_KEY='A0Zr98j/3yX R~XHH!jmN]LWX/,?RT' -SQLALCHEMY_DATABASE_URI = "mysql://user:passwd@ip:port/BLOG_DB" \ No newline at end of file +# SECRET_KEY='A0Zr98j/3yX R~XHH!jmN]LWX/,?RT' +SQLALCHEMY_DATABASE_URI = "mysql+pymysql://vecwise@127.0.0.1:3306/vecdata" \ No newline at end of file