Skip to content

Commit 96cb43d

Browse files
committed
Adjust Trino only setting
1 parent 8d6f39e commit 96cb43d

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

clusters/params.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"native_buffer_mem_cap_gb": 32,
1212
"native_query_mem_percent_of_sys_mem": 0.95,
1313
"join_max_bcast_size_percent_of_container_mem": 0.01,
14-
"memory_push_back_start_below_limit_gb": 5
14+
"memory_push_back_start_below_limit_gb": 5,
15+
"trino": "${PROVISION_TRINO}"
1516
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
connector.name=tpcds
2+
{{ if not (eq .GeneratorParameters.Trino "true") -}}
23
tpcds.use-varchar-type=true
4+
{{ end -}}

cmd/genconfig/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io/fs"
77
"os"
88
"path/filepath"
9-
cluster_configs "pbench/clusters"
9+
"pbench/clusters"
1010
"pbench/log"
1111

1212
"github.com/spf13/cobra"
@@ -38,7 +38,7 @@ func Run(_ *cobra.Command, args []string) {
3838
}
3939
}
4040
if TemplatePath == "" {
41-
TemplateFS = cluster_configs.BuiltinTemplate
41+
TemplateFS = clusters.BuiltinTemplate
4242
TemplatePath = "templates"
4343
} else {
4444
TemplateFS = os.DirFS(TemplatePath)
@@ -77,5 +77,5 @@ func Run(_ *cobra.Command, args []string) {
7777
}
7878

7979
func PrintDefaultParams(_ *cobra.Command, _ []string) {
80-
fmt.Print(string(cluster_configs.BuiltinGeneratorParametersBytes))
80+
fmt.Print(string(clusters.BuiltinGeneratorParametersBytes))
8181
}

cmd/genconfig/params.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package genconfig
22

33
import (
4-
_ "embed"
54
"encoding/json"
6-
cluster_configs "pbench/clusters"
5+
"pbench/clusters"
76
)
87

98
type GeneratorParameters struct {
@@ -21,12 +20,13 @@ type GeneratorParameters struct {
2120
NativeQueryMemPercentOfSysMem float64 `json:"native_query_mem_percent_of_sys_mem"`
2221
JoinMaxBcastSizePercentOfContainerMem float64 `json:"join_max_bcast_size_percent_of_container_mem"`
2322
MemoryPushBackStartBelowLimitGb uint `json:"memory_push_back_start_below_limit_gb"`
23+
Trino string `json:"trino,omitempty"`
2424
}
2525

2626
var DefaultGeneratorParameters = &GeneratorParameters{}
2727

2828
func init() {
29-
if err := json.Unmarshal(cluster_configs.BuiltinGeneratorParametersBytes, DefaultGeneratorParameters); err != nil {
29+
if err := json.Unmarshal(clusters.BuiltinGeneratorParametersBytes, DefaultGeneratorParameters); err != nil {
3030
panic(err)
3131
}
3232
}

0 commit comments

Comments
 (0)