rename

silvermoon-h · Jun 28, 2023 · 97f0bb5 · 97f0bb5
1 parent cf106ca
commit 97f0bb5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/aop/babysitter/babysitter.go b/aop/babysitter/babysitter.go
@@ -29,7 +29,7 @@ import (
 	"greatestworks/aop/proxy"
 	"greatestworks/aop/retry"
 	"greatestworks/aop/status"
-	"greatestworks/aop/versioned"
+	"greatestworks/aop/versioned_map"
 )
 
 const (
@@ -71,8 +71,8 @@ type Babysitter struct {
 
 	mu           sync.RWMutex
 	managed      map[string][]*envelope.Envelope // replica envelopes, by group
-	appState     *versioned.Map[*AppVersionState]
-	routingState *versioned.Map[*protos.RoutingInfo]
+	appState     *versioned_map.Map[*AppVersionState]
+	routingState *versioned_map.Map[*protos.RoutingInfo]
 	proxies      map[string]*proxyInfo // proxies, by listener name
 }
 
@@ -113,8 +113,8 @@ func NewBabysitter(ctx context.Context, dep *protos.Deployment, logSaver func(*p
 		opts:           envelope.Options{Restart: envelope.Never, Retry: retry.DefaultOptions},
 		dep:            dep,
 		managed:        map[string][]*envelope.Envelope{},
-		appState:       versioned.NewMap[*AppVersionState](),
-		routingState:   versioned.NewMap[*protos.RoutingInfo](),
+		appState:       versioned_map.NewMap[*AppVersionState](),
+		routingState:   versioned_map.NewMap[*protos.RoutingInfo](),
 		proxies:        map[string]*proxyInfo{},
 	}
 	go b.statsProcessor.CollectMetrics(b.ctx, b.readMetrics)

diff --git a/aop/net/call/resolver.go b/aop/net/call/resolver.go
@@ -61,7 +61,7 @@ type Resolver interface {
 	//         // latest set of endpoints and its version.
 	//         endpoints, version, err := resolver.Resolve(ctx, nil)
 	//
-	//         // Perform a versioned Resolve that either (1) blocks until a set
+	//         // Perform a versioned_map Resolve that either (1) blocks until a set
 	//         // of endpoints exists with a version newer than `version`, or
 	//         // (2) returns `version`, indicating that the Resolve should be
 	//         // called again after an appropriate delay.

diff --git a/aop/tool/ssh/impl/manager.go b/aop/tool/ssh/impl/manager.go
@@ -48,7 +48,7 @@ import (
 	"greatestworks/aop/retry"
 	"greatestworks/aop/status"
 	"greatestworks/aop/traceio"
-	"greatestworks/aop/versioned"
+	"greatestworks/aop/versioned_map"
 )
 
 const (
@@ -109,8 +109,8 @@ type manager struct {
 
 	mu           sync.Mutex
 	started      map[string]bool //  colocation groups started, by group name
-	appState     *versioned.Map[*AppVersionState]
-	routingState *versioned.Map[*protos.RoutingInfo]
+	appState     *versioned_map.Map[*AppVersionState]
+	routingState *versioned_map.Map[*protos.RoutingInfo]
 	proxies      map[string]*proxyInfo                         // proxies, by listener name
 	metrics      map[groupReplicaInfo][]*protos.MetricSnapshot // latest metrics, by group name and replica id
 }
@@ -168,8 +168,8 @@ func RunManager(ctx context.Context, dep *protos.Deployment, locations []string,
 		traceSaver:     traceSaver,
 		statsProcessor: imetrics.NewStatsProcessor(),
 		started:        map[string]bool{},
-		appState:       versioned.NewMap[*AppVersionState](),
-		routingState:   versioned.NewMap[*protos.RoutingInfo](),
+		appState:       versioned_map.NewMap[*AppVersionState](),
+		routingState:   versioned_map.NewMap[*protos.RoutingInfo](),
 		proxies:        map[string]*proxyInfo{},
 		metrics:        map[groupReplicaInfo][]*protos.MetricSnapshot{},
 	}

diff --git a/aop/versioned_map/map.go b/aop/versioned_map/map.go
@@ -1,4 +1,4 @@
-package versioned
+package versioned_map
 
 import (
 	"context"
@@ -17,7 +17,7 @@ type versioned[T proto.Message] struct {
 	version string
 }
 
-// Map is a simple, versioned, map.
+// Map is a simple, versioned_map, map.
 type Map[T proto.Message] struct {
 	mu     sync.Mutex
 	global int