Add String sorted topologicalSort (#2696) (#2698)

Co-authored-by: Yusuke Kato <[email protected]>

dockers/agent/core/agent/Dockerfile

@@ -93,4 +93,4 @@ LABEL maintainer="vdaas.org vald team <[email protected]>"
 COPY --from=builder /usr/bin/agent /usr/bin/agent
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/agent"]
+ENTRYPOINT ["/usr/bin/agent"]

dockers/agent/core/faiss/Dockerfile

@@ -95,4 +95,4 @@ COPY --from=builder /usr/bin/faiss /usr/bin/faiss
 COPY cmd/agent/core/faiss/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/faiss"]
+ENTRYPOINT ["/usr/bin/faiss"]

dockers/agent/core/ngt/Dockerfile

@@ -94,4 +94,4 @@ COPY --from=builder /usr/bin/ngt /usr/bin/ngt
 COPY cmd/agent/core/ngt/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/ngt"]
+ENTRYPOINT ["/usr/bin/ngt"]

dockers/agent/sidecar/Dockerfile

@@ -84,4 +84,4 @@ LABEL maintainer="vdaas.org vald team <[email protected]>"
 COPY --from=builder /usr/bin/sidecar /usr/bin/sidecar
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/sidecar"]
+ENTRYPOINT ["/usr/bin/sidecar"]

dockers/binfmt/Dockerfile

@@ -16,4 +16,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM tonistiigi/binfmt:master AS builder
+FROM tonistiigi/binfmt:master AS builder

dockers/buildbase/Dockerfile

@@ -16,4 +16,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM ubuntu:devel AS builder
+FROM ubuntu:devel AS builder

dockers/buildkit/Dockerfile

@@ -16,4 +16,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM moby/buildkit:master AS builder
+FROM moby/buildkit:master AS builder

dockers/buildkit/syft/scanner/Dockerfile

@@ -16,4 +16,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM docker/buildkit-syft-scanner:edge AS scanner
+FROM docker/buildkit-syft-scanner:edge AS scanner

dockers/ci/base/Dockerfile

@@ -127,4 +127,4 @@ RUN --mount=type=bind,target=.,rw \
     && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*
 # skipcq: DOK-DL3002
 USER root:root
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash"]

dockers/dev/Dockerfile

@@ -145,4 +145,4 @@ RUN --mount=type=bind,target=.,rw \
     && make faiss/install \
     && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*
 # skipcq: DOK-DL3002
-USER root:root
+USER root:root

dockers/discoverer/k8s/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/discoverer /usr/bin/discoverer
 COPY cmd/discoverer/k8s/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/discoverer"]
+ENTRYPOINT ["/usr/bin/discoverer"]

dockers/gateway/filter/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/filter /usr/bin/filter
 COPY cmd/gateway/filter/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/filter"]
+ENTRYPOINT ["/usr/bin/filter"]

dockers/gateway/lb/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/lb /usr/bin/lb
 COPY cmd/gateway/lb/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/lb"]
+ENTRYPOINT ["/usr/bin/lb"]

dockers/gateway/mirror/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/mirror /usr/bin/mirror
 COPY cmd/gateway/mirror/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/mirror"]
+ENTRYPOINT ["/usr/bin/mirror"]

dockers/index/job/correction/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/index-correction /usr/bin/index-correction
 COPY cmd/index/job/correction/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-correction"]
+ENTRYPOINT ["/usr/bin/index-correction"]

dockers/index/job/creation/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/index-creation /usr/bin/index-creation
 COPY cmd/index/job/creation/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-creation"]
+ENTRYPOINT ["/usr/bin/index-creation"]

dockers/index/job/readreplica/rotate/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/readreplica-rotate /usr/bin/readreplica-rotate
 COPY cmd/index/job/readreplica/rotate/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/readreplica-rotate"]
+ENTRYPOINT ["/usr/bin/readreplica-rotate"]

dockers/index/job/save/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/index-save /usr/bin/index-save
 COPY cmd/index/job/save/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-save"]
+ENTRYPOINT ["/usr/bin/index-save"]

dockers/index/operator/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/index-operator /usr/bin/index-operator
 COPY cmd/index/operator/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-operator"]
+ENTRYPOINT ["/usr/bin/index-operator"]

dockers/manager/index/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/index /usr/bin/index
 COPY cmd/manager/index/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index"]
+ENTRYPOINT ["/usr/bin/index"]

dockers/operator/helm/Dockerfile

@@ -106,4 +106,4 @@ COPY --from=builder /opt/helm/charts/vald /opt/helm/charts/vald
 COPY --from=builder /opt/helm/charts/vald-helm-operator /opt/helm/charts/vald-helm-operator
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/helm-operator", "run", "--watches-file=/opt/helm/watches.yaml"]
+ENTRYPOINT ["/usr/bin/helm-operator", "run", "--watches-file=/opt/helm/watches.yaml"]

dockers/tools/benchmark/job/Dockerfile

@@ -93,4 +93,4 @@ COPY --from=builder /usr/bin/job /usr/bin/job
 COPY cmd/tools/benchmark/job/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/job"]
+ENTRYPOINT ["/usr/bin/job"]

dockers/tools/benchmark/operator/Dockerfile

@@ -85,4 +85,4 @@ COPY --from=builder /usr/bin/operator /usr/bin/operator
 COPY cmd/tools/benchmark/operator/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/operator"]
+ENTRYPOINT ["/usr/bin/operator"]

dockers/tools/cli/loadtest/Dockerfile

@@ -93,4 +93,4 @@ COPY --from=builder /usr/bin/loadtest /usr/bin/loadtest
 COPY cmd/tools/cli/loadtest/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/loadtest"]
+ENTRYPOINT ["/usr/bin/loadtest"]

hack/docker/gen/main.go

@@ -23,7 +23,6 @@ import (
 	"io/fs"
 	"os"
 	"os/signal"
-	"regexp"
 	"slices"
 	"syscall"
 	"text/template"
@@ -437,56 +436,87 @@ func appendM[K comparable](maps ...map[K]string) map[K]string {
 	return result
 }
 
-var re = regexp.MustCompile(`\$\{?(\w+)\}?`)
-
+// extractVariables efficiently extracts variables from strings
 func extractVariables(value string) []string {
-	matches := re.FindAllStringSubmatch(value, -1)
-	vars := make([]string, 0, len(matches))
-	for _, match := range matches {
-		vars = append(vars, match[1])
+	var vars []string
+	start := -1
+	for i := 0; i < len(value); i++ {
+		if value[i] == '$' && i+1 < len(value) && value[i+1] == '{' {
+			start = i + 2
+		} else if start != -1 && value[i] == '}' {
+			vars = append(vars, value[start:i])
+			start = -1
+		} else if value[i] == '$' && start == -1 {
+			start = i + 1
+			for start < len(value) && (('a' <= value[start] && value[start] <= 'z') || ('A' <= value[start] && value[start] <= 'Z') || ('0' <= value[start] && value[start] <= '9') || value[start] == '_') {
+				start++
+			}
+			vars = append(vars, value[i+1:start])
+			i = start - 1
+			start = -1
+		}
 	}
 	return vars
 }
 
+// topologicalSort sorts the elements topologically and ensures that equal-level nodes are sorted by name
 func topologicalSort(envMap map[string]string) []string {
-	// Graph structures
-	inDegree := make(map[string]int)
-	graph := make(map[string][]string)
+	inDegree := make(map[string]int)         // Tracks the in-degree of each node
+	graph := make(map[string][]string)       // Tracks the edges between nodes
+	result := make([]string, 0, len(envMap)) // Result slice pre-allocated for efficiency
 
-	// Initialize the graph
+	gl := 0
+	// Initialize the graph structure and in-degrees
 	for key, value := range envMap {
 		vars := extractVariables(value)
 		for _, refKey := range vars {
-			if refKey != key {
+			if refKey != key { // Prevent self-dependency
 				graph[refKey] = append(graph[refKey], key)
+				if len(graph[refKey]) > gl {
+					gl = len(graph[refKey])
+				}
 				inDegree[key]++
 			}
 		}
 	}
 
+	// Initialize the queue with nodes having in-degree 0 (no dependencies)
 	queue := make([]string, 0, len(envMap)-len(graph))
 	for key := range envMap {
 		if inDegree[key] == 0 {
 			queue = append(queue, key)
 		}
 	}
 
+	// Sort the initial queue to maintain lexicographical order for nodes with no dependencies
 	slices.Sort(queue)
 
-	// Topological sort
-	result := make([]string, 0, len(envMap))
+	// Preallocate a reusable slice for collecting new nodes
+	newNodes := make([]string, 0, gl)
+	// Topological sort process
 	for len(queue) > 0 {
 		node := queue[0]
 		queue = queue[1:]
+
+		// Append the result as `node=value`
 		if value, exists := envMap[node]; exists {
 			result = append(result, node+"="+value)
 		}
+
+		// Process all neighbors and decrement their in-degrees
 		for _, neighbor := range graph[node] {
 			inDegree[neighbor]--
 			if inDegree[neighbor] == 0 {
-				queue = append(queue, neighbor)
+				newNodes = append(newNodes, neighbor)
 			}
 		}
+
+		// If new nodes were found, sort them and append to the queue
+		if len(newNodes) > 0 {
+			slices.Sort(newNodes) // Sort new nodes only once
+			queue = append(queue, newNodes...)
+			newNodes = newNodes[:0] // Reuse the slice by resetting it
+		}
 	}
 
 	return result