Skip to content
This repository was archived by the owner on Nov 7, 2025. It is now read-only.

Commit 686e2f5

Browse files
authored
Revert UseCommonTable global flag (#960)
I have to revert it temporarily as integration tests failing https://github.com/QuesmaOrg/quesma/actions/runs/11719484324/job/32643244756
1 parent 67bbaed commit 686e2f5

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

quesma/quesma/config/config_v2.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ type QuesmaNewConfiguration struct {
4848
Processors []Processor `koanf:"processors"`
4949
Pipelines []Pipeline `koanf:"pipelines"`
5050
DisableTelemetry bool `koanf:"disableTelemetry"`
51-
UseCommonTable bool `koanf:"useCommonTable"` // global setting
5251
}
5352

5453
type LoggingConfiguration struct {
@@ -528,8 +527,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
528527
conf.Logging.RemoteLogDrainUrl = nil
529528
}
530529

531-
conf.CreateCommonTable = c.UseCommonTable
532-
533530
conf.InstallationId = c.InstallationId
534531
conf.LicenseKey = c.LicenseKey
535532

@@ -568,10 +565,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
568565
if val, exists := target.properties["useCommonTable"]; exists {
569566
conf.CreateCommonTable = val == "true"
570567
conf.UseCommonTableForWildcard = val == "true"
571-
} else {
572-
// inherit global setting
573-
conf.CreateCommonTable = c.UseCommonTable
574-
conf.UseCommonTableForWildcard = c.UseCommonTable
575568
}
576569
}
577570

@@ -607,9 +600,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
607600
}
608601
if val, exists := target.properties["useCommonTable"]; exists {
609602
processedConfig.UseCommonTable = val == "true"
610-
} else {
611-
// inherit global setting
612-
processedConfig.UseCommonTable = c.UseCommonTable
613603
}
614604
if val, exists := target.properties["tableName"]; exists {
615605
processedConfig.Override = val.(string)
@@ -670,10 +660,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
670660
if val, exists := target.properties["useCommonTable"]; exists {
671661
conf.CreateCommonTable = val == "true"
672662
conf.UseCommonTableForWildcard = val == "true"
673-
} else {
674-
// inherit global setting
675-
conf.CreateCommonTable = c.UseCommonTable
676-
conf.UseCommonTableForWildcard = c.UseCommonTable
677663
}
678664
}
679665
if defaultConfig.SchemaOverrides != nil {
@@ -700,10 +686,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
700686
if val, exists := target.properties["useCommonTable"]; exists {
701687
conf.CreateCommonTable = val == "true"
702688
conf.UseCommonTableForWildcard = val == "true"
703-
} else {
704-
// inherit global setting
705-
conf.CreateCommonTable = c.UseCommonTable
706-
conf.UseCommonTableForWildcard = c.UseCommonTable
707689
}
708690
}
709691
if ingestProcessorDefaultIndexConfig.SchemaOverrides != nil {
@@ -748,9 +730,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
748730
}
749731
if val, exists := target.properties["useCommonTable"]; exists {
750732
processedConfig.UseCommonTable = val == true
751-
} else {
752-
// inherit global setting
753-
processedConfig.UseCommonTable = c.UseCommonTable
754733
}
755734
if val, exists := target.properties["tableName"]; exists {
756735
processedConfig.Override = val.(string)
@@ -800,9 +779,6 @@ func (c *QuesmaNewConfiguration) TranslateToLegacyConfig() QuesmaConfiguration {
800779
}
801780
if val, exists := target.properties["useCommonTable"]; exists {
802781
processedConfig.UseCommonTable = val == true
803-
} else {
804-
// inherit global setting
805-
processedConfig.UseCommonTable = c.UseCommonTable
806782
}
807783
if val, exists := target.properties["tableName"]; exists {
808784
processedConfig.Override = val.(string)

quesma/quesma/config/config_v2_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ func TestTargetNewVariant(t *testing.T) {
269269
}
270270

271271
func TestUseCommonTableGlobalProperty(t *testing.T) {
272+
t.Skip()
272273
os.Setenv(configFileLocationEnvVar, "./test_configs/use_common_table_global_property.yaml")
273274
cfg := LoadV2Config()
274275
if err := cfg.Validate(); err != nil {

quesma/quesma/config/test_configs/has_common_table.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ pipelines:
6767
- name: my-elasticsearch-proxy-write
6868
frontendConnectors: [ elastic-ingest ]
6969
processors: [ IP ]
70-
backendConnectors: [ E, C ]
70+
backendConnectors: [ E, C ]

0 commit comments

Comments
 (0)