milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #574 from XuPeng-SH/track_0.6.0 

[skip ci](shards): remove color decorator in log file, fixes #573
pull/585/head
Jin Hai 2019-11-27 18:13:36 +08:00 committed by GitHub
parent c3c0d23992 d98e673fdc
commit d6324535e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shards/mishards/service_handler.py
View File

@ -140,15 +140,12 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
with self.tracer.start_span('search_{}'.format(addr), with self.tracer.start_span('search_{}'.format(addr),
child_of=span): child_of=span):
ret = conn.search_vectors_in_files( ret = conn.search_vectors_in_files(table_name=query_params['table_id'],
table_name=query_params['table_id'],
file_ids=query_params['file_ids'], file_ids=query_params['file_ids'],
query_records=vectors, query_records=vectors,
top_k=topk, top_k=topk,
nprobe=nprobe nprobe=nprobe)
)
end = time.time() end = time.time()
logger.info('search_vectors_in_files takes: {}'.format(end - start))
all_topk_results.append(ret) all_topk_results.append(ret)
@ -321,7 +318,7 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
metadata=metadata) metadata=metadata)
now = time.time() now = time.time()
logger.info('SearchVector takes: {}'.format(now - start)) # logger.info('SearchVector takes: {}'.format(now - start))
topk_result_list = milvus_pb2.TopKQueryResult( topk_result_list = milvus_pb2.TopKQueryResult(
status=status_pb2.Status(error_code=status.error_code, status=status_pb2.Status(error_code=status.error_code,

1
shards/mishards/settings.py
View File

@ -50,7 +50,6 @@ class TracingConfig:
} }
} }
max_overflow=0
class DefaultConfig: class DefaultConfig:
SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_URI') SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_URI')

114
shards/utils/colors.py
View File

@ -1,72 +1,72 @@
# Reset # Reset
Color_Off='\033[0m' # Text Reset Color_Off = '\033[0m' # Text Reset
# Regular Colors # Regular Colors
Black='\033[0;30m' # Black Black = '\033[0;30m' # Black
Red='\033[0;31m' # Red Red = '\033[0;31m' # Red
Green='\033[0;32m' # Green Green = '\033[0;32m' # Green
Yellow='\033[0;33m' # Yellow Yellow = '\033[0;33m' # Yellow
Blue='\033[0;34m' # Blue Blue = '\033[0;34m' # Blue
Purple='\033[0;35m' # Purple Purple = '\033[0;35m' # Purple
Cyan='\033[0;36m' # Cyan Cyan = '\033[0;36m' # Cyan
White='\033[0;37m' # White White = '\033[0;37m' # White
# Bold # Bold
BBlack='\033[1;30m' # Black BBlack = '\033[1;30m' # Black
BRed='\033[1;31m' # Red BRed = '\033[1;31m' # Red
BGreen='\033[1;32m' # Green BGreen = '\033[1;32m' # Green
BYellow='\033[1;33m' # Yellow BYellow = '\033[1;33m' # Yellow
BBlue='\033[1;34m' # Blue BBlue = '\033[1;34m' # Blue
BPurple='\033[1;35m' # Purple BPurple = '\033[1;35m' # Purple
BCyan='\033[1;36m' # Cyan BCyan = '\033[1;36m' # Cyan
BWhite='\033[1;37m' # White BWhite = '\033[1;37m' # White
# Underline # Underline
UBlack='\033[4;30m' # Black UBlack = '\033[4;30m' # Black
URed='\033[4;31m' # Red URed = '\033[4;31m' # Red
UGreen='\033[4;32m' # Green UGreen = '\033[4;32m' # Green
UYellow='\033[4;33m' # Yellow UYellow = '\033[4;33m' # Yellow
UBlue='\033[4;34m' # Blue UBlue = '\033[4;34m' # Blue
UPurple='\033[4;35m' # Purple UPurple = '\033[4;35m' # Purple
UCyan='\033[4;36m' # Cyan UCyan = '\033[4;36m' # Cyan
UWhite='\033[4;37m' # White UWhite = '\033[4;37m' # White
# Background # Background
On_Black='\033[40m' # Black On_Black = '\033[40m' # Black
On_Red='\033[41m' # Red On_Red = '\033[41m' # Red
On_Green='\033[42m' # Green On_Green = '\033[42m' # Green
On_Yellow='\033[43m' # Yellow On_Yellow = '\033[43m' # Yellow
On_Blue='\033[44m' # Blue On_Blue = '\033[44m' # Blue
On_Purple='\033[45m' # Purple On_Purple = '\033[45m' # Purple
On_Cyan='\033[46m' # Cyan On_Cyan = '\033[46m' # Cyan
On_White='\033[47m' # White On_White = '\033[47m' # White
# High Intensity # High Intensity
IBlack='\033[0;90m' # Black IBlack = '\033[0;90m' # Black
IRed='\033[0;91m' # Red IRed = '\033[0;91m' # Red
IGreen='\033[0;92m' # Green IGreen = '\033[0;92m' # Green
IYellow='\033[0;93m' # Yellow IYellow = '\033[0;93m' # Yellow
IBlue='\033[0;94m' # Blue IBlue = '\033[0;94m' # Blue
IPurple='\033[0;95m' # Purple IPurple = '\033[0;95m' # Purple
ICyan='\033[0;96m' # Cyan ICyan = '\033[0;96m' # Cyan
IWhite='\033[0;97m' # White IWhite = '\033[0;97m' # White
# Bold High Intensity # Bold High Intensity
BIBlack='\033[1;90m' # Black BIBlack = '\033[1;90m' # Black
BIRed='\033[1;91m' # Red BIRed = '\033[1;91m' # Red
BIGreen='\033[1;92m' # Green BIGreen = '\033[1;92m' # Green
BIYellow='\033[1;93m' # Yellow BIYellow = '\033[1;93m' # Yellow
BIBlue='\033[1;94m' # Blue BIBlue = '\033[1;94m' # Blue
BIPurple='\033[1;95m' # Purple BIPurple = '\033[1;95m' # Purple
BICyan='\033[1;96m' # Cyan BICyan = '\033[1;96m' # Cyan
BIWhite='\033[1;97m' # White BIWhite = '\033[1;97m' # White
# High Intensity backgrounds # High Intensity backgrounds
On_IBlack='\033[0;100m' # Black On_IBlack = '\033[0;100m' # Black
On_IRed='\033[0;101m' # Red On_IRed = '\033[0;101m' # Red
On_IGreen='\033[0;102m' # Green On_IGreen = '\033[0;102m' # Green
On_IYellow='\033[0;103m' # Yellow On_IYellow = '\033[0;103m' # Yellow
On_IBlue='\033[0;104m' # Blue On_IBlue = '\033[0;104m' # Blue
On_IPurple='\033[0;105m' # Purple On_IPurple = '\033[0;105m' # Purple
On_ICyan='\033[0;106m' # Cyan On_ICyan = '\033[0;106m' # Cyan
On_IWhite='\033[0;107m' # White On_IWhite = '\033[0;107m' # White

28
shards/utils/logger_helper.py
View File

@ -1,5 +1,6 @@
import os import os
import datetime import datetime
import copy
from pytz import timezone from pytz import timezone
from logging import Filter from logging import Filter
import logging.config import logging.config
@ -63,20 +64,27 @@ class ColorFulFormatColMixin:
ret = COLORS['ASCTIME'] + ret + COLORS['ENDC'] ret = COLORS['ASCTIME'] + ret + COLORS['ENDC']
return ret return ret
def format_record(self, record):
msg_schema = record.levelname + 'M' class ColorfulLogRecordProxy(logging.LogRecord):
record.msg = '{}{}{}'.format(COLORS[msg_schema], record.msg, COLORS['ENDC']) def __init__(self, record):
record.filename = COLORS['FILENAME'] + record.filename + COLORS['ENDC'] self._record = record
record.lineno = '{}{}{}'.format(COLORS['LINENO'], record.lineno, COLORS['ENDC']) msg_level = record.levelname + 'M'
record.threadName = '{}{}{}'.format(COLORS['THREAD'], record.threadName, COLORS['ENDC']) self.msg = '{}{}{}'.format(COLORS[msg_level], record.msg, COLORS['ENDC'])
record.levelname = COLORS[record.levelname] + record.levelname + COLORS['ENDC'] self.filename = COLORS['FILENAME'] + record.filename + COLORS['ENDC']
return record self.lineno = '{}{}{}'.format(COLORS['LINENO'], record.lineno, COLORS['ENDC'])
self.threadName = '{}{}{}'.format(COLORS['THREAD'], record.threadName, COLORS['ENDC'])
self.levelname = COLORS[record.levelname] + record.levelname + COLORS['ENDC']
def __getattr__(self, attr):
if attr not in self.__dict__:
return getattr(self._record, attr)
return getattr(self, attr)
class ColorfulFormatter(ColorFulFormatColMixin, logging.Formatter): class ColorfulFormatter(ColorFulFormatColMixin, logging.Formatter):
def format(self, record): def format(self, record):
record = self.format_record(record) proxy = ColorfulLogRecordProxy(record)
message_str = super(ColorfulFormatter, self).format(record) message_str = super().format(proxy)
return message_str return message_str