Skip to content

Commit e2094f0

Browse files
authored
Merge pull request #2349 from josephschorr/column-el-on
Switch experimental column optimizations to be enabled by default
2 parents 7405633 + 813a189 commit e2094f0

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

internal/datastore/crdb/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const (
6060
defaultConnectRate = 100 * time.Millisecond
6161
defaultFilterMaximumIDCount = 100
6262
defaultWithIntegrity = false
63-
defaultColumnOptimizationOption = common.ColumnOptimizationOptionNone
63+
defaultColumnOptimizationOption = common.ColumnOptimizationOptionStaticValues
6464
defaultIncludeQueryParametersInTraces = false
6565
defaultExpirationDisabled = false
6666
defaultWatchDisabled = false

internal/datastore/mysql/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const (
2626
defaultGCEnabled = true
2727
defaultCredentialsProviderName = ""
2828
defaultFilterMaximumIDCount = 100
29-
defaultColumnOptimizationOption = common.ColumnOptimizationOptionNone
29+
defaultColumnOptimizationOption = common.ColumnOptimizationOptionStaticValues
3030
defaultExpirationDisabled = false
3131
defaultWatchDisabled = false
3232
// no follower delay by default, it should only be set if using read replicas

internal/datastore/postgres/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const (
7575
defaultCredentialsProviderName = ""
7676
defaultReadStrictMode = false
7777
defaultFilterMaximumIDCount = 100
78-
defaultColumnOptimizationOption = common.ColumnOptimizationOptionNone
78+
defaultColumnOptimizationOption = common.ColumnOptimizationOptionStaticValues
7979
defaultIncludeQueryParametersInTraces = false
8080
defaultExpirationDisabled = false
8181
defaultWatchDisabled = false

internal/datastore/spanner/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const (
8181
defaultDisableStats = false
8282
maxRevisionQuantization = 24 * time.Hour
8383
defaultFilterMaximumIDCount = 100
84-
defaultColumnOptimizationOption = common.ColumnOptimizationOptionNone
84+
defaultColumnOptimizationOption = common.ColumnOptimizationOptionStaticValues
8585
defaultExpirationDisabled = false
8686
defaultWatchDisabled = false
8787
)

pkg/cmd/datastore/datastore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func RegisterDatastoreFlagsWithPrefix(flagSet *pflag.FlagSet, prefix string, opt
308308
return fmt.Errorf("failed to mark flag as hidden: %w", err)
309309
}
310310

311-
flagSet.BoolVar(&opts.ExperimentalColumnOptimization, flagName("datastore-experimental-column-optimization"), false, "enable experimental column optimization")
311+
flagSet.BoolVar(&opts.ExperimentalColumnOptimization, flagName("datastore-experimental-column-optimization"), true, "enable experimental column optimization")
312312

313313
return nil
314314
}
@@ -359,7 +359,7 @@ func DefaultDatastoreConfig() *Config {
359359
RelationshipIntegrityCurrentKey: RelIntegrityKey{},
360360
RelationshipIntegrityExpiredKeys: []string{},
361361
AllowedMigrations: []string{},
362-
ExperimentalColumnOptimization: false,
362+
ExperimentalColumnOptimization: true,
363363
IncludeQueryParametersInTraces: false,
364364
EnableExperimentalRelationshipExpiration: false,
365365
}

0 commit comments

Comments
 (0)