Skip to content

Proto update sync and add query spec tests back #8731

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 1 commit into from
Jan 27, 2025
Merged

Proto update sync and add query spec tests back #8731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/firestore/src/local/local_serializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ export function toDbTarget(
function isPipelineQueryTarget(
dbQuery: DbQuery
): dbQuery is PublicPipelineQueryTarget {
return (dbQuery as PublicPipelineQueryTarget).pipeline !== undefined;
return (
(dbQuery as PublicPipelineQueryTarget).structuredPipeline !== undefined
);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/src/protos/firestore_proto_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export declare namespace firestoreV1ApiClientInterfaces {
structuredQuery?: StructuredQuery;
}
interface PipelineQueryTarget {
pipeline?: StructuredPipeline;
structuredPipeline?: StructuredPipeline;
}
interface ReadOnly {
readTime?: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/src/protos/google/firestore/v1/firestore.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ message Target {
// The pipeline to run.
oneof pipeline_type {
// A pipelined operation in structured format.
StructuredPipeline pipeline = 1;
StructuredPipeline structured_pipeline = 1;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/firestore/src/protos/protos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,12 +2421,12 @@
"oneofs": {
"pipelineType": {
"oneof": [
"pipeline"
"structuredPipeline"
]
}
},
"fields": {
"pipeline": {
"structuredPipeline": {
"type": "StructuredPipeline",
"id": 1
}
Expand Down
4 changes: 2 additions & 2 deletions packages/firestore/src/remote/serializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,7 +1098,7 @@ export function fromPipelineTarget(
target: ProtoPipelineQueryTarget,
serializer: JsonProtoSerializer
): CorePipeline {
const pipeline = target.pipeline;
const pipeline = target.structuredPipeline;
hardAssert(
(pipeline?.pipeline?.stages ?? []).length > 0,
'Deserializing pipeline without any stages.'
Expand All @@ -1114,7 +1114,7 @@ export function toPipelineTarget(
target: CorePipeline
): ProtoPipelineQueryTarget {
return {
pipeline: {
structuredPipeline: {
pipeline: {
stages: target.stages.map(s => s._toProto(serializer))
}
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/test/unit/specs/describe_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export function specTest(
? [true, false]
: [false];
for (const usePersistence of persistenceModes) {
const convertToPipelines = [true];
const convertToPipelines = [false, true];
for (const convertToPipeline of convertToPipelines) {
const runner = getTestRunner(tags, usePersistence, convertToPipeline);
const timeout = getTestTimeout(tags);
Expand Down
Loading