mirror of https://github.com/milvus-io/milvus.git
Remove opentracing stdlog
Signed-off-by: godchen <qingxiang.chen@zilliz.com>pull/4973/head^2
godchen
yefu.chen
parent
7fe061b846
commit
0971cf65b2
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"name": "Milvus Distributed Dev Container Definition",
|
||||
"dockerComposeFile": ["./docker-compose-devcontainer.yml"],
|
||||
"dockerComposeFile": ["./docker-compose-vscode.yml"],
|
||||
"service": "ubuntu",
|
||||
"initializeCommand": "scripts/devcontainer.sh && docker-compose -f docker-compose-devcontainer.yml down || true",
|
||||
"initializeCommand": "scripts/init_devcontainer.sh && docker-compose -f docker-compose-vscode.yml down || true",
|
||||
"workspaceFolder": "/go/src/github.com/zilliztech/milvus-distributed",
|
||||
"shutdownAction": "stopCompose",
|
||||
"extensions": [
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ pulsar/client-cpp/build/*
|
|||
|
||||
# vscode generated files
|
||||
.vscode
|
||||
docker-compose-devcontainer.yml
|
||||
docker-compose-devcontainer.yml.tmp
|
||||
docker-compose-vscode.yml
|
||||
docker-compose-vscode.yml.tmp
|
||||
|
||||
cmake-build-debug
|
||||
cmake-build-release
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_etcd_5fmeta_2eproto::offsets[]
|
|||
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::CollectionMeta, create_time_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::CollectionMeta, segmentids_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::CollectionMeta, partition_tags_),
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::CollectionMeta, partitionids_),
|
||||
~0u, // no _has_bits_
|
||||
PROTOBUF_FIELD_OFFSET(::milvus::proto::etcd::FieldBinlogFiles, _internal_metadata_),
|
||||
~0u, // no _extensions_
|
||||
|
|
@ -207,9 +208,9 @@ static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOB
|
|||
{ 0, -1, sizeof(::milvus::proto::etcd::TenantMeta)},
|
||||
{ 9, -1, sizeof(::milvus::proto::etcd::ProxyMeta)},
|
||||
{ 17, -1, sizeof(::milvus::proto::etcd::CollectionMeta)},
|
||||
{ 27, -1, sizeof(::milvus::proto::etcd::FieldBinlogFiles)},
|
||||
{ 34, -1, sizeof(::milvus::proto::etcd::SegmentMeta)},
|
||||
{ 49, -1, sizeof(::milvus::proto::etcd::FieldIndexMeta)},
|
||||
{ 28, -1, sizeof(::milvus::proto::etcd::FieldBinlogFiles)},
|
||||
{ 35, -1, sizeof(::milvus::proto::etcd::SegmentMeta)},
|
||||
{ 50, -1, sizeof(::milvus::proto::etcd::FieldIndexMeta)},
|
||||
};
|
||||
|
||||
static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
|
||||
|
|
@ -229,25 +230,26 @@ const char descriptor_table_protodef_etcd_5fmeta_2eproto[] PROTOBUF_SECTION_VARI
|
|||
"\003(\t\022\027\n\017query_channelID\030\004 \001(\t\"a\n\tProxyMet"
|
||||
"a\022\n\n\002ID\030\001 \001(\003\022-\n\007address\030\002 \001(\0132\034.milvus."
|
||||
"proto.common.Address\022\031\n\021result_channelID"
|
||||
"s\030\003 \003(\t\"\224\001\n\016CollectionMeta\022\n\n\002ID\030\001 \001(\003\0225"
|
||||
"s\030\003 \003(\t\"\252\001\n\016CollectionMeta\022\n\n\002ID\030\001 \001(\003\0225"
|
||||
"\n\006schema\030\002 \001(\0132%.milvus.proto.schema.Col"
|
||||
"lectionSchema\022\023\n\013create_time\030\003 \001(\004\022\022\n\nse"
|
||||
"gmentIDs\030\004 \003(\003\022\026\n\016partition_tags\030\005 \003(\t\"9"
|
||||
"\n\020FieldBinlogFiles\022\017\n\007fieldID\030\001 \001(\003\022\024\n\014b"
|
||||
"inlog_files\030\002 \003(\t\"\204\002\n\013SegmentMeta\022\021\n\tseg"
|
||||
"mentID\030\001 \001(\003\022\024\n\014collectionID\030\002 \001(\003\022\025\n\rpa"
|
||||
"rtition_tag\030\003 \001(\t\022\025\n\rchannel_start\030\004 \001(\005"
|
||||
"\022\023\n\013channel_end\030\005 \001(\005\022\021\n\topen_time\030\006 \001(\004"
|
||||
"\022\022\n\nclose_time\030\007 \001(\004\022\020\n\010num_rows\030\010 \001(\003\022\020"
|
||||
"\n\010mem_size\030\t \001(\003\022>\n\021binlog_file_paths\030\n "
|
||||
"\003(\0132#.milvus.proto.etcd.FieldBinlogFiles"
|
||||
"\"\313\001\n\016FieldIndexMeta\022\021\n\tsegmentID\030\001 \001(\003\022\017"
|
||||
"\n\007fieldID\030\002 \001(\003\022\017\n\007indexID\030\003 \001(\003\0227\n\014inde"
|
||||
"x_params\030\004 \003(\0132!.milvus.proto.common.Key"
|
||||
"ValuePair\0221\n\006status\030\005 \001(\0162!.milvus.proto"
|
||||
".service.IndexStatus\022\030\n\020index_file_paths"
|
||||
"\030\006 \003(\tB@Z>github.com/zilliztech/milvus-d"
|
||||
"istributed/internal/proto/etcdpbb\006proto3"
|
||||
"gmentIDs\030\004 \003(\003\022\026\n\016partition_tags\030\005 \003(\t\022\024"
|
||||
"\n\014partitionIDs\030\006 \003(\003\"9\n\020FieldBinlogFiles"
|
||||
"\022\017\n\007fieldID\030\001 \001(\003\022\024\n\014binlog_files\030\002 \003(\t\""
|
||||
"\204\002\n\013SegmentMeta\022\021\n\tsegmentID\030\001 \001(\003\022\024\n\014co"
|
||||
"llectionID\030\002 \001(\003\022\025\n\rpartition_tag\030\003 \001(\t\022"
|
||||
"\025\n\rchannel_start\030\004 \001(\005\022\023\n\013channel_end\030\005 "
|
||||
"\001(\005\022\021\n\topen_time\030\006 \001(\004\022\022\n\nclose_time\030\007 \001"
|
||||
"(\004\022\020\n\010num_rows\030\010 \001(\003\022\020\n\010mem_size\030\t \001(\003\022>"
|
||||
"\n\021binlog_file_paths\030\n \003(\0132#.milvus.proto"
|
||||
".etcd.FieldBinlogFiles\"\313\001\n\016FieldIndexMet"
|
||||
"a\022\021\n\tsegmentID\030\001 \001(\003\022\017\n\007fieldID\030\002 \001(\003\022\017\n"
|
||||
"\007indexID\030\003 \001(\003\0227\n\014index_params\030\004 \003(\0132!.m"
|
||||
"ilvus.proto.common.KeyValuePair\0221\n\006statu"
|
||||
"s\030\005 \001(\0162!.milvus.proto.service.IndexStat"
|
||||
"us\022\030\n\020index_file_paths\030\006 \003(\tB@Z>github.c"
|
||||
"om/zilliztech/milvus-distributed/interna"
|
||||
"l/proto/etcdpbb\006proto3"
|
||||
;
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_etcd_5fmeta_2eproto_deps[3] = {
|
||||
&::descriptor_table_common_2eproto,
|
||||
|
|
@ -265,7 +267,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_etc
|
|||
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_etcd_5fmeta_2eproto_once;
|
||||
static bool descriptor_table_etcd_5fmeta_2eproto_initialized = false;
|
||||
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_etcd_5fmeta_2eproto = {
|
||||
&descriptor_table_etcd_5fmeta_2eproto_initialized, descriptor_table_protodef_etcd_5fmeta_2eproto, "etcd_meta.proto", 1040,
|
||||
&descriptor_table_etcd_5fmeta_2eproto_initialized, descriptor_table_protodef_etcd_5fmeta_2eproto, "etcd_meta.proto", 1062,
|
||||
&descriptor_table_etcd_5fmeta_2eproto_once, descriptor_table_etcd_5fmeta_2eproto_sccs, descriptor_table_etcd_5fmeta_2eproto_deps, 6, 3,
|
||||
schemas, file_default_instances, TableStruct_etcd_5fmeta_2eproto::offsets,
|
||||
file_level_metadata_etcd_5fmeta_2eproto, 6, file_level_enum_descriptors_etcd_5fmeta_2eproto, file_level_service_descriptors_etcd_5fmeta_2eproto,
|
||||
|
|
@ -1104,7 +1106,8 @@ CollectionMeta::CollectionMeta(const CollectionMeta& from)
|
|||
: ::PROTOBUF_NAMESPACE_ID::Message(),
|
||||
_internal_metadata_(nullptr),
|
||||
segmentids_(from.segmentids_),
|
||||
partition_tags_(from.partition_tags_) {
|
||||
partition_tags_(from.partition_tags_),
|
||||
partitionids_(from.partitionids_) {
|
||||
_internal_metadata_.MergeFrom(from._internal_metadata_);
|
||||
if (from.has_schema()) {
|
||||
schema_ = new ::milvus::proto::schema::CollectionSchema(*from.schema_);
|
||||
|
|
@ -1150,6 +1153,7 @@ void CollectionMeta::Clear() {
|
|||
|
||||
segmentids_.Clear();
|
||||
partition_tags_.Clear();
|
||||
partitionids_.Clear();
|
||||
if (GetArenaNoVirtual() == nullptr && schema_ != nullptr) {
|
||||
delete schema_;
|
||||
}
|
||||
|
|
@ -1211,6 +1215,16 @@ const char* CollectionMeta::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE
|
|||
} while (::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<::PROTOBUF_NAMESPACE_ID::uint8>(ptr) == 42);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// repeated int64 partitionIDs = 6;
|
||||
case 6:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) {
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt64Parser(mutable_partitionids(), ptr, ctx);
|
||||
CHK_(ptr);
|
||||
} else if (static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 48) {
|
||||
add_partitionids(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint(&ptr));
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
default: {
|
||||
handle_unusual:
|
||||
if ((tag & 7) == 4 || tag == 0) {
|
||||
|
|
@ -1310,6 +1324,22 @@ bool CollectionMeta::MergePartialFromCodedStream(
|
|||
break;
|
||||
}
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
case 6: {
|
||||
if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (50 & 0xFF)) {
|
||||
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadPackedPrimitive<
|
||||
::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>(
|
||||
input, this->mutable_partitionids())));
|
||||
} else if (static_cast< ::PROTOBUF_NAMESPACE_ID::uint8>(tag) == (48 & 0xFF)) {
|
||||
DO_((::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
|
||||
::PROTOBUF_NAMESPACE_ID::int64, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_INT64>(
|
||||
1, 50u, input, this->mutable_partitionids())));
|
||||
} else {
|
||||
goto handle_unusual;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
handle_unusual:
|
||||
if (tag == 0) {
|
||||
|
|
@ -1374,6 +1404,17 @@ void CollectionMeta::SerializeWithCachedSizes(
|
|||
5, this->partition_tags(i), output);
|
||||
}
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
if (this->partitionids_size() > 0) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteTag(6, ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
|
||||
output->WriteVarint32(_partitionids_cached_byte_size_.load(
|
||||
std::memory_order_relaxed));
|
||||
}
|
||||
for (int i = 0, n = this->partitionids_size(); i < n; i++) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteInt64NoTag(
|
||||
this->partitionids(i), output);
|
||||
}
|
||||
|
||||
if (_internal_metadata_.have_unknown_fields()) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFields(
|
||||
_internal_metadata_.unknown_fields(), output);
|
||||
|
|
@ -1427,6 +1468,19 @@ void CollectionMeta::SerializeWithCachedSizes(
|
|||
WriteStringToArray(5, this->partition_tags(i), target);
|
||||
}
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
if (this->partitionids_size() > 0) {
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteTagToArray(
|
||||
6,
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
|
||||
target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::io::CodedOutputStream::WriteVarint32ToArray(
|
||||
_partitionids_cached_byte_size_.load(std::memory_order_relaxed),
|
||||
target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
|
||||
WriteInt64NoTagToArray(this->partitionids_, target);
|
||||
}
|
||||
|
||||
if (_internal_metadata_.have_unknown_fields()) {
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SerializeUnknownFieldsToArray(
|
||||
_internal_metadata_.unknown_fields(), target);
|
||||
|
|
@ -1471,6 +1525,21 @@ size_t CollectionMeta::ByteSizeLong() const {
|
|||
this->partition_tags(i));
|
||||
}
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
{
|
||||
size_t data_size = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
|
||||
Int64Size(this->partitionids_);
|
||||
if (data_size > 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::Int32Size(
|
||||
static_cast<::PROTOBUF_NAMESPACE_ID::int32>(data_size));
|
||||
}
|
||||
int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(data_size);
|
||||
_partitionids_cached_byte_size_.store(cached_size,
|
||||
std::memory_order_relaxed);
|
||||
total_size += data_size;
|
||||
}
|
||||
|
||||
// .milvus.proto.schema.CollectionSchema schema = 2;
|
||||
if (this->has_schema()) {
|
||||
total_size += 1 +
|
||||
|
|
@ -1521,6 +1590,7 @@ void CollectionMeta::MergeFrom(const CollectionMeta& from) {
|
|||
|
||||
segmentids_.MergeFrom(from.segmentids_);
|
||||
partition_tags_.MergeFrom(from.partition_tags_);
|
||||
partitionids_.MergeFrom(from.partitionids_);
|
||||
if (from.has_schema()) {
|
||||
mutable_schema()->::milvus::proto::schema::CollectionSchema::MergeFrom(from.schema());
|
||||
}
|
||||
|
|
@ -1555,6 +1625,7 @@ void CollectionMeta::InternalSwap(CollectionMeta* other) {
|
|||
_internal_metadata_.Swap(&other->_internal_metadata_);
|
||||
segmentids_.InternalSwap(&other->segmentids_);
|
||||
partition_tags_.InternalSwap(CastToBase(&other->partition_tags_));
|
||||
partitionids_.InternalSwap(&other->partitionids_);
|
||||
swap(schema_, other->schema_);
|
||||
swap(id_, other->id_);
|
||||
swap(create_time_, other->create_time_);
|
||||
|
|
|
|||
|
|
@ -540,6 +540,7 @@ class CollectionMeta :
|
|||
enum : int {
|
||||
kSegmentIDsFieldNumber = 4,
|
||||
kPartitionTagsFieldNumber = 5,
|
||||
kPartitionIDsFieldNumber = 6,
|
||||
kSchemaFieldNumber = 2,
|
||||
kIDFieldNumber = 1,
|
||||
kCreateTimeFieldNumber = 3,
|
||||
|
|
@ -572,6 +573,17 @@ class CollectionMeta :
|
|||
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& partition_tags() const;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_partition_tags();
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
int partitionids_size() const;
|
||||
void clear_partitionids();
|
||||
::PROTOBUF_NAMESPACE_ID::int64 partitionids(int index) const;
|
||||
void set_partitionids(int index, ::PROTOBUF_NAMESPACE_ID::int64 value);
|
||||
void add_partitionids(::PROTOBUF_NAMESPACE_ID::int64 value);
|
||||
const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
|
||||
partitionids() const;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
|
||||
mutable_partitionids();
|
||||
|
||||
// .milvus.proto.schema.CollectionSchema schema = 2;
|
||||
bool has_schema() const;
|
||||
void clear_schema();
|
||||
|
|
@ -598,6 +610,8 @@ class CollectionMeta :
|
|||
::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 > segmentids_;
|
||||
mutable std::atomic<int> _segmentids_cached_byte_size_;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> partition_tags_;
|
||||
::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 > partitionids_;
|
||||
mutable std::atomic<int> _partitionids_cached_byte_size_;
|
||||
::milvus::proto::schema::CollectionSchema* schema_;
|
||||
::PROTOBUF_NAMESPACE_ID::int64 id_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 create_time_;
|
||||
|
|
@ -1599,6 +1613,36 @@ CollectionMeta::mutable_partition_tags() {
|
|||
return &partition_tags_;
|
||||
}
|
||||
|
||||
// repeated int64 partitionIDs = 6;
|
||||
inline int CollectionMeta::partitionids_size() const {
|
||||
return partitionids_.size();
|
||||
}
|
||||
inline void CollectionMeta::clear_partitionids() {
|
||||
partitionids_.Clear();
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::int64 CollectionMeta::partitionids(int index) const {
|
||||
// @@protoc_insertion_point(field_get:milvus.proto.etcd.CollectionMeta.partitionIDs)
|
||||
return partitionids_.Get(index);
|
||||
}
|
||||
inline void CollectionMeta::set_partitionids(int index, ::PROTOBUF_NAMESPACE_ID::int64 value) {
|
||||
partitionids_.Set(index, value);
|
||||
// @@protoc_insertion_point(field_set:milvus.proto.etcd.CollectionMeta.partitionIDs)
|
||||
}
|
||||
inline void CollectionMeta::add_partitionids(::PROTOBUF_NAMESPACE_ID::int64 value) {
|
||||
partitionids_.Add(value);
|
||||
// @@protoc_insertion_point(field_add:milvus.proto.etcd.CollectionMeta.partitionIDs)
|
||||
}
|
||||
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >&
|
||||
CollectionMeta::partitionids() const {
|
||||
// @@protoc_insertion_point(field_list:milvus.proto.etcd.CollectionMeta.partitionIDs)
|
||||
return partitionids_;
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::int64 >*
|
||||
CollectionMeta::mutable_partitionids() {
|
||||
// @@protoc_insertion_point(field_mutable_list:milvus.proto.etcd.CollectionMeta.partitionIDs)
|
||||
return &partitionids_;
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
// FieldBinlogFiles
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ message CollectionMeta {
|
|||
uint64 create_time=3;
|
||||
repeated int64 segmentIDs=4;
|
||||
repeated string partition_tags=5;
|
||||
repeated int64 partitionIDs=6;
|
||||
}
|
||||
|
||||
message FieldBinlogFiles {
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ type CollectionMeta struct {
|
|||
CreateTime uint64 `protobuf:"varint,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
|
||||
SegmentIDs []int64 `protobuf:"varint,4,rep,packed,name=segmentIDs,proto3" json:"segmentIDs,omitempty"`
|
||||
PartitionTags []string `protobuf:"bytes,5,rep,name=partition_tags,json=partitionTags,proto3" json:"partition_tags,omitempty"`
|
||||
PartitionIDs []int64 `protobuf:"varint,6,rep,packed,name=partitionIDs,proto3" json:"partitionIDs,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
|
|
@ -212,6 +213,13 @@ func (m *CollectionMeta) GetPartitionTags() []string {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *CollectionMeta) GetPartitionIDs() []int64 {
|
||||
if m != nil {
|
||||
return m.PartitionIDs
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type FieldBinlogFiles struct {
|
||||
FieldID int64 `protobuf:"varint,1,opt,name=fieldID,proto3" json:"fieldID,omitempty"`
|
||||
BinlogFiles []string `protobuf:"bytes,2,rep,name=binlog_files,json=binlogFiles,proto3" json:"binlog_files,omitempty"`
|
||||
|
|
@ -461,50 +469,51 @@ func init() {
|
|||
func init() { proto.RegisterFile("etcd_meta.proto", fileDescriptor_975d306d62b73e88) }
|
||||
|
||||
var fileDescriptor_975d306d62b73e88 = []byte{
|
||||
// 716 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x5d, 0x6f, 0xe2, 0x46,
|
||||
0x14, 0x15, 0x38, 0x81, 0xf8, 0x42, 0x20, 0x99, 0xbe, 0xb8, 0x69, 0xda, 0x12, 0xa2, 0xb4, 0x48,
|
||||
0x55, 0x41, 0x4a, 0xa5, 0x4a, 0x7d, 0x68, 0xd5, 0x26, 0x34, 0x12, 0xaa, 0xda, 0x50, 0x13, 0xed,
|
||||
0xc3, 0xbe, 0x58, 0x83, 0x7d, 0x03, 0x23, 0x79, 0xc6, 0xec, 0xcc, 0x38, 0x1f, 0x3c, 0xed, 0x1f,
|
||||
0xd8, 0x3f, 0xb0, 0x7f, 0x68, 0x7f, 0xd5, 0x4a, 0xab, 0x99, 0x31, 0x06, 0xb2, 0x3c, 0xec, 0xe3,
|
||||
0x9c, 0x73, 0xee, 0xf5, 0xb9, 0xe7, 0xce, 0x18, 0xda, 0xa8, 0xe3, 0x24, 0xe2, 0xa8, 0x69, 0x7f,
|
||||
0x21, 0x33, 0x9d, 0x91, 0x63, 0xce, 0xd2, 0x87, 0x5c, 0xb9, 0x53, 0xdf, 0xb0, 0x27, 0x5f, 0x31,
|
||||
0x91, 0xe0, 0x53, 0x34, 0xcd, 0x59, 0x9a, 0xa0, 0x74, 0xcc, 0x49, 0x33, 0xce, 0x38, 0xcf, 0xc4,
|
||||
0xea, 0xa4, 0xe2, 0x39, 0xf2, 0xa2, 0x47, 0xf7, 0x7d, 0x05, 0xe0, 0x0e, 0x05, 0x15, 0xfa, 0x5f,
|
||||
0xd4, 0x94, 0xb4, 0xa0, 0x3a, 0x1a, 0x06, 0x95, 0x4e, 0xa5, 0xe7, 0x85, 0xd5, 0xd1, 0x90, 0xfc,
|
||||
0x00, 0x6d, 0x91, 0xf3, 0xe8, 0x4d, 0x8e, 0xf2, 0x39, 0x12, 0x59, 0x82, 0x2a, 0xa8, 0x5a, 0xf2,
|
||||
0x50, 0xe4, 0xfc, 0x7f, 0x83, 0xfe, 0x67, 0x40, 0xf2, 0x13, 0x1c, 0x33, 0xa1, 0x50, 0xea, 0x28,
|
||||
0x9e, 0x53, 0x21, 0x30, 0x1d, 0x0d, 0x55, 0xe0, 0x75, 0xbc, 0x9e, 0x1f, 0x1e, 0x39, 0xe2, 0xba,
|
||||
0xc4, 0xc9, 0x8f, 0xd0, 0x76, 0x0d, 0x4b, 0x6d, 0xb0, 0xd7, 0xa9, 0xf4, 0xfc, 0xb0, 0x65, 0xe1,
|
||||
0x52, 0xd9, 0x7d, 0x5b, 0x01, 0x7f, 0x2c, 0xb3, 0xa7, 0xe7, 0x9d, 0xde, 0x7e, 0x85, 0x3a, 0x4d,
|
||||
0x12, 0x89, 0xca, 0x79, 0x6a, 0x5c, 0x9e, 0xf6, 0xb7, 0x02, 0x29, 0xa6, 0xfe, 0xcb, 0x69, 0xc2,
|
||||
0x95, 0xd8, 0x78, 0x95, 0xa8, 0xf2, 0x74, 0x97, 0x57, 0x47, 0xac, 0xbd, 0x76, 0x3f, 0x54, 0xa0,
|
||||
0x75, 0x9d, 0xa5, 0x29, 0xc6, 0x9a, 0x65, 0x62, 0xa7, 0x8f, 0xdf, 0xa1, 0xe6, 0x22, 0x2d, 0x6c,
|
||||
0x5c, 0x6c, 0xdb, 0x28, 0xe2, 0x5e, 0x37, 0x99, 0x58, 0x20, 0x2c, 0x8a, 0xc8, 0xf7, 0xd0, 0x88,
|
||||
0x25, 0x52, 0x8d, 0x91, 0x66, 0x1c, 0x03, 0xaf, 0x53, 0xe9, 0xed, 0x85, 0xe0, 0xa0, 0x3b, 0xc6,
|
||||
0x91, 0x7c, 0x07, 0xa0, 0x70, 0xc6, 0x51, 0x68, 0x63, 0x74, 0xaf, 0xe3, 0xf5, 0xbc, 0x70, 0x03,
|
||||
0x21, 0x17, 0xd0, 0x5a, 0x50, 0xa9, 0x99, 0xe9, 0x1d, 0x69, 0x3a, 0x53, 0xc1, 0xbe, 0x1d, 0xe6,
|
||||
0xb0, 0x44, 0xef, 0xe8, 0x4c, 0x75, 0x6f, 0xe1, 0xe8, 0x86, 0x61, 0x9a, 0x5c, 0x31, 0x91, 0x66,
|
||||
0xb3, 0x1b, 0x96, 0xa2, 0x22, 0x01, 0xd4, 0xef, 0x0d, 0x56, 0xce, 0xb3, 0x3a, 0x92, 0x33, 0x68,
|
||||
0x4e, 0xad, 0x30, 0xba, 0x37, 0xca, 0xa0, 0x6a, 0x5b, 0x36, 0xa6, 0xeb, 0xe2, 0xee, 0xc7, 0x2a,
|
||||
0x34, 0x26, 0xce, 0x86, 0xcd, 0xe5, 0x14, 0xfc, 0xd2, 0x55, 0xd1, 0x6e, 0x0d, 0x90, 0x2e, 0x34,
|
||||
0xe3, 0x32, 0x82, 0xd1, 0xb0, 0xb8, 0x46, 0x5b, 0x18, 0x39, 0x87, 0xc3, 0xad, 0x49, 0x6c, 0x18,
|
||||
0x7e, 0xd8, 0xdc, 0x1c, 0xc4, 0x88, 0x8a, 0xbd, 0x45, 0x4a, 0x53, 0xa9, 0xed, 0xdd, 0xd9, 0x0f,
|
||||
0x9b, 0x05, 0x38, 0x31, 0x98, 0x0d, 0xb5, 0x10, 0xa1, 0x48, 0x82, 0x7d, 0x2b, 0x81, 0x02, 0xfa,
|
||||
0x5b, 0x24, 0xe4, 0x1b, 0xf0, 0xb3, 0x05, 0x0a, 0x97, 0x79, 0xcd, 0x66, 0x7e, 0x60, 0x00, 0x9b,
|
||||
0xf8, 0xb7, 0x00, 0x71, 0x9a, 0xa9, 0x62, 0x23, 0x75, 0xcb, 0xfa, 0x16, 0xb1, 0xf4, 0xd7, 0x70,
|
||||
0x60, 0x1e, 0x85, 0xcc, 0x1e, 0x55, 0x70, 0xe0, 0x62, 0x13, 0x39, 0x0f, 0xb3, 0x47, 0x65, 0x28,
|
||||
0x8e, 0x3c, 0x52, 0x6c, 0x89, 0x81, 0xef, 0x28, 0x8e, 0x7c, 0xc2, 0x96, 0x48, 0x6e, 0xe1, 0x78,
|
||||
0x23, 0xd1, 0x68, 0x41, 0xf5, 0x5c, 0x05, 0xd0, 0xf1, 0x7a, 0x8d, 0xcb, 0xf3, 0xfe, 0x67, 0x2f,
|
||||
0xb9, 0xff, 0x72, 0x57, 0x61, 0x7b, 0x9d, 0xfd, 0xd8, 0xd4, 0x76, 0xdf, 0x55, 0xa1, 0x65, 0x55,
|
||||
0x23, 0xf3, 0xe6, 0xbf, 0x60, 0x05, 0x1b, 0xdb, 0xae, 0x6e, 0x6f, 0x3b, 0x80, 0xba, 0xfd, 0x71,
|
||||
0x8c, 0x86, 0x36, 0x72, 0x2f, 0x5c, 0x1d, 0xc9, 0x10, 0x9a, 0xee, 0x97, 0xb2, 0xa0, 0x92, 0x72,
|
||||
0x77, 0xfd, 0x1a, 0x97, 0x67, 0x3b, 0x5f, 0xda, 0x3f, 0xf8, 0xfc, 0x8a, 0xa6, 0x39, 0x8e, 0x29,
|
||||
0x93, 0x61, 0xc3, 0x96, 0x8d, 0x6d, 0x15, 0xf9, 0x0d, 0x6a, 0x4a, 0x53, 0x9d, 0x2b, 0xbb, 0x89,
|
||||
0xd6, 0xcb, 0x7a, 0x85, 0xf2, 0x81, 0xc5, 0xd8, 0xb7, 0x83, 0x4c, 0xac, 0x30, 0x2c, 0x0a, 0x48,
|
||||
0x0f, 0x8e, 0x9c, 0x81, 0x8d, 0xd4, 0x6a, 0xf6, 0x32, 0xb6, 0x2c, 0x5e, 0xe6, 0x71, 0xf5, 0xe7,
|
||||
0xeb, 0x3f, 0x66, 0x4c, 0xcf, 0xf3, 0xa9, 0xf1, 0x33, 0x58, 0xb2, 0x34, 0x65, 0x4b, 0x8d, 0xf1,
|
||||
0x7c, 0xe0, 0xbe, 0xf5, 0x73, 0xc2, 0x94, 0x96, 0x6c, 0x9a, 0x6b, 0x4c, 0x06, 0x4c, 0x68, 0x94,
|
||||
0x82, 0xa6, 0x03, 0x6b, 0x60, 0x60, 0x12, 0x5f, 0x4c, 0xa7, 0x35, 0x7b, 0xfa, 0xe5, 0x53, 0x00,
|
||||
0x00, 0x00, 0xff, 0xff, 0x0a, 0x10, 0xb5, 0x6d, 0x6a, 0x05, 0x00, 0x00,
|
||||
// 726 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x4d, 0x6f, 0xea, 0x46,
|
||||
0x14, 0x15, 0x38, 0x81, 0xf8, 0x42, 0x20, 0x99, 0x6e, 0xdc, 0x34, 0x6d, 0x09, 0x51, 0x5a, 0xa4,
|
||||
0xaa, 0x20, 0xa5, 0x52, 0xa5, 0x2e, 0x5a, 0xb5, 0x09, 0x8d, 0x84, 0xaa, 0x36, 0xd4, 0xa0, 0x2e,
|
||||
0xba, 0xb1, 0x06, 0xfb, 0x06, 0x46, 0xf2, 0x8c, 0xe9, 0xcc, 0x38, 0x1f, 0xac, 0xfa, 0x07, 0xde,
|
||||
0x1f, 0x78, 0x7f, 0xf1, 0xfd, 0x86, 0x27, 0x3d, 0xcd, 0x8c, 0x31, 0x90, 0xc7, 0xe2, 0x2d, 0xe7,
|
||||
0xdc, 0x73, 0xaf, 0xcf, 0x3d, 0x67, 0x3c, 0xd0, 0x46, 0x1d, 0x27, 0x11, 0x47, 0x4d, 0xfb, 0x4b,
|
||||
0x99, 0xe9, 0x8c, 0x9c, 0x72, 0x96, 0x3e, 0xe6, 0xca, 0x9d, 0xfa, 0xa6, 0x7a, 0xf6, 0x19, 0x13,
|
||||
0x09, 0x3e, 0x47, 0xb3, 0x9c, 0xa5, 0x09, 0x4a, 0x57, 0x39, 0x6b, 0xc6, 0x19, 0xe7, 0x99, 0x58,
|
||||
0x9f, 0x54, 0xbc, 0x40, 0x5e, 0xcc, 0xe8, 0xbe, 0xad, 0x00, 0x4c, 0x51, 0x50, 0xa1, 0xff, 0x44,
|
||||
0x4d, 0x49, 0x0b, 0xaa, 0xa3, 0x61, 0x50, 0xe9, 0x54, 0x7a, 0x5e, 0x58, 0x1d, 0x0d, 0xc9, 0x37,
|
||||
0xd0, 0x16, 0x39, 0x8f, 0xfe, 0xcb, 0x51, 0xbe, 0x44, 0x22, 0x4b, 0x50, 0x05, 0x55, 0x5b, 0x3c,
|
||||
0x16, 0x39, 0xff, 0xdb, 0xa0, 0x7f, 0x19, 0x90, 0x7c, 0x07, 0xa7, 0x4c, 0x28, 0x94, 0x3a, 0x8a,
|
||||
0x17, 0x54, 0x08, 0x4c, 0x47, 0x43, 0x15, 0x78, 0x1d, 0xaf, 0xe7, 0x87, 0x27, 0xae, 0x70, 0x5b,
|
||||
0xe2, 0xe4, 0x5b, 0x68, 0xbb, 0x81, 0x25, 0x37, 0x38, 0xe8, 0x54, 0x7a, 0x7e, 0xd8, 0xb2, 0x70,
|
||||
0xc9, 0xec, 0xfe, 0x5f, 0x01, 0x7f, 0x2c, 0xb3, 0xe7, 0x97, 0xbd, 0xda, 0x7e, 0x84, 0x3a, 0x4d,
|
||||
0x12, 0x89, 0xca, 0x69, 0x6a, 0x5c, 0x9f, 0xf7, 0x77, 0x0c, 0x29, 0xb6, 0xfe, 0xcd, 0x71, 0xc2,
|
||||
0x35, 0xd9, 0x68, 0x95, 0xa8, 0xf2, 0x74, 0x9f, 0x56, 0x57, 0xd8, 0x68, 0xed, 0xbe, 0xab, 0x40,
|
||||
0xeb, 0x36, 0x4b, 0x53, 0x8c, 0x35, 0xcb, 0xc4, 0x5e, 0x1d, 0x3f, 0x43, 0xcd, 0x59, 0x5a, 0xc8,
|
||||
0xb8, 0xda, 0x95, 0x51, 0xd8, 0xbd, 0x19, 0x32, 0xb1, 0x40, 0x58, 0x34, 0x91, 0xaf, 0xa1, 0x11,
|
||||
0x4b, 0xa4, 0x1a, 0x23, 0xcd, 0x38, 0x06, 0x5e, 0xa7, 0xd2, 0x3b, 0x08, 0xc1, 0x41, 0x53, 0xc6,
|
||||
0x91, 0x7c, 0x05, 0xa0, 0x70, 0xce, 0x51, 0x68, 0x23, 0xf4, 0xa0, 0xe3, 0xf5, 0xbc, 0x70, 0x0b,
|
||||
0x21, 0x57, 0xd0, 0x5a, 0x52, 0xa9, 0x99, 0x99, 0x1d, 0x69, 0x3a, 0x57, 0xc1, 0xa1, 0x5d, 0xe6,
|
||||
0xb8, 0x44, 0xa7, 0x74, 0xae, 0x48, 0x17, 0x9a, 0x25, 0x60, 0x06, 0xd5, 0xec, 0xa0, 0x1d, 0xac,
|
||||
0x7b, 0x0f, 0x27, 0x77, 0x0c, 0xd3, 0xe4, 0x86, 0x89, 0x34, 0x9b, 0xdf, 0xb1, 0x14, 0x15, 0x09,
|
||||
0xa0, 0xfe, 0x60, 0xb0, 0x72, 0xe7, 0xf5, 0x91, 0x5c, 0x40, 0x73, 0x66, 0x89, 0xd1, 0x83, 0x61,
|
||||
0x06, 0x55, 0xfb, 0xd9, 0xc6, 0x6c, 0xd3, 0xdc, 0x7d, 0x5f, 0x85, 0xc6, 0xc4, 0x49, 0xb5, 0xde,
|
||||
0x9d, 0x83, 0x5f, 0x2a, 0x2f, 0xc6, 0x6d, 0x00, 0x23, 0x31, 0x2e, 0x6d, 0x1a, 0x0d, 0x8b, 0xab,
|
||||
0xb6, 0x83, 0x91, 0x4b, 0x38, 0xde, 0xd9, 0xd6, 0x1a, 0xe6, 0x6f, 0xed, 0x31, 0xa5, 0x73, 0x43,
|
||||
0x2a, 0xb2, 0x8d, 0x94, 0xa6, 0x52, 0xdb, 0xfb, 0x75, 0x18, 0x36, 0x0b, 0x70, 0x62, 0x30, 0x6b,
|
||||
0x7c, 0x41, 0x42, 0x91, 0x04, 0x87, 0x96, 0x02, 0x05, 0xf4, 0xbb, 0x48, 0xc8, 0x17, 0xe0, 0x67,
|
||||
0x4b, 0x14, 0x2e, 0x97, 0x9a, 0xcd, 0xe5, 0xc8, 0x00, 0x36, 0x95, 0x2f, 0x01, 0xe2, 0x34, 0x53,
|
||||
0x45, 0x6a, 0x75, 0x5b, 0xf5, 0x2d, 0x62, 0xcb, 0x9f, 0xc3, 0x91, 0xf9, 0x71, 0x64, 0xf6, 0xa4,
|
||||
0x82, 0x23, 0x67, 0x9b, 0xc8, 0x79, 0x98, 0x3d, 0x29, 0x53, 0xe2, 0xc8, 0x23, 0xc5, 0x56, 0x18,
|
||||
0xf8, 0xae, 0xc4, 0x91, 0x4f, 0xd8, 0x0a, 0xc9, 0x3d, 0x9c, 0x6e, 0x39, 0x1a, 0x2d, 0xa9, 0x5e,
|
||||
0xa8, 0x00, 0x3a, 0x5e, 0xaf, 0x71, 0x7d, 0xd9, 0xff, 0xe8, 0x6f, 0xef, 0xbf, 0xce, 0x2a, 0x6c,
|
||||
0x6f, 0xbc, 0x1f, 0x9b, 0xde, 0xee, 0x9b, 0x2a, 0xb4, 0x2c, 0x6b, 0x64, 0xde, 0x85, 0x4f, 0x88,
|
||||
0x60, 0x2b, 0xed, 0xea, 0x6e, 0xda, 0x01, 0xd4, 0xed, 0xe3, 0x32, 0x1a, 0x5a, 0xcb, 0xbd, 0x70,
|
||||
0x7d, 0x24, 0x43, 0x68, 0xba, 0x67, 0x67, 0x49, 0x25, 0xe5, 0xee, 0x8a, 0x36, 0xae, 0x2f, 0xf6,
|
||||
0xfe, 0x8d, 0x7f, 0xe0, 0xcb, 0x3f, 0x34, 0xcd, 0x71, 0x4c, 0x99, 0x0c, 0x1b, 0xb6, 0x6d, 0x6c,
|
||||
0xbb, 0xc8, 0x4f, 0x50, 0x53, 0x9a, 0xea, 0x5c, 0xd9, 0x24, 0x5a, 0xaf, 0xfb, 0x15, 0xca, 0x47,
|
||||
0x16, 0x63, 0xdf, 0x2e, 0x32, 0xb1, 0xc4, 0xb0, 0x68, 0x20, 0x3d, 0x38, 0x71, 0x02, 0xb6, 0x5c,
|
||||
0xab, 0xd9, 0xcb, 0xd8, 0xb2, 0x78, 0xe9, 0xc7, 0xcd, 0xaf, 0xff, 0xfe, 0x32, 0x67, 0x7a, 0x91,
|
||||
0xcf, 0x8c, 0x9e, 0xc1, 0x8a, 0xa5, 0x29, 0x5b, 0x69, 0x8c, 0x17, 0x03, 0xf7, 0xad, 0xef, 0x13,
|
||||
0xa6, 0xb4, 0x64, 0xb3, 0x5c, 0x63, 0x32, 0x60, 0x42, 0xa3, 0x14, 0x34, 0x1d, 0x58, 0x01, 0x03,
|
||||
0xe3, 0xf8, 0x72, 0x36, 0xab, 0xd9, 0xd3, 0x0f, 0x1f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x12, 0x8d,
|
||||
0xcf, 0x40, 0x8e, 0x05, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/opentracing/opentracing-go"
|
||||
"github.com/uber/jaeger-client-go"
|
||||
"github.com/uber/jaeger-client-go/config"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
|
|
@ -72,11 +71,8 @@ func CreateProxy(ctx context.Context) (*Proxy, error) {
|
|||
Type: "const",
|
||||
Param: 1,
|
||||
},
|
||||
Reporter: &config.ReporterConfig{
|
||||
LogSpans: true,
|
||||
},
|
||||
}
|
||||
p.tracer, p.closer, err = cfg.NewTracer(config.Logger(jaeger.StdLogger))
|
||||
p.tracer, p.closer, err = cfg.NewTracer()
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("ERROR: cannot init Jaeger: %v\n", err))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import (
|
|||
"io"
|
||||
|
||||
"github.com/opentracing/opentracing-go"
|
||||
"github.com/uber/jaeger-client-go"
|
||||
"github.com/uber/jaeger-client-go/config"
|
||||
)
|
||||
|
||||
|
|
@ -67,11 +66,8 @@ func NewQueryNode(ctx context.Context, queryNodeID uint64) *QueryNode {
|
|||
Type: "const",
|
||||
Param: 1,
|
||||
},
|
||||
Reporter: &config.ReporterConfig{
|
||||
LogSpans: true,
|
||||
},
|
||||
}
|
||||
q.tracer, q.closer, err = cfg.NewTracer(config.Logger(jaeger.StdLogger))
|
||||
q.tracer, q.closer, err = cfg.NewTracer()
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("ERROR: cannot init Jaeger: %v\n", err))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import (
|
|||
"io"
|
||||
|
||||
"github.com/opentracing/opentracing-go"
|
||||
"github.com/uber/jaeger-client-go"
|
||||
"github.com/uber/jaeger-client-go/config"
|
||||
)
|
||||
|
||||
|
|
@ -52,12 +51,9 @@ func (node *WriteNode) Start() error {
|
|||
Type: "const",
|
||||
Param: 1,
|
||||
},
|
||||
Reporter: &config.ReporterConfig{
|
||||
LogSpans: true,
|
||||
},
|
||||
}
|
||||
var err error
|
||||
node.tracer, node.closer, err = cfg.NewTracer(config.Logger(jaeger.StdLogger))
|
||||
node.tracer, node.closer, err = cfg.NewTracer()
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("ERROR: cannot init Jaeger: %v\n", err))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,22 +30,14 @@ gid=$(id -g)
|
|||
[ "$uid" -lt 500 ] && uid=501
|
||||
[ "$gid" -lt 500 ] && gid=$uid
|
||||
|
||||
awk 'c&&c--{sub(/^/,"#")} /# Build devcontainer/{c=5} 1' $ROOT_DIR/docker-compose.yml > $ROOT_DIR/docker-compose-devcontainer.yml.tmp
|
||||
awk 'c&&c--{sub(/^/,"#")} /# Build devcontainer/{c=5} 1' $ROOT_DIR/docker-compose.yml > $ROOT_DIR/docker-compose-vscode.yml.tmp
|
||||
|
||||
awk 'c&&c--{sub(/^/,"#")} /# Command/{c=3} 1' $ROOT_DIR/docker-compose-devcontainer.yml.tmp > $ROOT_DIR/docker-compose-devcontainer.yml
|
||||
awk 'c&&c--{sub(/^/,"#")} /# Command/{c=3} 1' $ROOT_DIR/docker-compose-vscode.yml.tmp > $ROOT_DIR/docker-compose-vscode.yml
|
||||
|
||||
rm $ROOT_DIR/docker-compose-devcontainer.yml.tmp
|
||||
rm $ROOT_DIR/docker-compose-vscode.yml.tmp
|
||||
|
||||
if [ "${machine}" == "Mac" ];then
|
||||
sed -i '' "s/# user: {{ CURRENT_ID }}/user: \"$uid:$gid\"/g" $ROOT_DIR/docker-compose-devcontainer.yml
|
||||
sed -i '' "s/# user: {{ CURRENT_ID }}/user: \"$uid:$gid\"/g" $ROOT_DIR/docker-compose-vscode.yml
|
||||
else
|
||||
sed -i "s/# user: {{ CURRENT_ID }}/user: \"$uid:$gid\"/g" $ROOT_DIR/docker-compose-devcontainer.yml
|
||||
fi
|
||||
|
||||
if [ "${1-}" = "up" ]; then
|
||||
docker-compose -f $ROOT_DIR/docker-compose-devcontainer.yml up -d
|
||||
fi
|
||||
|
||||
if [ "${1-}" = "down" ]; then
|
||||
docker-compose -f $ROOT_DIR/docker-compose-devcontainer.yml down
|
||||
fi
|
||||
sed -i "s/# user: {{ CURRENT_ID }}/user: \"$uid:$gid\"/g" $ROOT_DIR/docker-compose-vscode.yml
|
||||
fi
|
||||
Loading…
Reference in New Issue