Merge pull request #143 from qidi1/rename_sql_parser_parser

remove parser

setup.py

@@ -46,7 +46,7 @@
         'flasgger',
         'ply==3.11',
         'chardet==3.0.4',
-        'sqlgpt-parser>=0.0.1a2',
+        'sqlgpt-parser>=0.0.1a3',
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

src/api/api_utils.py

@@ -11,8 +11,8 @@
 """
 
 from src.optimizer.optimizer import Optimizer
-from sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
-from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
+from sqlgpt_parser.parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 from src.common.utils import Utils
 
 

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 sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
-from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
+from sqlgpt_parser.parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 
 NOTHING_TO_DO = 'Current table index is so good , nothing to do'
 

src/consume/mysql_slowlog_parse.py

@@ -19,9 +19,9 @@
 from src.consume.file_parse_common import get_encoding
 from src.consume.mysql_logparser_base import MysqlSlowLogParse
 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
+from sqlgpt_parser.parser.mysql_parser.parser import parser as mysql_parser
+from sqlgpt_parser.parser.mysql_parser.lexer import lexer as mysql_lexer
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 
 log_file = os.path.basename(sys.argv[0]).split(".")[0] + '.log'
 log = Logger(log_file)

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 sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.parser.mysql_parser import parser as mysql_parser
 
 
 class MetaDataUtils(object):

src/optimizer/abstract_rule.py

@@ -12,7 +12,7 @@
 
 from abc import ABCMeta, abstractmethod
 
-from sqlgpt_parser.sql_parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.statement import Statement
 
 
 class AbstractRewriteRule(metaclass=ABCMeta):

src/optimizer/engine.py

@@ -13,7 +13,7 @@
 from typing import List
 
 from src.optimizer.cbo.cbo import CBO
-from sqlgpt_parser.sql_parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.statement import Statement
 from .heuristic_rule import heuristic_rule_list
 from .pmd_rule import common_pmd_list
 

src/optimizer/heuristic_rule/full_scan_rule.py

@@ -10,15 +10,15 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.expression import (
+from sqlgpt_parser.parser.tree.expression import (
     BetweenPredicate,
     ComparisonExpression,
     ExistsPredicate,
     InPredicate,
     LikePredicate,
     LogicalBinaryExpression,
 )
-from sqlgpt_parser.sql_parser.tree import Statement, Query
+from sqlgpt_parser.parser.tree import Statement, Query
 from .heuristic_rule_return_result import HeuristicRuleReturnResult
 from ..abstract_rule import AbstractRewriteRule
 

src/optimizer/heuristic_rule/normal_index_without_index_back.py

@@ -14,7 +14,7 @@
 from typing import List
 
 from src.optimizer.optimizer_enum import IndexType
-from sqlgpt_parser.sql_parser.tree import Statement
+from sqlgpt_parser.parser.tree import Statement
 from .heuristic_rule_return_result import HeuristicRuleReturnResult
 from ..abstract_rule import AbstractRewriteRule
 

src/optimizer/heuristic_rule/unique_index_with_index_back.py

@@ -11,7 +11,7 @@
 """
 
 from src.optimizer.optimizer_enum import IndexType
-from sqlgpt_parser.sql_parser.tree import Statement
+from sqlgpt_parser.parser.tree import Statement
 from .heuristic_rule_return_result import HeuristicRuleReturnResult
 from ..abstract_rule import AbstractRewriteRule
 

src/optimizer/mysql_engine.py

@@ -11,7 +11,7 @@
 """
 
 from src.optimizer.engine import Engine
-from sqlgpt_parser.sql_parser.mysql_parser import parser as mysql_parser
+from sqlgpt_parser.parser.mysql_parser import parser as mysql_parser
 from .rewrite_rule import mysql_rules, common_rules
 
 

src/optimizer/oceanbase_engine.py

@@ -11,7 +11,7 @@
 """
 
 from src.optimizer.engine import Engine
-from sqlgpt_parser.sql_parser.oceanbase_parser import parser as oceanbase_parser
+from sqlgpt_parser.parser.oceanbase_parser import parser as oceanbase_parser
 from .rewrite_rule import common_rules
 
 

src/optimizer/optimizer.py

@@ -18,7 +18,7 @@
 from src.metadata.metadata_utils import MetaDataUtils
 from sqlgpt_parser.format.formatter import format_sql
 from src.optimizer.optimizer_enum import IndexType
-from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 from .cbo.cbo_optimizer import CBOOptimizer
 from .oceanbase_engine import OceanBaseEngine
 from .prunning_rule.index_prunning import CompareStat, IndexPrunning

src/optimizer/pmd_rule/pmd_arithmetic_rule.py

@@ -10,9 +10,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.expression import QualifiedNameReference
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.expression import QualifiedNameReference
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_count_rule.py

@@ -10,8 +10,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_full_scan_rule.py

@@ -10,9 +10,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.literal import StringLiteral
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.literal import StringLiteral
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_is_null_rule.py

@@ -10,9 +10,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.literal import NullLiteral
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.literal import NullLiteral
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_multi_table.py

@@ -10,9 +10,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.join_criteria import JoinOn, JoinUsing
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.join_criteria import JoinOn, JoinUsing
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_nowait_wait_rule.py

@@ -10,8 +10,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_select_all_rule.py

@@ -10,11 +10,11 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.expression import QualifiedNameReference
-from sqlgpt_parser.sql_parser.tree.qualified_name import QualifiedName
-from sqlgpt_parser.sql_parser.tree.select_item import SingleColumn
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.expression import QualifiedNameReference
+from sqlgpt_parser.parser.tree.qualified_name import QualifiedName
+from sqlgpt_parser.parser.tree.select_item import SingleColumn
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/pmd_rule/pmd_update_delete_multi_table_rule.py

@@ -10,9 +10,9 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-from sqlgpt_parser.sql_parser.tree.relation import Join
-from sqlgpt_parser.sql_parser.tree.statement import Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.relation import Join
+from sqlgpt_parser.parser.tree.statement import Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from .pmd_enum import PMDLevel
 from .pmd_result import PMDResultRule
 from ..abstract_rule import AbstractRewriteRule

src/optimizer/rewrite_rule/remove_order_by_in_delete_update_rule.py

@@ -9,8 +9,8 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
-from sqlgpt_parser.sql_parser.tree.statement import Query, Statement
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.statement import Query, Statement
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from ..abstract_rule import AbstractRewriteRule
 
 

src/optimizer/rewrite_rule/rewrite_or_rule.py

@@ -9,18 +9,18 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
-from sqlgpt_parser.sql_parser.tree.expression import (
+from sqlgpt_parser.parser.tree.expression import (
     ComparisonExpression,
     InListExpression,
     InPredicate,
     LogicalBinaryExpression,
     QualifiedNameReference,
 )
-from sqlgpt_parser.sql_parser.tree.query_specification import QuerySpecification
-from sqlgpt_parser.sql_parser.tree.set_operation import Union
-from sqlgpt_parser.sql_parser.tree.statement import Query, Statement
+from sqlgpt_parser.parser.tree.query_specification import QuerySpecification
+from sqlgpt_parser.parser.tree.set_operation import Union
+from sqlgpt_parser.parser.tree.statement import Query, Statement
 from src.optimizer.optimizer_enum import IndexType
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from ..abstract_rule import AbstractRewriteRule
 
 

src/optimizer/rewrite_rule/rewrite_supplement_column_rule.py

@@ -9,12 +9,12 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
-from sqlgpt_parser.sql_parser.tree.expression import QualifiedNameReference
-from sqlgpt_parser.sql_parser.tree.qualified_name import QualifiedName
-from sqlgpt_parser.sql_parser.tree.select_item import SingleColumn
-from sqlgpt_parser.sql_parser.tree.statement import Query, Statement
-from sqlgpt_parser.sql_parser.tree.table import Table
-from sqlgpt_parser.sql_parser.tree.visitor import DefaultTraversalVisitor
+from sqlgpt_parser.parser.tree.expression import QualifiedNameReference
+from sqlgpt_parser.parser.tree.qualified_name import QualifiedName
+from sqlgpt_parser.parser.tree.select_item import SingleColumn
+from sqlgpt_parser.parser.tree.statement import Query, Statement
+from sqlgpt_parser.parser.tree.table import Table
+from sqlgpt_parser.parser.tree.visitor import DefaultTraversalVisitor
 from ..abstract_rule import AbstractRewriteRule
 
 

src/schedule_task/oceanbase/schedule_topsql_oceanbase.py

@@ -24,7 +24,7 @@
 from src.common.utils import Utils
 from src.common.utils import fun_diff_secs, div_list
 from src.optimizer.oceanbase_engine import OceanBaseEngine
-from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 
 log_file = os.path.basename(sys.argv[0]).split(".")[0] + '.log'
 log = Logger(log_file)

test/metadata/test_metadata_utils.py

@@ -17,8 +17,8 @@
 
 from src.metadata.catalog import Catalog
 from src.metadata.metadata_utils import MetaDataUtils
-from sqlgpt_parser.sql_parser.mysql_parser import parser
-from sqlgpt_parser.sql_parser.parser_utils import ParserUtils
+from sqlgpt_parser.parser.mysql_parser import parser
+from sqlgpt_parser.parser.parser_utils import ParserUtils
 
 
 class MyTestCase(unittest.TestCase):

test/optimizer/test_pmd.py

@@ -10,7 +10,7 @@
     PMDUpdateDeleteMultiTableRule,
     PMDMultiTableRule,
 )
-from sqlgpt_parser.sql_parser.mysql_parser import parser
+from sqlgpt_parser.parser.mysql_parser import parser
 
 
 class MyTestCase(unittest.TestCase):

test/optimizer/test_rewrite.py

@@ -8,7 +8,7 @@
     RemoveOrderByInDeleteUpdateRule,
     RewriteSupplementColumnRule,
 )
-from sqlgpt_parser.sql_parser.mysql_parser import parser
+from sqlgpt_parser.parser.mysql_parser import parser
 
 
 class MyTestCase(unittest.TestCase):