Skip to content

Add code samples to comments #7347

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

Open
wants to merge 1 commit into
base: wuandy/PortMoreExpr
Choose a base branch
from
Open

Add code samples to comments #7347

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
1,577 changes: 806 additions & 771 deletions firebase-firestore/api.txt
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,8 @@ public void testCannotPerformMoreThanMaxAggregations() {

assertThat(e, instanceOf(FirebaseFirestoreException.class));
FirebaseFirestoreException firestoreException = (FirebaseFirestoreException) e;
if (isRunningAgainstEmulator()) {
assertEquals(FirebaseFirestoreException.Code.UNKNOWN, firestoreException.getCode());
} else {
assertEquals(FirebaseFirestoreException.Code.INVALID_ARGUMENT, firestoreException.getCode());
assertTrue(firestoreException.getMessage().contains("maximum number of aggregations"));
}
assertEquals(FirebaseFirestoreException.Code.INVALID_ARGUMENT, firestoreException.getCode());
assertTrue(firestoreException.getMessage().contains("maximum number of aggregations"));
}

@Test
Expand Down
893 changes: 690 additions & 203 deletions firebase-firestore/src/androidTest/java/com/google/firebase/firestore/PipelineTest.java
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 41 additions & 49 deletions ...ase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryToPipelineTest.java
View file
Open in desktop

Large diffs are not rendered by default.

220 changes: 116 additions & 104 deletions ...base-firestore/src/androidTest/java/com/google/firebase/firestore/RealtimePipelineTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...tore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import com.google.firebase.firestore.FirebaseFirestoreSettings;
import com.google.firebase.firestore.ListenerRegistration;
import com.google.firebase.firestore.MetadataChanges;
import com.google.firebase.firestore.Pipeline;
import com.google.firebase.firestore.PipelineResult;
import com.google.firebase.firestore.PipelineSnapshot;
import com.google.firebase.firestore.Query;
import com.google.firebase.firestore.QuerySnapshot;
import com.google.firebase.firestore.Source;
Expand Down Expand Up @@ -468,7 +468,7 @@ public static List<Map<String, Object>> querySnapshotToValues(QuerySnapshot quer
}

public static List<Map<String, Object>> pipelineSnapshotToValues(
PipelineSnapshot pipelineSnapshot) {
Pipeline.Snapshot pipelineSnapshot) {
List<Map<String, Object>> res = new ArrayList<>();
for (PipelineResult result : pipelineSnapshot) {
res.add(result.getData());
Expand All @@ -484,7 +484,7 @@ public static List<String> querySnapshotToIds(QuerySnapshot querySnapshot) {
return res;
}

public static List<String> pipelineSnapshotToIds(PipelineSnapshot pipelineResults) {
public static List<String> pipelineSnapshotToIds(Pipeline.Snapshot pipelineResults) {
List<String> res = new ArrayList<>();
for (PipelineResult result : pipelineResults) {
DocumentReference ref = result.getRef();
Expand Down Expand Up @@ -597,7 +597,7 @@ public static void checkQueryAndPipelineResultsMatch(Query query, String... expe
} catch (Exception e) {
throw new RuntimeException("Classic Query FAILED", e);
}
PipelineSnapshot docsFromPipeline;
Pipeline.Snapshot docsFromPipeline;
try {
docsFromPipeline = waitFor(query.getFirestore().pipeline().createFrom(query).execute());
} catch (Exception e) {
Expand Down
4 changes: 2 additions & 2 deletions firebase-firestore/src/main/java/com/google/firebase/firestore/AggregateField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package com.google.firebase.firestore;

import static com.google.firebase.firestore.pipeline.Expr.field;
import static com.google.firebase.firestore.pipeline.Expression.field;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -232,7 +232,7 @@ private AverageAggregateField(@NonNull FieldPath fieldPath) {
@NonNull
@Override
AliasedAggregate toPipeline() {
return field(getFieldPath()).avg().alias(getAlias());
return field(getFieldPath()).average().alias(getAlias());
}
}
}
Loading
Loading