Skip to content

Commit 32e4ab4

Browse files
Removed sorting on configVersion (#291)
* Removed sorting on configVersion * Removed version sorting in getConfig also
1 parent f8e72f5 commit 32e4ab4

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

config-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_FIELD_NAME;
77
import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_NAMESPACE_FIELD_NAME;
88
import static org.hypertrace.config.service.store.ConfigDocument.TENANT_ID_FIELD_NAME;
9-
import static org.hypertrace.config.service.store.ConfigDocument.VERSION_FIELD_NAME;
109
import static org.hypertrace.core.documentstore.Filter.Op.OR;
1110

1211
import com.google.common.collect.Maps;
@@ -78,7 +77,7 @@ public UpsertedConfig writeConfig(
7877
UpsertConfigRequest request,
7978
String lastUpdatedUserEmail)
8079
throws IOException {
81-
Optional<ConfigDocument> previousConfigDoc = getLatestVersionConfigDoc(configResourceContext);
80+
Optional<ConfigDocument> previousConfigDoc = getConfigDocument(configResourceContext);
8281
Optional<ContextSpecificConfig> optionalPreviousConfig =
8382
previousConfigDoc.flatMap(this::convertToContextSpecificConfig);
8483

@@ -198,8 +197,7 @@ public void deleteConfigs(java.util.Collection<ConfigResourceContext> configReso
198197
@Override
199198
public Optional<ContextSpecificConfig> getConfig(ConfigResourceContext configResourceContext)
200199
throws IOException {
201-
return getLatestVersionConfigDoc(configResourceContext)
202-
.flatMap(this::convertToContextSpecificConfig);
200+
return getConfigDocument(configResourceContext).flatMap(this::convertToContextSpecificConfig);
203201
}
204202

205203
@Override
@@ -257,7 +255,6 @@ private Query buildQuery(
257255
queryBuilder.setPagination(
258256
Pagination.builder().offset(pagination.getOffset()).limit(pagination.getLimit()).build());
259257
}
260-
queryBuilder.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC);
261258
if (!sortByList.isEmpty()) {
262259
sortByList.forEach(
263260
sortBy ->
@@ -313,13 +310,11 @@ public boolean healthCheck() {
313310
return datastore.healthCheck();
314311
}
315312

316-
private Optional<ConfigDocument> getLatestVersionConfigDoc(
317-
ConfigResourceContext configResourceContext) throws IOException {
313+
private Optional<ConfigDocument> getConfigDocument(ConfigResourceContext configResourceContext)
314+
throws IOException {
318315
Query query =
319316
Query.builder()
320317
.setFilter(getConfigResourceContextFilterTypeExpression(configResourceContext))
321-
.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC)
322-
.setPagination(Pagination.builder().offset(0).limit(1).build())
323318
.build();
324319

325320
try (CloseableIterator<Document> documentIterator =

config-service-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.grpc.StatusRuntimeException;
2626
import java.io.IOException;
2727
import java.time.Clock;
28-
import java.util.Arrays;
2928
import java.util.Collections;
3029
import java.util.Iterator;
3130
import java.util.List;
@@ -376,10 +375,7 @@ void writeAllConfigs() throws IOException {
376375
@Test
377376
void buildQuery_withDefaultPagination() throws Exception {
378377
List<SortingSpec> expectedSorts =
379-
Arrays.asList(
380-
SortingSpec.of(
381-
IdentifierExpression.of("configVersion"),
382-
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
378+
List.of(
383379
SortingSpec.of(
384380
IdentifierExpression.of("creationTimestamp"),
385381
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));
@@ -425,10 +421,7 @@ void buildQuery_withCustomSorting() throws IOException {
425421
.build();
426422

427423
List<SortingSpec> expectedSorts =
428-
Arrays.asList(
429-
SortingSpec.of(
430-
IdentifierExpression.of("configVersion"),
431-
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
424+
List.of(
432425
SortingSpec.of(
433426
IdentifierExpression.of("config.test.path"),
434427
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));

0 commit comments

Comments
 (0)