Skip to content

Commit

Permalink
Merge branch 'master' into caiyd_38666_support_int8_vector
Browse files Browse the repository at this point in the history
  • Loading branch information
cydrain authored Jan 6, 2025
2 parents c6e7278 + f0cddfd commit e411dfc
Show file tree
Hide file tree
Showing 294 changed files with 13,228 additions and 4,575 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -554,3 +554,7 @@ mmap-migration:
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
GO111MODULE=on $(GO) build -pgo=$(PGO_PATH)/default.pgo -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
-tags dynamic -o $(INSTALL_PATH)/mmap-migration $(MMAP_MIGRATION_PATH)/main.go 1>/dev/null

generate-parser:
@echo "Updating milvus expression parser"
@(cd $(PWD)/internal/parser/planparserv2 && env bash generate.sh)
56 changes: 27 additions & 29 deletions README.md

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,10 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
### All contributors

<br><!-- Do not remove start of hero-bot -->
<img src="https://img.shields.io/badge/all--contributors-423-orange"><br>
<img src="https://img.shields.io/badge/all--contributors-427-orange"><br>
<a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="30px" /></a>
<a href="https://github.com/ABNER-1"><img src="https://avatars.githubusercontent.com/u/24547351?v=4" width="30px" /></a>
<a href="https://github.com/Abhijnan-Bajpai"><img src="https://avatars.githubusercontent.com/u/57059194?v=4" width="30px" /></a>
<a href="https://github.com/Accagain2014"><img src="https://avatars.githubusercontent.com/u/9635216?v=4" width="30px" /></a>
<a href="https://github.com/Ahmetyasin"><img src="https://avatars.githubusercontent.com/u/34247619?v=4" width="30px" /></a>
<a href="https://github.com/Ald392"><img src="https://avatars.githubusercontent.com/u/166891594?v=4" width="30px" /></a>
Expand Down Expand Up @@ -272,6 +273,7 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
<a href="https://github.com/SimFG"><img src="https://avatars.githubusercontent.com/u/21985684?v=4" width="30px" /></a>
<a href="https://github.com/SkyYang"><img src="https://avatars.githubusercontent.com/u/4702509?v=4" width="30px" /></a>
<a href="https://github.com/SnowyOwl-KHY"><img src="https://avatars.githubusercontent.com/u/10348819?v=4" width="30px" /></a>
<a href="https://github.com/SpadeA-Tang"><img src="https://avatars.githubusercontent.com/u/71589810?v=4" width="30px" /></a>
<a href="https://github.com/Spnetic-5"><img src="https://avatars.githubusercontent.com/u/66636289?v=4" width="30px" /></a>
<a href="https://github.com/Sunt-ing"><img src="https://avatars.githubusercontent.com/u/43040147?v=4" width="30px" /></a>
<a href="https://github.com/SwaggySong"><img src="https://avatars.githubusercontent.com/u/36157116?v=4" width="30px" /></a>
Expand Down Expand Up @@ -342,6 +344,7 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
<a href="https://github.com/codingjaguar"><img src="https://avatars.githubusercontent.com/u/7064054?v=4" width="30px" /></a>
<a href="https://github.com/congqixia"><img src="https://avatars.githubusercontent.com/u/84113973?v=4" width="30px" /></a>
<a href="https://github.com/corest"><img src="https://avatars.githubusercontent.com/u/1071648?v=4" width="30px" /></a>
<a href="https://github.com/counter2015"><img src="https://avatars.githubusercontent.com/u/13608862?v=4" width="30px" /></a>
<a href="https://github.com/cqy123456"><img src="https://avatars.githubusercontent.com/u/39671710?v=4" width="30px" /></a>
<a href="https://github.com/cuishuang"><img src="https://avatars.githubusercontent.com/u/15921519?v=4" width="30px" /></a>
<a href="https://github.com/cxie"><img src="https://avatars.githubusercontent.com/u/653101?v=4" width="30px" /></a>
Expand Down Expand Up @@ -380,6 +383,7 @@ Milvus [训练营](https://github.com/milvus-io/bootcamp)能够帮助你了解
<a href="https://github.com/fishpenguin"><img src="https://avatars.githubusercontent.com/u/49153041?v=4" width="30px" /></a>
<a href="https://github.com/forsaken628"><img src="https://avatars.githubusercontent.com/u/18322364?v=4" width="30px" /></a>
<a href="https://github.com/foxspy"><img src="https://avatars.githubusercontent.com/u/11503321?v=4" width="30px" /></a>
<a href="https://github.com/franciscojavierarceo"><img src="https://avatars.githubusercontent.com/u/4163062?v=4" width="30px" /></a>
<a href="https://github.com/freestsoul"><img src="https://avatars.githubusercontent.com/u/3909908?v=4" width="30px" /></a>
<a href="https://github.com/gcmutator"><img src="https://avatars.githubusercontent.com/u/134900551?v=4" width="30px" /></a>
<a href="https://github.com/ggaaooppeenngg"><img src="https://avatars.githubusercontent.com/u/4769989?v=4" width="30px" /></a>
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/Nightly2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pipeline {
axes {
axis {
name 'milvus_deployment_option'
values 'standalone', 'distributed-pulsar', 'distributed-kafka', 'standalone-authentication', 'standalone-one-pod', 'distributed-streaming-service'
values 'standalone', 'distributed-pulsar', 'distributed-kafka', 'standalone-authentication'
}
}
stages {
Expand Down
37 changes: 10 additions & 27 deletions ci/jenkins/PR.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pipeline {
axes {
axis {
name 'milvus_deployment_option'
values 'standalone', 'distributed', 'standalone-kafka-mmap', 'distributed-streaming-service'
values 'standalone', 'distributed', 'standalone-kafka-mmap'
}
}
stages {
Expand All @@ -100,32 +100,15 @@ pipeline {
def helm_release_name = get_helm_release_name milvus_deployment_option
// pvc name would be <pod-name>-volume-0, used for pytest result archiving
def pvc = env.JENKINS_AGENT_NAME + '-volume-0'

if (milvus_deployment_option == 'distributed-streaming-service') {
try {
tekton.pytest helm_release_name: helm_release_name,
pvc: pvc,
milvus_helm_version: milvus_helm_chart_version,
ciMode: 'e2e',
milvus_image_tag: milvus_image_tag,
pytest_image: pytest_image,
helm_image: helm_image,
milvus_deployment_option: milvus_deployment_option,
verbose: 'false'
} catch (Exception e) {
println e
}
} else {
tekton.pytest helm_release_name: helm_release_name,
pvc: pvc,
milvus_helm_version: milvus_helm_chart_version,
ciMode: 'e2e',
milvus_image_tag: milvus_image_tag,
pytest_image: pytest_image,
helm_image: helm_image,
milvus_deployment_option: milvus_deployment_option,
verbose: 'false'
}
tekton.pytest helm_release_name: helm_release_name,
pvc: pvc,
milvus_helm_version: milvus_helm_chart_version,
ciMode: 'e2e',
milvus_image_tag: milvus_image_tag,
pytest_image: pytest_image,
helm_image: helm_image,
milvus_deployment_option: milvus_deployment_option,
verbose: 'false'
}
}
}
Expand Down
22 changes: 22 additions & 0 deletions client/entity/database.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package entity

type Database struct {
Name string
Properties map[string]string
}
28 changes: 28 additions & 0 deletions client/entity/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,31 @@ type GrantItem struct {
Grantor string
Privilege string
}

type UserInfo struct {
UserDescription
Password string
}

// UserDescription is the model for RBAC user description object.
type UserDescription struct {
Name string
Roles []string
}

type RBACMeta struct {
Users []*UserInfo
Roles []*Role
RoleGrants []*RoleGrants
PrivilegeGroups []*PrivilegeGroup
}

// RoleGrants is the model for RBAC role description object.
type RoleGrants struct {
Object string
ObjectName string
RoleName string
GrantorName string
PrivilegeName string
DbName string
}
54 changes: 54 additions & 0 deletions client/entity/resource_group.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package entity

type ResourceGroup struct {
Name string
Capacity int32
NumAvailableNode int32
NumLoadedReplica map[string]int32
NumOutgoingNode map[string]int32
NumIncomingNode map[string]int32
Config *ResourceGroupConfig
Nodes []NodeInfo
}

type NodeInfo struct {
NodeID int64
Address string
HostName string
}

type ResourceGroupLimit struct {
NodeNum int32
}

type ResourceGroupTransfer struct {
ResourceGroup string
}

type ResourceGroupNodeFilter struct {
NodeLabels map[string]string
}

type ResourceGroupConfig struct {
Requests ResourceGroupLimit
Limits ResourceGroupLimit
TransferFrom []*ResourceGroupTransfer
TransferTo []*ResourceGroupTransfer
NodeFilter ResourceGroupNodeFilter
}
34 changes: 34 additions & 0 deletions client/entity/segment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Licensed to the LF AI & Data foundation under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package entity

import "github.com/milvus-io/milvus-proto/go-api/v2/commonpb"

// Segment represent segment in milvus
type Segment struct {
ID int64
CollectionID int64
ParititionID int64

NumRows int64
State commonpb.SegmentState
}

// Flushed indicates segment is flushed
func (s Segment) Flushed() bool {
return s.State == commonpb.SegmentState_Flushed
}
2 changes: 1 addition & 1 deletion client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ require (
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions client/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down
Loading

0 comments on commit e411dfc

Please sign in to comment.