Skip to content

fix | fix the query for fetching the updated document #284

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 4 commits into from
May 20, 2024
Merged

fix | fix the query for fetching the updated document #284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c1157f
Revert "fix | fix the query for fetching the updated document (#282)"
aman-bansal May 20, 2024
82b074b
fix | fix the query for fetching the updated document
aman-bansal May 20, 2024
89d7035
Merge branch 'main' into aman/fix-update_query
aman-bansal May 20, 2024
8f86f0c
making it pretty
aman-bansal May 20, 2024
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
22 changes: 17 additions & 5 deletions ...ervice-impl/src/main/java/org/hypertrace/entity/query/service/EntityQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static java.util.Objects.isNull;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toUnmodifiableList;
import static org.hypertrace.core.documentstore.expression.operators.RelationalOperator.EQ;
import static org.hypertrace.core.documentstore.expression.operators.RelationalOperator.IN;
import static org.hypertrace.core.documentstore.model.options.ReturnDocumentType.NONE;
import static org.hypertrace.entity.data.service.v1.AttributeValue.VALUE_LIST_FIELD_NUMBER;
Expand Down Expand Up @@ -45,6 +46,7 @@
import org.hypertrace.core.documentstore.SingleValueKey;
import org.hypertrace.core.documentstore.expression.impl.ConstantExpression;
import org.hypertrace.core.documentstore.expression.impl.IdentifierExpression;
import org.hypertrace.core.documentstore.expression.impl.LogicalExpression;
import org.hypertrace.core.documentstore.expression.impl.RelationalExpression;
import org.hypertrace.core.documentstore.model.options.UpdateOptions;
import org.hypertrace.core.documentstore.model.subdoc.SubDocumentUpdate;
Expand Down Expand Up @@ -342,7 +344,10 @@ public void update(EntityUpdateRequest request, StreamObserver<ResultSetChunk> r
// Finally, return the selections
List<Document> documents =
getProjectedDocuments(
request.getEntityIdsList(), request.getSelectionList(), requestContext);
maybeTenantId.get(),
request.getEntityIdsList(),
request.getSelectionList(),
requestContext);

responseObserver.onNext(
convertDocumentsToResultSetChunk(documents, request.getSelectionList()));
Expand Down Expand Up @@ -531,6 +536,7 @@ private JSONDocument convertToJsonDocument(LiteralConstant literalConstant) {
}

private List<Document> getProjectedDocuments(
final String tenantId,
final Iterable<String> entityIds,
final List<Expression> selectionList,
final RequestContext requestContext)
Expand All @@ -546,10 +552,16 @@ private List<Document> getProjectedDocuments(
final Filter filter =
Filter.builder()
.expression(
RelationalExpression.of(
IdentifierExpression.of(EntityServiceConstants.ENTITY_ID),
IN,
ConstantExpression.ofStrings(entityIdList)))
LogicalExpression.and(
List.of(
RelationalExpression.of(
IdentifierExpression.of(EntityServiceConstants.ENTITY_ID),
IN,
ConstantExpression.ofStrings(entityIdList)),
RelationalExpression.of(
IdentifierExpression.of(EntityServiceConstants.TENANT_ID),
EQ,
ConstantExpression.of(tenantId)))))
.build();

final org.hypertrace.core.documentstore.query.Query query =
Expand Down