admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 11:21:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

code style format

Browse Source
This commit is contained in:
peng.xu 2019-10-17 14:20:09 +08:00
parent e0498e081d
commit 24b2e73e5a
6 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conftest.py
View File

@ -16,6 +16,7 @@ def app(request):
db.drop_all()
@pytest.fixture
def started_app(app):
app.on_pre_run()

4
mishards/grpc_utils/test_grpc.py
View File

@ -3,20 +3,20 @@ import opentracing
from mishards.grpc_utils import GrpcSpanDecorator, is_grpc_method
from milvus.grpc_gen import status_pb2, milvus_pb2
logger = logging.getLogger(__name__)
class FakeTracer(opentracing.Tracer):
pass
class FakeSpan(opentracing.Span):
def __init__(self, context, tracer, **kwargs):
super(FakeSpan, self).__init__(tracer, context)
self.reset()
def set_tag(self, key, value):
self.tags.append({key:value})
self.tags.append({key: value})
def log_kv(self, key_values, timestamp=None):
self.logs.append(key_values)

3
mishards/service_handler.py
View File

@ -232,7 +232,7 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
return status_pb2.Status(error_code=_status.code, reason=_status.message)
def _create_index(self, table_name, index):
return self.connection().create_index(table_name, index)
return self.connection().create_index(table_name, index)
@mark_grpc_method
def CreateIndex(self, request, context):
@ -378,7 +378,6 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
status=status_pb2.Status(error_code=_status.code, reason=_status.message),
table_row_count=_count if isinstance(_count, int) else -1)
def _get_server_version(self, metadata=None):
return self.connection(metadata=metadata).server_version()

2
mishards/test_server.py
View File

@ -254,7 +254,7 @@ class TestServer:
mock_results = milvus_pb2.TopKQueryResultList(status=status_pb2.Status(
error_code=status_pb2.SUCCESS, reason="Success"),
topk_query_result=result)
topk_query_result=result)
table_schema = TableSchema(table_name=table_name,
index_file_size=table.index_file_size,

19
tracing/__init__.py
View File

@ -1,8 +1,10 @@
from contextlib import contextmanager
def empty_server_interceptor_decorator(target_server, interceptor):
return target_server
@contextmanager
def EmptySpan(*args, **kwargs):
yield None
@ -10,7 +12,8 @@ def EmptySpan(*args, **kwargs):
class Tracer:
def __init__(self, tracer=None,
def __init__(self,
tracer=None,
interceptor=None,
server_decorator=empty_server_interceptor_decorator):
self.tracer = tracer
@ -27,10 +30,14 @@ class Tracer:
def close(self):
self.tracer and self.tracer.close()
def start_span(self, operation_name=None,
child_of=None, references=None, tags=None,
start_time=None, ignore_active_span=False):
def start_span(self,
operation_name=None,
child_of=None,
references=None,
tags=None,
start_time=None,
ignore_active_span=False):
if self.empty:
return EmptySpan()
return self.tracer.start_span(operation_name, child_of,
references, tags, start_time, ignore_active_span)
return self.tracer.start_span(operation_name, child_of, references,
tags, start_time, ignore_active_span)

21
tracing/factory.py
View File

@ -3,20 +3,23 @@ from jaeger_client import Config
from grpc_opentracing.grpcext import intercept_server
from grpc_opentracing import open_tracing_server_interceptor
from tracing import (Tracer,
empty_server_interceptor_decorator)
from tracing import (Tracer, empty_server_interceptor_decorator)
logger = logging.getLogger(__name__)
class TracerFactory:
@classmethod
def new_tracer(cls, tracer_type, tracer_config, span_decorator=None, **kwargs):
def new_tracer(cls,
tracer_type,
tracer_config,
span_decorator=None,
**kwargs):
if not tracer_type:
return Tracer()
config = tracer_config.TRACING_CONFIG
service_name = tracer_config.TRACING_SERVICE_NAME
validate=tracer_config.TRACING_VALIDATE
validate = tracer_config.TRACING_VALIDATE
# if not tracer_type:
# tracer_type = 'jaeger'
# config = tracer_config.DEFAULT_TRACING_CONFIG
@ -24,13 +27,13 @@ class TracerFactory:
if tracer_type.lower() == 'jaeger':
config = Config(config=config,
service_name=service_name,
validate=validate
)
validate=validate)
tracer = config.initialize_tracer()
tracer_interceptor = open_tracing_server_interceptor(tracer,
log_payloads=tracer_config.TRACING_LOG_PAYLOAD,
span_decorator=span_decorator)
tracer_interceptor = open_tracing_server_interceptor(
tracer,
log_payloads=tracer_config.TRACING_LOG_PAYLOAD,
span_decorator=span_decorator)
return Tracer(tracer, tracer_interceptor, intercept_server)