OR Query Implementation #1335

tom-andersen · 2023-05-29T20:41:32Z

No description provided.

ehsannas

The github actions lint warnings are also valid.

firestore/src/main/unary_filter_main.h

firestore/src/main/query_main.cc

firestore/src/main/filter_main.h

firestore/src/common/filter.cc

firestore/src/main/filter_main.cc

firestore/src/main/filter_main.h

firestore/src/main/unary_filter_main.h

firestore/src/main/composite_filter_main.h

ehsannas

The github actions lint warnings are also valid.

firestore/src/main/composite_filter_main.cc

firestore/src/include/firebase/firestore/filter.h

ehsannas

Almost there.

firestore/src/main/composite_filter_main.h

firestore/src/main/unary_filter_main.h

firestore/integration_test_internal/src/aggregate_count_test.cc

firestore/src/android/query_android.cc

firestore/src/android/query_android.h

firestore/src/include/firebase/firestore/filter.h

firestore/src/main/filter_main.cc

firestore/src/main/composite_filter_main.cc

firestore/integration_test_internal/src/filter_test.cc

ehsannas

Thanks! The release notes bot is failing. I think you need to add something to release_build_files/readme.md

# Conflicts: # release_build_files/readme.md

markarndt

I don't see any docstrings, but the release note is fine.

github-actions · 2023-07-19T21:35:31Z

❌ Integration test FAILED

Requested by @tom-andersen on commit 11332d4
Last updated: Wed Jul 19 17:13 PDT 2023
View integration test log & download artifacts

Failures	Configs
firestore	[TEST] [ERROR] [Android] [All 3 os] [All 2 android_device]
storage	[TEST] [ERROR] [Windows] [x64] [openssl]

Add flaky tests to go/fpl-cpp-flake-tracker

This reverts commit 11332d4.

…1407) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android --------- Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: Tom Andersen <tom-andersen@users.noreply.github.com> Co-authored-by: Matthew Hyndman <almostmatt@google.com>

…1419) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android * Update the iOS version used by FTL (#1408) * Kick off nightly packaging an hour earlier (#1409) * Fix crash on gma::Initialize without a Firebase App (#1320) Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app. * build: pass along the CMake path (#1410) When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake. Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies. * Add log to gsutil fetch. (#1411) * Update mobile dependencies - Thu Aug 03 2023 (#1413) * Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: almostmatt@google.com <almostmatt@google.com> * feat(auth): Add emulator support (#1400) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com> --------- Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: Tom Andersen <tom-andersen@users.noreply.github.com> Co-authored-by: Matthew Hyndman <almostmatt@google.com> Co-authored-by: a-maurice <amaurice@google.com> Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com> Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Cynthia J <cynthiajoan@users.noreply.github.com> Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

…1425) * iOS: Remove Analytics dependency from GMA integration test (#1386) * Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme. * Add stub workflow for updating feature branches. * Add script to merge main into all active feature branches on a regular schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push. * Increase retry. (#1402) * Add Firestore test history report (#1403) * Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore. * Revert "OR Query Implementation (#1335)" (#1399) This reverts commit 11332d4. * Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406) * Only use flaky_test on android * Update the iOS version used by FTL (#1408) * Kick off nightly packaging an hour earlier (#1409) * Fix crash on gma::Initialize without a Firebase App (#1320) Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app. * build: pass along the CMake path (#1410) When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake. Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies. * Add log to gsutil fetch. (#1411) * Update mobile dependencies - Thu Aug 03 2023 (#1413) * Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: almostmatt@google.com <almostmatt@google.com> * feat(auth): Add emulator support (#1400) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com> * Update merge-to-main script (#1420) * Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main. * Format. * Update release version number for M135, 11.4.0 (#1421) * feat(auth): enable emulator support on desktop (#1423) * add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` * make json request always do restrict json * add readme info * prepare for review * some minor tweak * code format * update review comments * update the unit test after request json change --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com> * Internal Updates. (#1422) * Add logic to trim webp parameter from native image urls --------- Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: Tom Andersen <tom-andersen@users.noreply.github.com> Co-authored-by: Matthew Hyndman <almostmatt@google.com> Co-authored-by: a-maurice <amaurice@google.com> Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org> Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com> Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Cynthia J <cynthiajoan@users.noreply.github.com> Co-authored-by: Cynthia Jiang <cynthiajiang@google.com> Co-authored-by: nakirekommula <126601200+nakirekommula@users.noreply.github.com>

ehsannas requested changes Jun 2, 2023

View reviewed changes

ehsannas reviewed Jun 2, 2023

View reviewed changes

firestore/src/main/composite_filter_main.cc Outdated Show resolved Hide resolved

github-actions bot reviewed Jun 19, 2023

View reviewed changes

tom-andersen requested a review from ehsannas June 19, 2023 15:38

tom-andersen added 16 commits June 22, 2023 13:12

OR Query Implementation

cbe1932

Pretty

e2623f6

Add includes

aa2a045

Fix from PR feedback

516ff39

Fix variadic parameters

f858b7b

Add and fix tests

9a0f88a

Add/fix method descriptions.

fd4e5dd

Add/fix constructor and class descriptions.

602a463

Add method description to disjunction/conjunction.

959f53b

Add tests. Revealed bugs to be fixed.

0f3e62f

Fix type

95b2a8c

Add test

787ec3c

Android implementation

56f15c2

Pretty

1a6d116

Pretty

a26cf80

Pretty

62fcf27

tom-andersen force-pushed the tomandersen/or_query branch from 14d29f6 to 62fcf27 Compare June 22, 2023 17:12

tom-andersen changed the base branch from or_query to main June 22, 2023 17:15

tom-andersen assigned ehsannas Jun 22, 2023

tom-andersen added 2 commits June 22, 2023 15:52

Remove const

bc3cba0

Pretty

fe5b6e8

tom-andersen marked this pull request as ready for review June 22, 2023 21:03

ehsannas reviewed Jun 23, 2023

View reviewed changes

tom-andersen added 2 commits June 28, 2023 16:33

Fixes from code review

a232d50

Merge branch 'main' into tomandersen/or_query

1c71573

tom-andersen requested a review from ehsannas June 28, 2023 21:31

ehsannas approved these changes Jun 28, 2023

View reviewed changes

tom-andersen added 3 commits June 29, 2023 12:37

Release notes

d6961a7

Merge branch 'main' into tomandersen/or_query

678262c

Release notes

6f3fc73

tom-andersen requested a review from markarndt June 29, 2023 16:47

tom-andersen assigned markarndt Jun 29, 2023

Merge remote-tracking branch 'origin/main' into tomandersen/or_query

a43892b

# Conflicts: # release_build_files/readme.md

tom-andersen force-pushed the tomandersen/or_query branch from 5439b4c to a43892b Compare July 17, 2023 14:27

markarndt approved these changes Jul 19, 2023

View reviewed changes

tom-andersen merged commit 11332d4 into main Jul 19, 2023

github-actions bot added the tests: in-progress This PR's integration tests are in progress. label Jul 19, 2023

github-actions bot added the tests: failed This PR's integration tests failed. label Jul 19, 2023

firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Jul 20, 2023

tom-andersen added a commit that referenced this pull request Jul 21, 2023

Revert "OR Query Implementation (#1335)"

bfe25cc

This reverts commit 11332d4.

dconeybe mentioned this pull request Jul 28, 2023

Revert "OR Query Implementation (#1335)" #1399

Merged

tom-andersen added a commit that referenced this pull request Jul 28, 2023

Revert "OR Query Implementation (#1335)" (#1399)

daf92c8

This reverts commit 11332d4.

firebase locked and limited conversation to collaborators Aug 19, 2023

OR Query Implementation #1335

OR Query Implementation #1335

Uh oh!

Conversation

tom-andersen commented May 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ehsannas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ehsannas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ehsannas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ehsannas left a comment

Choose a reason for hiding this comment

Uh oh!

markarndt left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 19, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Integration test FAILED

Uh oh!

Uh oh!

tom-andersen commented May 29, 2023 •

edited

Loading

github-actions bot commented Jul 19, 2023 •

edited

Loading