tidy project structure

oceanbase · Oct 28, 2024 · eae3692 · eae3692
1 parent dc59b33
commit eae3692
Show file tree

Hide file tree

Showing 55 changed files with 80 additions and 63 deletions.
diff --git a/common/ssh.py b/common/ssh.py
@@ -39,8 +39,8 @@
 from common.obdiag_exception import OBDIAGShellCmdException
 from common.tool import StringUtils
 from common.tool import TimeUtils
-from stdio import SafeStdio
-from err import EC_SSH_CONNECT
+from obdiag.stdio import SafeStdio
+from obdiag.err import EC_SSH_CONNECT
 from subprocess32 import Popen, PIPE
 
 warnings.filterwarnings("ignore")

diff --git a/common/ssh_client/base.py b/common/ssh_client/base.py
@@ -17,7 +17,7 @@
 """
 import sys
 
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 
 
 class SsherClient(SafeStdio):

diff --git a/common/ssh_client/ssh.py b/common/ssh_client/ssh.py
@@ -21,7 +21,7 @@
 from common.ssh_client.kubernetes_client import KubernetesClient
 from common.ssh_client.local_client import LocalClient
 from common.ssh_client.remote_client import RemoteClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 
 
 class SshClient(SafeStdio):

diff --git a/common/tool.py b/common/tool.py
@@ -52,8 +52,8 @@
 import copy
 from colorama import Fore, Style
 from ruamel.yaml import YAML
-from err import EC_SQL_EXECUTE_FAILED
-from stdio import SafeStdio
+from obdiag.err import EC_SQL_EXECUTE_FAILED
+from obdiag.stdio import SafeStdio
 
 _open = open
 encoding_open = open

diff --git a/handler/analyzer/analyze_flt_trace.py b/handler/analyzer/analyze_flt_trace.py
@@ -28,7 +28,7 @@
 from common.tool import Util
 from common.tool import DirectoryUtil
 from common.tool import FileUtil
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class AnalyzeFltTraceHandler(object):

diff --git a/handler/analyzer/analyze_index_space.py b/handler/analyzer/analyze_index_space.py
@@ -22,7 +22,7 @@
 from common.tool import StringUtils, Util
 from common.ob_connector import OBConnector
 from common.command import get_observer_version
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 def translate_byte(B):

diff --git a/handler/analyzer/analyze_log.py b/handler/analyzer/analyze_log.py
@@ -32,7 +32,7 @@
 from common.tool import FileUtil
 from common.tool import TimeUtils
 import common.ssh_client.local_client as ssh_client_local_client
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class AnalyzeLogHandler(BaseShellHandler):

diff --git a/handler/analyzer/analyze_parameter.py b/handler/analyzer/analyze_parameter.py
@@ -26,7 +26,7 @@
 import datetime
 from colorama import Fore, Style
 
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class AnalyzeParameterHandler(object):

diff --git a/handler/analyzer/analyze_queue.py b/handler/analyzer/analyze_queue.py
@@ -33,7 +33,7 @@
 from common.tool import FileUtil
 from common.tool import TimeUtils
 import common.ssh_client.local_client as ssh_client_local_client
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 from common.ob_connector import OBConnector
 import re

diff --git a/handler/analyzer/analyze_sql.py b/handler/analyzer/analyze_sql.py
@@ -30,7 +30,7 @@
 from handler.analyzer.sql.meta.sys_tenant_meta import SysTenantMeta
 from handler.gather.gather_scenes import GatherSceneHandler
 from common.command import get_observer_version
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class AnalyzeSQLHandler(object):

diff --git a/handler/analyzer/analyze_variable.py b/handler/analyzer/analyze_variable.py
@@ -24,7 +24,7 @@
 import datetime
 from colorama import Fore, Style
 
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class AnalyzeVariableHandler(object):

diff --git a/handler/checker/check_list.py b/handler/checker/check_list.py
@@ -20,7 +20,7 @@
 import yaml
 
 from common.tool import Util
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class CheckListHandler:

diff --git a/handler/display/display_scenes.py b/handler/display/display_scenes.py
@@ -18,8 +18,8 @@
 
 import os
 import re
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 import datetime
 from handler.display.scenes.base import SceneBase
 from common.obdiag_exception import OBDIAGFormatException

diff --git a/handler/display/scenes/base.py b/handler/display/scenes/base.py
@@ -15,7 +15,7 @@
 @file: base.py
 @desc:
 """
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.scene import filter_by_version
 from handler.display.step.base import Base
 from common.tool import StringUtils

diff --git a/handler/display/scenes/list.py b/handler/display/scenes/list.py
@@ -18,8 +18,8 @@
 
 import os
 
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 from common.tool import YamlUtils
 from handler.display.scenes.register import hardcode_scene_list
 from common.tool import Util

diff --git a/handler/display/step/base.py b/handler/display/step/base.py
@@ -16,7 +16,7 @@
 @desc:
 """
 from common.ssh_client.ssh import SshClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from handler.display.step.ssh import SshHandler
 from handler.display.step.sql import StepSQLHandler
 

diff --git a/handler/display/step/sql.py b/handler/display/step/sql.py
@@ -16,7 +16,7 @@
 @desc:
 """
 import os
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.ob_connector import OBConnector
 from tabulate import tabulate
 from common.tool import StringUtils

diff --git a/handler/display/step/ssh.py b/handler/display/step/ssh.py
@@ -18,7 +18,7 @@
 import os
 
 from common.ssh_client.ssh import SshClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.tool import StringUtils
 
 

diff --git a/handler/gather/gather_ash_report.py b/handler/gather/gather_ash_report.py
@@ -22,8 +22,8 @@
 from common.ob_connector import OBConnector
 from common.obdiag_exception import OBDIAGFormatException, OBDIAGException
 from common.tool import DirectoryUtil, TimeUtils, Util, StringUtils
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 from colorama import Fore, Style
 
 

diff --git a/handler/gather/gather_awr.py b/handler/gather/gather_awr.py
@@ -27,7 +27,7 @@
 from common.tool import Util
 from common.tool import TimeUtils
 from common.ocp import ocp_task, ocp_api
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherAwrHandler(object):

diff --git a/handler/gather/gather_log.py b/handler/gather/gather_log.py
@@ -30,7 +30,7 @@
 from common.tool import FileUtil
 from common.tool import NetUtils
 from handler.gather.plugins.redact import Redact
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherLogHandler(BaseShellHandler):

diff --git a/handler/gather/gather_obadmin.py b/handler/gather/gather_obadmin.py
@@ -31,7 +31,7 @@
 from common.tool import DirectoryUtil
 from common.tool import FileUtil
 from common.tool import NetUtils
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherObAdminHandler(BaseShellHandler):

diff --git a/handler/gather/gather_obproxy_log.py b/handler/gather/gather_obproxy_log.py
@@ -31,7 +31,7 @@
 from common.tool import FileUtil
 from common.tool import NetUtils
 from common.tool import TimeUtils
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherObProxyLogHandler(BaseShellHandler):

diff --git a/handler/gather/gather_obstack2.py b/handler/gather/gather_obstack2.py
@@ -32,7 +32,7 @@
 from common.tool import FileUtil
 from common.tool import NetUtils
 from common.tool import StringUtils
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherObstack2Handler(BaseShellHandler):

diff --git a/handler/gather/gather_parameters.py b/handler/gather/gather_parameters.py
@@ -23,7 +23,7 @@
 import csv
 from colorama import Fore, Style
 
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherParametersHandler(object):

diff --git a/handler/gather/gather_perf.py b/handler/gather/gather_perf.py
@@ -30,7 +30,7 @@
 from common.tool import FileUtil
 from common.tool import NetUtils
 from common.tool import TimeUtils
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherPerfHandler(BaseShellHandler):

diff --git a/handler/gather/gather_plan_monitor.py b/handler/gather/gather_plan_monitor.py
@@ -33,7 +33,7 @@
 from common.tool import FileUtil
 from common.tool import TimeUtils
 from handler.gather.gather_tabledump import GatherTableDumpHandler
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherPlanMonitorHandler(object):

diff --git a/handler/gather/gather_scenes.py b/handler/gather/gather_scenes.py
@@ -18,8 +18,8 @@
 
 import os
 import re
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 import datetime
 from handler.gather.scenes.base import SceneBase
 from common.obdiag_exception import OBDIAGFormatException

diff --git a/handler/gather/gather_sysstat.py b/handler/gather/gather_sysstat.py
@@ -29,7 +29,7 @@
 from common.tool import FileUtil
 from common.tool import NetUtils
 from common.tool import TimeUtils
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherOsInfoHandler(BaseShellHandler):

diff --git a/handler/gather/gather_tabledump.py b/handler/gather/gather_tabledump.py
@@ -19,8 +19,8 @@
 import os
 import time
 
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 from common.ob_connector import OBConnector
 from common.tool import StringUtils
 from common.command import get_observer_version

diff --git a/handler/gather/gather_variables.py b/handler/gather/gather_variables.py
@@ -22,7 +22,7 @@
 import csv
 from colorama import Fore, Style
 
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class GatherVariablesHandler(object):

diff --git a/handler/gather/scenes/base.py b/handler/gather/scenes/base.py
@@ -15,7 +15,7 @@
 @file: base.py
 @desc:
 """
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.scene import filter_by_version
 from handler.gather.step.base import Base
 from common.tool import StringUtils

diff --git a/handler/gather/scenes/cpu_high.py b/handler/gather/scenes/cpu_high.py
@@ -18,7 +18,7 @@
 import os
 
 from common.ssh_client.ssh import SshClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from handler.gather.gather_obstack2 import GatherObstack2Handler
 from handler.gather.gather_perf import GatherPerfHandler
 from handler.gather.gather_log import GatherLogHandler

diff --git a/handler/gather/scenes/list.py b/handler/gather/scenes/list.py
@@ -18,8 +18,8 @@
 
 import os
 
-from result_type import ObdiagResult
-from stdio import SafeStdio
+from obdiag.result_type import ObdiagResult
+from obdiag.stdio import SafeStdio
 from common.tool import YamlUtils
 from handler.gather.scenes.register import hardcode_scene_list
 from common.tool import Util

diff --git a/handler/gather/scenes/sql_problem.py b/handler/gather/scenes/sql_problem.py
@@ -16,7 +16,7 @@
 @desc:
 """
 
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from handler.gather.gather_log import GatherLogHandler
 from handler.gather.gather_obproxy_log import GatherObProxyLogHandler
 from handler.gather.gather_plan_monitor import GatherPlanMonitorHandler

diff --git a/handler/gather/step/base.py b/handler/gather/step/base.py
@@ -16,7 +16,7 @@
 @desc:
 """
 from common.ssh_client.ssh import SshClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from handler.gather.step.ssh import SshHandler
 from handler.gather.step.sql import StepSQLHandler
 from handler.gather.gather_log import GatherLogHandler

diff --git a/handler/gather/step/sql.py b/handler/gather/step/sql.py
@@ -16,7 +16,7 @@
 @desc:
 """
 import os
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.ob_connector import OBConnector
 from tabulate import tabulate
 from common.tool import StringUtils

diff --git a/handler/gather/step/ssh.py b/handler/gather/step/ssh.py
@@ -18,7 +18,7 @@
 import os
 
 from common.ssh_client.ssh import SshClient
-from stdio import SafeStdio
+from obdiag.stdio import SafeStdio
 from common.tool import StringUtils
 
 

diff --git a/handler/rca/rca_handler.py b/handler/rca/rca_handler.py
@@ -33,7 +33,7 @@
 from common.tool import StringUtils
 from colorama import Fore, Style
 
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class RCAHandler:

diff --git a/handler/rca/rca_list.py b/handler/rca/rca_list.py
@@ -19,7 +19,7 @@
 from common.constant import const
 from common.tool import DynamicLoading
 from common.tool import Util
-from result_type import ObdiagResult
+from obdiag.result_type import ObdiagResult
 
 
 class RcaScenesListHandler:

diff --git a/main.py b/main.py
@@ -16,8 +16,8 @@
 """
 
 import sys
-from diag_cmd import MainCommand
-from stdio import IO
+from obdiag.diag_cmd import MainCommand
+from obdiag.stdio import IO
 
 ROOT_IO = IO(1)