diff --git a/plugins/mysql/conf/my5.7.cnf b/plugins/mysql/conf/my5.7.cnf index df79938ef..2a10edd46 100644 --- a/plugins/mysql/conf/my5.7.cnf +++ b/plugins/mysql/conf/my5.7.cnf @@ -22,6 +22,7 @@ server-id = {$SERVER_ID} default_storage_engine = InnoDB + key_buffer_size = 8M table_open_cache = 32 sort_buffer_size = 256K @@ -31,6 +32,7 @@ read_rnd_buffer_size = 256K myisam_sort_buffer_size = 4M thread_cache_size = 4 lower_case_table_names=0 +query_cache_size = 4M tmp_table_size = 8M character-set-server = UTF8MB4 diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index ab64dac2b..fe44837a7 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -681,8 +681,7 @@ def setMyPort(): return mw.returnJson(True, '编辑成功!') -def runInfo(): - +def runInfo(version): if status(version) == 'stop': return mw.returnJson(False, 'MySQL未启动', []) @@ -713,7 +712,7 @@ def runInfo(): return mw.getJson(result) -def myDbStatus(): +def myDbStatus(version): result = {} db = pMysqlDb() data = db.query('show variables') @@ -723,6 +722,10 @@ def myDbStatus(): gets = ['table_open_cache', 'thread_cache_size', 'key_buffer_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_additional_mem_pool_size', 'innodb_log_buffer_size', 'max_connections', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size'] + + if version != "8.0": + gets.append('query_cache_size') + result['mem'] = {} for d in data: vname = d['Variable_name'] @@ -733,9 +736,16 @@ def myDbStatus(): return mw.getJson(result) -def setDbStatus(): +def setDbStatus(version): gets = ['key_buffer_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_log_buffer_size', 'max_connections', 'table_open_cache', 'thread_cache_size', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size'] + + if version != "8.0": + # gets.append('query_cache_size') + gets = ['key_buffer_size', 'query_cache_size', 'tmp_table_size', 'max_heap_table_size', 'innodb_buffer_pool_size', 'innodb_log_buffer_size', 'max_connections', + 'table_open_cache', 'thread_cache_size', 'sort_buffer_size', 'read_buffer_size', 'read_rnd_buffer_size', 'join_buffer_size', 'thread_stack', 'binlog_cache_size'] + + # print(gets) emptys = ['max_connections', 'thread_cache_size', 'table_open_cache'] args = getArgs() conFile = getConf() @@ -2496,11 +2506,11 @@ if __name__ == "__main__": elif func == 'uninstall_pre_inspection': print(uninstallPreInspection(version)) elif func == 'run_info': - print(runInfo()) + print(runInfo(version)) elif func == 'db_status': - print(myDbStatus()) + print(myDbStatus(version)) elif func == 'set_db_status': - print(setDbStatus()) + print(setDbStatus(version)) elif func == 'conf': print(getConf()) elif func == 'bin_log':