|
6 | 6 | import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_FIELD_NAME; |
7 | 7 | import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_NAMESPACE_FIELD_NAME; |
8 | 8 | import static org.hypertrace.config.service.store.ConfigDocument.TENANT_ID_FIELD_NAME; |
9 | | -import static org.hypertrace.config.service.store.ConfigDocument.VERSION_FIELD_NAME; |
10 | 9 | import static org.hypertrace.core.documentstore.Filter.Op.OR; |
11 | 10 |
|
12 | 11 | import com.google.common.collect.Maps; |
@@ -78,7 +77,7 @@ public UpsertedConfig writeConfig( |
78 | 77 | UpsertConfigRequest request, |
79 | 78 | String lastUpdatedUserEmail) |
80 | 79 | throws IOException { |
81 | | - Optional<ConfigDocument> previousConfigDoc = getLatestVersionConfigDoc(configResourceContext); |
| 80 | + Optional<ConfigDocument> previousConfigDoc = getConfigDocument(configResourceContext); |
82 | 81 | Optional<ContextSpecificConfig> optionalPreviousConfig = |
83 | 82 | previousConfigDoc.flatMap(this::convertToContextSpecificConfig); |
84 | 83 |
|
@@ -198,8 +197,7 @@ public void deleteConfigs(java.util.Collection<ConfigResourceContext> configReso |
198 | 197 | @Override |
199 | 198 | public Optional<ContextSpecificConfig> getConfig(ConfigResourceContext configResourceContext) |
200 | 199 | throws IOException { |
201 | | - return getLatestVersionConfigDoc(configResourceContext) |
202 | | - .flatMap(this::convertToContextSpecificConfig); |
| 200 | + return getConfigDocument(configResourceContext).flatMap(this::convertToContextSpecificConfig); |
203 | 201 | } |
204 | 202 |
|
205 | 203 | @Override |
@@ -257,7 +255,6 @@ private Query buildQuery( |
257 | 255 | queryBuilder.setPagination( |
258 | 256 | Pagination.builder().offset(pagination.getOffset()).limit(pagination.getLimit()).build()); |
259 | 257 | } |
260 | | - queryBuilder.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC); |
261 | 258 | if (!sortByList.isEmpty()) { |
262 | 259 | sortByList.forEach( |
263 | 260 | sortBy -> |
@@ -313,13 +310,11 @@ public boolean healthCheck() { |
313 | 310 | return datastore.healthCheck(); |
314 | 311 | } |
315 | 312 |
|
316 | | - private Optional<ConfigDocument> getLatestVersionConfigDoc( |
317 | | - ConfigResourceContext configResourceContext) throws IOException { |
| 313 | + private Optional<ConfigDocument> getConfigDocument(ConfigResourceContext configResourceContext) |
| 314 | + throws IOException { |
318 | 315 | Query query = |
319 | 316 | Query.builder() |
320 | 317 | .setFilter(getConfigResourceContextFilterTypeExpression(configResourceContext)) |
321 | | - .addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC) |
322 | | - .setPagination(Pagination.builder().offset(0).limit(1).build()) |
323 | 318 | .build(); |
324 | 319 |
|
325 | 320 | try (CloseableIterator<Document> documentIterator = |
|
0 commit comments