diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-11-29 11:08:36 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-11-29 16:12:02 +0100 |
commit | 2401c7f03fce7bf6a3b1528de2c02c5096149a0c (patch) | |
tree | cf913be5bb44f4b5d4add20418da902ebdf059f2 /client | |
parent | 7357f331d12532f3f039804c9a5c136bec604698 (diff) |
Extract list package
Diffstat (limited to 'client')
-rw-r--r-- | client/go/internal/admin/jvm/container.go | 3 | ||||
-rw-r--r-- | client/go/internal/admin/jvm/options.go | 3 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/runserver.go | 3 | ||||
-rw-r--r-- | client/go/internal/list/array_list.go (renamed from client/go/internal/util/array_list.go) | 3 | ||||
-rw-r--r-- | client/go/internal/list/array_list_test.go (renamed from client/go/internal/util/array_list_test.go) | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/client/go/internal/admin/jvm/container.go b/client/go/internal/admin/jvm/container.go index 086ca8dde25..4788eba76cb 100644 --- a/client/go/internal/admin/jvm/container.go +++ b/client/go/internal/admin/jvm/container.go @@ -10,6 +10,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/prog" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" + "github.com/vespa-engine/vespa/client/go/internal/list" "github.com/vespa-engine/vespa/client/go/internal/util" ) @@ -60,7 +61,7 @@ func readableEnv(env map[string]string) string { } func (cb *containerBase) Exec() { - argv := util.ArrayListOf(cb.JvmOptions().Args()) + argv := list.ArrayListOf(cb.JvmOptions().Args()) argv.Insert(0, "java") p := prog.NewSpec(argv) p.ConfigureNumaCtl() diff --git a/client/go/internal/admin/jvm/options.go b/client/go/internal/admin/jvm/options.go index a788fb0cca9..3a1a508114a 100644 --- a/client/go/internal/admin/jvm/options.go +++ b/client/go/internal/admin/jvm/options.go @@ -10,6 +10,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/defaults" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" + "github.com/vespa-engine/vespa/client/go/internal/list" "github.com/vespa-engine/vespa/client/go/internal/util" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -17,7 +18,7 @@ import ( type Options struct { container Container classPath []string - jvmArgs util.ArrayList[string] + jvmArgs list.ArrayList[string] mainClass string jarWithDeps string fixSpec util.FixSpec diff --git a/client/go/internal/admin/vespa-wrapper/configserver/runserver.go b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go index f5b5e0ac204..a3b656782db 100644 --- a/client/go/internal/admin/vespa-wrapper/configserver/runserver.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go @@ -9,6 +9,7 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/defaults" "github.com/vespa-engine/vespa/client/go/internal/admin/trace" "github.com/vespa-engine/vespa/client/go/internal/ioutil" + "github.com/vespa-engine/vespa/client/go/internal/list" "github.com/vespa-engine/vespa/client/go/internal/util" ) @@ -46,7 +47,7 @@ func (rs *RunServer) WouldRun() bool { } func (rs *RunServer) Exec(prog string) { - argv := util.ArrayList[string]{ + argv := list.ArrayList[string]{ PROG_NAME, "-s", rs.ServiceName, "-r", "30", diff --git a/client/go/internal/util/array_list.go b/client/go/internal/list/array_list.go index 0e768b5617f..07427074089 100644 --- a/client/go/internal/util/array_list.go +++ b/client/go/internal/list/array_list.go @@ -1,8 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Author: arnej -// generic utilities -package util +package list type ArrayList[E comparable] []E diff --git a/client/go/internal/util/array_list_test.go b/client/go/internal/list/array_list_test.go index d8a3fa88b5c..f31a94966c5 100644 --- a/client/go/internal/util/array_list_test.go +++ b/client/go/internal/list/array_list_test.go @@ -1,5 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package util + +package list import ( "testing" |