Skip to content

Commit 77e4556

Browse files
cherylEnkiducherylEnkidu
committed
resolve rebase error
1 parent 43fb9ef commit 77e4556

14 files changed

+19
-1354417
lines changed

‎Firestore/Example/Tests/SpecTests/json/collection_spec_test.json‎

Lines changed: 0 additions & 268 deletions
Original file line numberDiff line numberDiff line change
@@ -23,74 +23,6 @@
2323
"expectedState": {
2424
"activeTargets": {
2525
"2": {
26-
"pipelines": [
27-
{
28-
"isCorePipeline": true,
29-
"serializer": {
30-
"databaseId": {
31-
"database": "(default)",
32-
"projectId": "test-project"
33-
},
34-
"useProto3Json": false
35-
},
36-
"stages": [
37-
{
38-
"collectionPath": "/collection",
39-
"name": "collection"
40-
},
41-
{
42-
"condition": {
43-
"_createdFromLiteral": false,
44-
"_protoValueType": "ProtoValue",
45-
"exprType": "Function",
46-
"filterable": true,
47-
"name": "exists",
48-
"params": [
49-
{
50-
"_createdFromLiteral": false,
51-
"_fieldPath": {
52-
"len": 1,
53-
"offset": 0,
54-
"segments": [
55-
"__name__"
56-
]
57-
},
58-
"_protoValueType": "ProtoValue",
59-
"exprType": "Field",
60-
"pipeline": null,
61-
"selectable": true
62-
}
63-
]
64-
},
65-
"name": "where"
66-
},
67-
{
68-
"name": "sort",
69-
"orders": [
70-
{
71-
"_createdFromLiteral": false,
72-
"_protoValueType": "ProtoValue",
73-
"direction": "ascending",
74-
"expr": {
75-
"_createdFromLiteral": false,
76-
"_fieldPath": {
77-
"len": 1,
78-
"offset": 0,
79-
"segments": [
80-
"__name__"
81-
]
82-
},
83-
"_protoValueType": "ProtoValue",
84-
"exprType": "Field",
85-
"pipeline": null,
86-
"selectable": true
87-
}
88-
}
89-
]
90-
}
91-
]
92-
}
93-
],
9426
"queries": [
9527
{
9628
"filters": [
@@ -164,72 +96,6 @@
16496
"errorCode": 0,
16597
"fromCache": false,
16698
"hasPendingWrites": false,
167-
"pipeline": {
168-
"isCorePipeline": true,
169-
"serializer": {
170-
"databaseId": {
171-
"database": "(default)",
172-
"projectId": "test-project"
173-
},
174-
"useProto3Json": false
175-
},
176-
"stages": [
177-
{
178-
"collectionPath": "/collection",
179-
"name": "collection"
180-
},
181-
{
182-
"condition": {
183-
"_createdFromLiteral": false,
184-
"_protoValueType": "ProtoValue",
185-
"exprType": "Function",
186-
"filterable": true,
187-
"name": "exists",
188-
"params": [
189-
{
190-
"_createdFromLiteral": false,
191-
"_fieldPath": {
192-
"len": 1,
193-
"offset": 0,
194-
"segments": [
195-
"__name__"
196-
]
197-
},
198-
"_protoValueType": "ProtoValue",
199-
"exprType": "Field",
200-
"pipeline": null,
201-
"selectable": true
202-
}
203-
]
204-
},
205-
"name": "where"
206-
},
207-
{
208-
"name": "sort",
209-
"orders": [
210-
{
211-
"_createdFromLiteral": false,
212-
"_protoValueType": "ProtoValue",
213-
"direction": "ascending",
214-
"expr": {
215-
"_createdFromLiteral": false,
216-
"_fieldPath": {
217-
"len": 1,
218-
"offset": 0,
219-
"segments": [
220-
"__name__"
221-
]
222-
},
223-
"_protoValueType": "ProtoValue",
224-
"exprType": "Field",
225-
"pipeline": null,
226-
"selectable": true
227-
}
228-
}
229-
]
230-
}
231-
]
232-
},
23399
"query": {
234100
"filters": [
235101
],
@@ -266,74 +132,6 @@
266132
"expectedState": {
267133
"activeTargets": {
268134
"2": {
269-
"pipelines": [
270-
{
271-
"isCorePipeline": true,
272-
"serializer": {
273-
"databaseId": {
274-
"database": "(default)",
275-
"projectId": "test-project"
276-
},
277-
"useProto3Json": false
278-
},
279-
"stages": [
280-
{
281-
"collectionPath": "/collection",
282-
"name": "collection"
283-
},
284-
{
285-
"condition": {
286-
"_createdFromLiteral": false,
287-
"_protoValueType": "ProtoValue",
288-
"exprType": "Function",
289-
"filterable": true,
290-
"name": "exists",
291-
"params": [
292-
{
293-
"_createdFromLiteral": false,
294-
"_fieldPath": {
295-
"len": 1,
296-
"offset": 0,
297-
"segments": [
298-
"__name__"
299-
]
300-
},
301-
"_protoValueType": "ProtoValue",
302-
"exprType": "Field",
303-
"pipeline": null,
304-
"selectable": true
305-
}
306-
]
307-
},
308-
"name": "where"
309-
},
310-
{
311-
"name": "sort",
312-
"orders": [
313-
{
314-
"_createdFromLiteral": false,
315-
"_protoValueType": "ProtoValue",
316-
"direction": "ascending",
317-
"expr": {
318-
"_createdFromLiteral": false,
319-
"_fieldPath": {
320-
"len": 1,
321-
"offset": 0,
322-
"segments": [
323-
"__name__"
324-
]
325-
},
326-
"_protoValueType": "ProtoValue",
327-
"exprType": "Field",
328-
"pipeline": null,
329-
"selectable": true
330-
}
331-
}
332-
]
333-
}
334-
]
335-
}
336-
],
337135
"queries": [
338136
{
339137
"filters": [
@@ -374,72 +172,6 @@
374172
"errorCode": 0,
375173
"fromCache": true,
376174
"hasPendingWrites": true,
377-
"pipeline": {
378-
"isCorePipeline": true,
379-
"serializer": {
380-
"databaseId": {
381-
"database": "(default)",
382-
"projectId": "test-project"
383-
},
384-
"useProto3Json": false
385-
},
386-
"stages": [
387-
{
388-
"collectionPath": "/collection",
389-
"name": "collection"
390-
},
391-
{
392-
"condition": {
393-
"_createdFromLiteral": false,
394-
"_protoValueType": "ProtoValue",
395-
"exprType": "Function",
396-
"filterable": true,
397-
"name": "exists",
398-
"params": [
399-
{
400-
"_createdFromLiteral": false,
401-
"_fieldPath": {
402-
"len": 1,
403-
"offset": 0,
404-
"segments": [
405-
"__name__"
406-
]
407-
},
408-
"_protoValueType": "ProtoValue",
409-
"exprType": "Field",
410-
"pipeline": null,
411-
"selectable": true
412-
}
413-
]
414-
},
415-
"name": "where"
416-
},
417-
{
418-
"name": "sort",
419-
"orders": [
420-
{
421-
"_createdFromLiteral": false,
422-
"_protoValueType": "ProtoValue",
423-
"direction": "ascending",
424-
"expr": {
425-
"_createdFromLiteral": false,
426-
"_fieldPath": {
427-
"len": 1,
428-
"offset": 0,
429-
"segments": [
430-
"__name__"
431-
]
432-
},
433-
"_protoValueType": "ProtoValue",
434-
"exprType": "Field",
435-
"pipeline": null,
436-
"selectable": true
437-
}
438-
}
439-
]
440-
}
441-
]
442-
},
443175
"query": {
444176
"filters": [
445177
],

0 commit comments

Comments
 (0)