|
8 | 8 | "quesma/quesma/config" |
9 | 9 | "quesma/util" |
10 | 10 | "sync" |
11 | | - "time" |
12 | 11 | ) |
13 | 12 |
|
14 | 13 | // TODO we should rethink naming and types used in this package |
@@ -38,10 +37,6 @@ type ( |
38 | 37 | fieldEncodings map[FieldEncodingKey]EncodedFieldName |
39 | 38 | fieldOriginsLock sync.RWMutex |
40 | 39 | fieldOrigins map[IndexName]map[FieldName]FieldSource |
41 | | - |
42 | | - cachedSchemas map[IndexName]Schema |
43 | | - cacheTTL time.Time |
44 | | - cacheMutex sync.Mutex |
45 | 40 | } |
46 | 41 | typeAdapter interface { |
47 | 42 | Convert(string) (QuesmaType, bool) |
@@ -80,14 +75,6 @@ func (s *schemaRegistry) getInternalToPublicFieldEncodings(tableName string) map |
80 | 75 | } |
81 | 76 |
|
82 | 77 | func (s *schemaRegistry) loadSchemas() (map[IndexName]Schema, error) { |
83 | | - |
84 | | - s.cacheMutex.Lock() |
85 | | - defer s.cacheMutex.Unlock() |
86 | | - |
87 | | - if s.cachedSchemas != nil && time.Now().Before(s.cacheTTL) { |
88 | | - return s.cachedSchemas, nil |
89 | | - } |
90 | | - |
91 | 78 | definitions := s.dataSourceTableProvider.TableDefinitions() |
92 | 79 | schemas := make(map[IndexName]Schema) |
93 | 80 |
|
@@ -119,9 +106,6 @@ func (s *schemaRegistry) loadSchemas() (map[IndexName]Schema, error) { |
119 | 106 | } |
120 | 107 | } |
121 | 108 |
|
122 | | - s.cachedSchemas = schemas |
123 | | - s.cacheTTL = time.Now().Add(5 * time.Second) |
124 | | - |
125 | 109 | return schemas, nil |
126 | 110 | } |
127 | 111 |
|
@@ -172,10 +156,6 @@ func (s *schemaRegistry) UpdateDynamicConfiguration(name IndexName, table Table) |
172 | 156 | } |
173 | 157 |
|
174 | 158 | func (s *schemaRegistry) UpdateFieldEncodings(encodings map[FieldEncodingKey]EncodedFieldName) { |
175 | | - s.cacheMutex.Lock() |
176 | | - defer s.cacheMutex.Unlock() |
177 | | - s.cachedSchemas = nil |
178 | | - |
179 | 159 | s.fieldEncodingsLock.Lock() |
180 | 160 | defer s.fieldEncodingsLock.Unlock() |
181 | 161 | for key, value := range encodings { |
|
0 commit comments