Skip to content

Removed sorting on configVersion #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 24, 2025
Merged

Removed sorting on configVersion #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b0626
Removed sorting on configVersion
pavan-traceable Apr 24, 2025
9dbf133
Removed version sorting in getConfig also
pavan-traceable Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions ...g-service-impl/src/main/java/org/hypertrace/config/service/store/DocumentConfigStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_FIELD_NAME;
import static org.hypertrace.config.service.store.ConfigDocument.RESOURCE_NAMESPACE_FIELD_NAME;
import static org.hypertrace.config.service.store.ConfigDocument.TENANT_ID_FIELD_NAME;
import static org.hypertrace.config.service.store.ConfigDocument.VERSION_FIELD_NAME;
import static org.hypertrace.core.documentstore.Filter.Op.OR;

import com.google.common.collect.Maps;
Expand Down Expand Up @@ -78,7 +77,7 @@ public UpsertedConfig writeConfig(
UpsertConfigRequest request,
String lastUpdatedUserEmail)
throws IOException {
Optional<ConfigDocument> previousConfigDoc = getLatestVersionConfigDoc(configResourceContext);
Optional<ConfigDocument> previousConfigDoc = getConfigDocument(configResourceContext);
Optional<ContextSpecificConfig> optionalPreviousConfig =
previousConfigDoc.flatMap(this::convertToContextSpecificConfig);

Expand Down Expand Up @@ -198,8 +197,7 @@ public void deleteConfigs(java.util.Collection<ConfigResourceContext> configReso
@Override
public Optional<ContextSpecificConfig> getConfig(ConfigResourceContext configResourceContext)
throws IOException {
return getLatestVersionConfigDoc(configResourceContext)
.flatMap(this::convertToContextSpecificConfig);
return getConfigDocument(configResourceContext).flatMap(this::convertToContextSpecificConfig);
}

@Override
Expand Down Expand Up @@ -257,7 +255,6 @@ private Query buildQuery(
queryBuilder.setPagination(
Pagination.builder().offset(pagination.getOffset()).limit(pagination.getLimit()).build());
}
queryBuilder.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC);
if (!sortByList.isEmpty()) {
sortByList.forEach(
sortBy ->
Expand Down Expand Up @@ -313,13 +310,11 @@ public boolean healthCheck() {
return datastore.healthCheck();
}

private Optional<ConfigDocument> getLatestVersionConfigDoc(
ConfigResourceContext configResourceContext) throws IOException {
private Optional<ConfigDocument> getConfigDocument(ConfigResourceContext configResourceContext)
throws IOException {
Query query =
Query.builder()
.setFilter(getConfigResourceContextFilterTypeExpression(configResourceContext))
.addSort(IdentifierExpression.of(VERSION_FIELD_NAME), SortOrder.DESC)
.setPagination(Pagination.builder().offset(0).limit(1).build())
.build();

try (CloseableIterator<Document> documentIterator =
Expand Down
11 changes: 2 additions & 9 deletions ...rvice-impl/src/test/java/org/hypertrace/config/service/store/DocumentConfigStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.time.Clock;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
Expand Down Expand Up @@ -376,10 +375,7 @@ void writeAllConfigs() throws IOException {
@Test
void buildQuery_withDefaultPagination() throws Exception {
List<SortingSpec> expectedSorts =
Arrays.asList(
SortingSpec.of(
IdentifierExpression.of("configVersion"),
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
List.of(
SortingSpec.of(
IdentifierExpression.of("creationTimestamp"),
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));
Expand Down Expand Up @@ -425,10 +421,7 @@ void buildQuery_withCustomSorting() throws IOException {
.build();

List<SortingSpec> expectedSorts =
Arrays.asList(
SortingSpec.of(
IdentifierExpression.of("configVersion"),
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC),
List.of(
SortingSpec.of(
IdentifierExpression.of("config.test.path"),
org.hypertrace.core.documentstore.expression.operators.SortOrder.DESC));
Expand Down
Loading