Merge pull request #142 from qidi1/remove_parser

use sqlgpt-parser package
oceanbase · Sep 8, 2023 · 5ca0a43 · 5ca0a43
2 parents 73273cb + 8e7e680
commit 5ca0a43
Show file tree

Hide file tree

Showing 81 changed files with 76 additions and 123,767 deletions.
diff --git a/docs/Parser 模块开发指南.md b/docs/Parser 模块开发指南.md
diff --git a/docs/pictures/DELETE 语法树.png b/docs/pictures/DELETE 语法树.png
diff --git a/docs/pictures/parsing-overview.png b/docs/pictures/parsing-overview.png
diff --git a/setup.py b/setup.py
@@ -46,6 +46,7 @@
         'flasgger',
         'ply==3.11',
         'chardet==3.0.4',
+        'sqlgpt-parser>=0.0.1a2',
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

diff --git a/src/api/api_utils.py b/src/api/api_utils.py
@@ -11,8 +11,8 @@
 """
 
 from src.optimizer.optimizer import Optimizer
-from src.parser.mysql_parser import parser as mysql_parser
-from src.parser.parser_utils import ParserUtils
+from sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
 from src.common.utils import Utils
 
 

diff --git a/src/api/optimizer.py b/src/api/optimizer.py
@@ -18,8 +18,8 @@
 from src.common.utils import Utils
 from src.metadata.metadata_utils import MetaDataUtils
 from src.optimizer.optimizer import Optimizer as opt
-from src.parser.mysql_parser import parser as mysql_parser
-from src.parser.parser_utils import ParserUtils
+from sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
 
 NOTHING_TO_DO = 'Current table index is so good , nothing to do'
 

diff --git a/src/consume/mysql_slowlog_parse.py b/src/consume/mysql_slowlog_parse.py
@@ -18,10 +18,10 @@
 from src.common.logger import Logger
 from src.consume.file_parse_common import get_encoding
 from src.consume.mysql_logparser_base import MysqlSlowLogParse
-from src.optimizer.formatter import format_sql
-from src.parser.mysql_parser.parser import parser as mysql_parser
-from src.parser.mysql_parser.lexer import lexer as mysql_lexer
-from src.parser.parser_utils import ParserUtils
+from sqlgpt_parser.format.formatter import format_sql
+from sqlgpt_parser.sql_parser.mysql_parser.parser import parser as mysql_parser
+from sqlgpt_parser.sql_parser.mysql_parser.lexer import lexer as mysql_lexer
+from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
 
 log_file = os.path.basename(sys.argv[0]).split(".")[0] + '.log'
 log = Logger(log_file)

diff --git a/src/metadata/metadata_utils.py b/src/metadata/metadata_utils.py
@@ -16,7 +16,7 @@
 
 from src.metadata.catalog import Catalog, Statistics, Selectivity, Table, Index, Column
 from src.optimizer.optimizer_enum import IndexType, OptType
-from src.parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
 
 
 class MetaDataUtils(object):

diff --git a/src/optimizer/abstract_rule.py b/src/optimizer/abstract_rule.py
@@ -12,7 +12,7 @@
 
 from abc import ABCMeta, abstractmethod
 
-from src.parser.tree.statement import Statement
+from sqlgpt_parser.sql_parser.tree.statement import Statement
 
 
 class AbstractRewriteRule(metaclass=ABCMeta):

diff --git a/src/optimizer/engine.py b/src/optimizer/engine.py
@@ -13,7 +13,7 @@
 from typing import List
 
 from src.optimizer.cbo.cbo import CBO
-from src.parser.tree.statement import Statement
+from sqlgpt_parser.sql_parser.tree.statement import Statement
 from .heuristic_rule import heuristic_rule_list
 from .pmd_rule import common_pmd_list