LuoGe
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check 

Offering: openGaussDev

More detail:check valid

# Conflicts:
#	src/gausskernel/dbmind/tools/components/index_advisor/index_advisor_workload.py

Match-id-bad4401dafd921e40de698c90a59158f8d36ddbf
This commit is contained in:
openGaussDev 2022-03-04 16:19:25 +08:00 committed by yanghao
parent 45879b85fd
commit 3affdfa80c
1 changed files with 1019 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gausskernel/dbmind/tools/components/index_advisor/index_advisor_workload.py
View File

@ -402,7 +402,7 @@ class IndexAdvisor:
'(' + column[0] + ')', (' ' + column[1] if column[1] else '')) '(' + column[0] + ')', (' ' + column[1] if column[1] else ''))
print(statement) print(statement)
# save integrate indexes result # save integrate indexes result
integrate_indexes_file = os.path.join(os.path.dirname(workload_file_path), integrate_indexes_file = os.path.join(os.path.realpath(os.path.dirname(workload_file_path)),
'index_result.json') 'index_result.json')
for table, indexes in self.integrate_indexes['currentIndexes'].items(): for table, indexes in self.integrate_indexes['currentIndexes'].items():
self.integrate_indexes['historyIndexes'][table] = \ self.integrate_indexes['historyIndexes'][table] = \
@ -901,8 +901,8 @@ def greedy_determine_opt_config(workload, atomic_config_total, candidate_indexes
def get_last_indexes_result(input_path): def get_last_indexes_result(input_path):
last_indexes_result_file = os.path.join( last_indexes_result_file = os.path.join(os.path.realpath(
os.path.dirname(input_path), 'index_result.json') os.path.dirname(input_path)), 'index_result.json')
integrate_indexes = {'historyIndexes': {}} integrate_indexes = {'historyIndexes': {}}
if os.path.exists(last_indexes_result_file): if os.path.exists(last_indexes_result_file):
try: try:
@ -949,9 +949,10 @@ def check_parameter(args):
MAX_INDEX_NUM = args.max_index_num MAX_INDEX_NUM = args.max_index_num
ENABLE_MULTI_NODE = args.multi_node ENABLE_MULTI_NODE = args.multi_node
MAX_INDEX_STORAGE = args.max_index_storage MAX_INDEX_STORAGE = args.max_index_storage
if args.U and args.U != getpass.getuser() and not args.W: # check if the password contains illegal characters
raise ValueError('Enter the \'-W\' parameter for user ' is_legal = re.search(r'^[A-Za-z0-9~!@#%^*\-_=+?,.]+$', args.W)
+ args.U + ' when executing the script.') if not is_legal:
raise ValueError("The password contains illegal characters.")
def main(argv): def main(argv):
@ -964,7 +965,7 @@ def main(argv):
arg_parser.add_argument( arg_parser.add_argument(
"-U", help="Username for database log-in", action=CheckValid) "-U", help="Username for database log-in", action=CheckValid)
arg_parser.add_argument( arg_parser.add_argument(
"f", help="File containing workload queries (One query per line)") "f", help="File containing workload queries (One query per line)", action=CheckValid)
arg_parser.add_argument("--schema", help="Schema name for the current business data", arg_parser.add_argument("--schema", help="Schema name for the current business data",
required=True, action=CheckValid) required=True, action=CheckValid)
arg_parser.add_argument( arg_parser.add_argument(