Skip to content

Commit bfe25cc

Browse files
tom-andersentom-andersen
committed
Revert "OR Query Implementation (#1335)"
This reverts commit 11332d4.
1 parent 3cd0dca commit bfe25cc

28 files changed

+42
-2076
lines changed

‎app/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@ if (IOS)
518518
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/document_snapshot.h
519519
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_path.h
520520
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/field_value.h
521-
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/filter.h
522521
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/listener_registration.h
523522
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/load_bundle_task_progress.h
524523
${FIREBASE_SOURCE_DIR}/firestore/src/include/firebase/firestore/map_field_value.h

‎firestore/CMakeLists.txt

-9
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ set(common_SRCS
3131
src/common/document_snapshot.cc
3232
src/common/exception_common.cc
3333
src/common/exception_common.h
34-
src/common/filter.cc
3534
src/common/field_path.cc
3635
src/common/field_value.cc
3736
src/common/firestore.cc
@@ -98,8 +97,6 @@ set(android_SRCS
9897
src/android/field_path_portable.h
9998
src/android/field_value_android.cc
10099
src/android/field_value_android.h
101-
src/android/filter_android.cc
102-
src/android/filter_android.h
103100
src/android/firestore_android.cc
104101
src/android/firestore_android.h
105102
src/android/firestore_exceptions_android.h
@@ -204,17 +201,13 @@ set(main_SRCS
204201
src/main/aggregate_query_snapshot_main.h
205202
src/main/collection_reference_main.cc
206203
src/main/collection_reference_main.h
207-
src/main/composite_filter_main.cc
208-
src/main/composite_filter_main.h
209204
src/main/converter_main.h
210205
src/main/document_change_main.cc
211206
src/main/document_change_main.h
212207
src/main/document_reference_main.cc
213208
src/main/document_reference_main.h
214209
src/main/document_snapshot_main.cc
215210
src/main/document_snapshot_main.h
216-
src/main/filter_main.cc
217-
src/main/filter_main.h
218211
src/main/field_value_main.cc
219212
src/main/field_value_main.h
220213
src/main/firestore_main.cc
@@ -234,8 +227,6 @@ set(main_SRCS
234227
src/main/transaction_main.h
235228
src/main/user_data_converter_main.cc
236229
src/main/user_data_converter_main.h
237-
src/main/unary_filter_main.cc
238-
src/main/unary_filter_main.h
239230
src/main/util_main.h
240231
src/main/write_batch_main.cc
241232
src/main/write_batch_main.h)

‎firestore/integration_test_internal/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
9191
# public API are performed.
9292
src/integration_test.cc
9393
# Internal tests below.
94-
src/aggregate_count_test.cc
9594
src/aggregate_query_snapshot_test.cc
9695
src/aggregate_query_test.cc
9796
src/bundle_test.cc
@@ -100,7 +99,6 @@ set(FIREBASE_INTEGRATION_TEST_PORTABLE_TEST_SRCS
10099
src/document_change_test.cc
101100
src/document_reference_test.cc
102101
src/document_snapshot_test.cc
103-
src/filter_test.cc
104102
src/field_value_test.cc
105103
src/fields_test.cc
106104
src/firestore_test.cc

‎firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj

-24
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
12CCF1E928FDBD9F00C24941 /* set_options_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */; };
2222
12D513142684C8C200A83FAA /* bundle_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513132684C8C200A83FAA /* bundle_test.cc */; };
2323
12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */ = {isa = PBXBuildFile; fileRef = 12D513182684C8D100A83FAA /* bundle_builder.cc */; };
24-
1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
25-
1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */; };
26-
1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
27-
1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */; };
28-
1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
29-
1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */; };
30-
1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
31-
1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1BAFACA92A449CBD00834979 /* filter_test.cc */; };
3224
520BC0391C869159008CFBC3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520BC0381C869159008CFBC3 /* GoogleService-Info.plist */; };
3325
5270BB448DF5ECE860FDD68B /* firebase_firestore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAFAF9474EC412ADCC65F2CC /* firebase_firestore.framework */; };
3426
529226D61C85F68000C89379 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529226D51C85F68000C89379 /* Foundation.framework */; };
@@ -131,10 +123,6 @@
131123
12D513182684C8D100A83FAA /* bundle_builder.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bundle_builder.cc; path = src/util/bundle_builder.cc; sourceTree = "<group>"; };
132124
12D513192684C8D100A83FAA /* bundle_builder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bundle_builder.h; path = src/util/bundle_builder.h; sourceTree = "<group>"; };
133125
1B3D64B35A22073C76B376D5 /* libPods-integration_test_tvos.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-integration_test_tvos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
134-
1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_snapshot_test.cc; path = src/aggregate_query_snapshot_test.cc; sourceTree = "<group>"; };
135-
1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_count_test.cc; path = src/aggregate_count_test.cc; sourceTree = "<group>"; };
136-
1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = aggregate_query_test.cc; path = src/aggregate_query_test.cc; sourceTree = "<group>"; };
137-
1BAFACA92A449CBD00834979 /* filter_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = filter_test.cc; path = src/filter_test.cc; sourceTree = "<group>"; };
138126
3DE393E827F88B06CD3C39CD /* Pods-integration_test_tvos.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-integration_test_tvos.release.xcconfig"; path = "Target Support Files/Pods-integration_test_tvos/Pods-integration_test_tvos.release.xcconfig"; sourceTree = "<group>"; };
139127
4AAFA3E3DA9641C2E3C46C9D /* Pods_integration_test.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_integration_test.framework; sourceTree = BUILT_PRODUCTS_DIR; };
140128
520BC0381C869159008CFBC3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -293,10 +281,6 @@
293281
5292271D1C85FB5500C89379 /* src */ = {
294282
isa = PBXGroup;
295283
children = (
296-
1BAFACA92A449CBD00834979 /* filter_test.cc */,
297-
1BAFACA12A449C2B00834979 /* aggregate_count_test.cc */,
298-
1BAFACA02A449C2B00834979 /* aggregate_query_snapshot_test.cc */,
299-
1BAFACA22A449C2B00834979 /* aggregate_query_test.cc */,
300284
12CCF1DF28FDBD9F00C24941 /* set_options_test.cc */,
301285
12CCF1DB28FDBD9E00C24941 /* settings_test.cc */,
302286
12CCF1DC28FDBD9F00C24941 /* source_test.cc */,
@@ -592,14 +576,12 @@
592576
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */,
593577
D61CFBC126091C3B0035CB2A /* integration_test.cc in Sources */,
594578
D6AAAD532606C22D0025C53B /* includes_test.cc in Sources */,
595-
1BAFACA52A449C2B00834979 /* aggregate_count_test.cc in Sources */,
596579
D6AAAD502606C22D0025C53B /* numeric_transforms_test.cc in Sources */,
597580
D6ED33BE2606CD890058CBF9 /* integration_test_util.cc in Sources */,
598581
D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */,
599582
12CCF1E228FDBD9F00C24941 /* source_test.cc in Sources */,
600583
D6AAAD4C2606C22D0025C53B /* server_timestamp_test.cc in Sources */,
601584
D6AAAD4E2606C22D0025C53B /* firestore_test.cc in Sources */,
602-
1BAFACAA2A449CBD00834979 /* filter_test.cc in Sources */,
603585
D6AAAD452606C22D0025C53B /* document_change_test.cc in Sources */,
604586
D6AAAD472606C22D0025C53B /* document_snapshot_test.cc in Sources */,
605587
D6C179E922CB322900C2651A /* ios_app_framework.mm in Sources */,
@@ -609,9 +591,7 @@
609591
EDEEC7632800CD0000EFBAAF /* leveldb_snappy_test.cc in Sources */,
610592
12CCF1E828FDBD9F00C24941 /* set_options_test.cc in Sources */,
611593
D6AAAD562606C22D0025C53B /* query_network_test.cc in Sources */,
612-
1BAFACA72A449C2B00834979 /* aggregate_query_test.cc in Sources */,
613594
D6AAAD552606C22D0025C53B /* listener_registration_test.cc in Sources */,
614-
1BAFACA32A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
615595
12D5131A2684C8D100A83FAA /* bundle_builder.cc in Sources */,
616596
D6AAAD4A2606C22D0025C53B /* fields_test.cc in Sources */,
617597
D6AAAD462606C22D0025C53B /* query_test.cc in Sources */,
@@ -630,8 +610,6 @@
630610
isa = PBXSourcesBuildPhase;
631611
buildActionMask = 2147483647;
632612
files = (
633-
1BAFACAB2A449CBD00834979 /* filter_test.cc in Sources */,
634-
1BAFACA62A449C2B00834979 /* aggregate_count_test.cc in Sources */,
635613
BC1D6850267B00EB005DC2DA /* app_framework.cc in Sources */,
636614
BC1D6853267B00EB005DC2DA /* transaction_extra_test.cc in Sources */,
637615
BC1D683E267B00EB005DC2DA /* integration_test_util.cc in Sources */,
@@ -645,7 +623,6 @@
645623
BC1D6848267B00EB005DC2DA /* sanity_test.cc in Sources */,
646624
12CCF1E728FDBD9F00C24941 /* write_batch_test.cc in Sources */,
647625
12CCF1E128FDBD9F00C24941 /* settings_test.cc in Sources */,
648-
1BAFACA82A449C2B00834979 /* aggregate_query_test.cc in Sources */,
649626
BC1D6856267B00EE005DC2DA /* ios_app_framework.mm in Sources */,
650627
BC1D6843267B00EB005DC2DA /* numeric_transforms_test.cc in Sources */,
651628
BC1D6844267B00EB005DC2DA /* array_transform_test.cc in Sources */,
@@ -655,7 +632,6 @@
655632
BC1D684E267B00EB005DC2DA /* includes_test.cc in Sources */,
656633
BC1D684C267B00EB005DC2DA /* document_change_test.cc in Sources */,
657634
BC1D6851267B00EB005DC2DA /* firestore_integration_test.cc in Sources */,
658-
1BAFACA42A449C2B00834979 /* aggregate_query_snapshot_test.cc in Sources */,
659635
BC1D6838267B00EB005DC2DA /* future_test_util.cc in Sources */,
660636
12CCF1E528FDBD9F00C24941 /* validation_test.cc in Sources */,
661637
BC1D6839267B00EB005DC2DA /* type_test.cc in Sources */,

‎firestore/integration_test_internal/src/aggregate_count_test.cc

+16
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@
2828
#include "firestore_integration_test.h"
2929
#include "util/event_accumulator.h"
3030

31+
#if defined(__ANDROID__)
32+
#include "firestore/src/android/query_android.h"
33+
#include "firestore/src/common/wrapper_assertions.h"
34+
#endif // defined(__ANDROID__)
35+
3136
#include "Firestore/core/src/util/firestore_exceptions.h"
3237
#include "firebase/firestore/firestore_errors.h"
3338
#include "firebase_test_framework.h"
39+
#include "gmock/gmock.h"
3440
#include "gtest/gtest.h"
3541

3642
namespace firebase {
@@ -751,5 +757,15 @@ TEST_F(AggregateCountTest,
751757
EXPECT_EQ(aggregate_query2, aggregate_snapshot2.query());
752758
}
753759

760+
#if defined(__ANDROID__)
761+
TEST(QueryTestAndroidStub, Construction) {
762+
testutil::AssertWrapperConstructionContract<Query>();
763+
}
764+
765+
TEST(QueryTestAndroidStub, Assignment) {
766+
testutil::AssertWrapperAssignmentContract<Query>();
767+
}
768+
#endif // defined(__ANDROID__)
769+
754770
} // namespace firestore
755771
} // namespace firebase

‎firestore/integration_test_internal/src/aggregate_query_test.cc

-15
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
#include "firebase/firestore.h"
1818
#include "firestore_integration_test.h"
1919

20-
#if defined(__ANDROID__)
21-
#include "firestore/src/android/aggregate_query_android.h"
22-
#include "firestore/src/common/wrapper_assertions.h"
23-
#endif // defined(__ANDROID__)
24-
2520
#include "gtest/gtest.h"
2621

2722
namespace firebase {
@@ -337,16 +332,6 @@ TEST_F(AggregateQueryTest, TestHashCode) {
337332
AggregateQueryHash(query1.Count()));
338333
}
339334

340-
#if defined(__ANDROID__)
341-
TEST(QueryTestAndroidStub, Construction) {
342-
testutil::AssertWrapperConstructionContract<AggregateQuery>();
343-
}
344-
345-
TEST(QueryTestAndroidStub, Assignment) {
346-
testutil::AssertWrapperAssignmentContract<AggregateQuery>();
347-
}
348-
#endif // defined(__ANDROID__)
349-
350335
} // namespace
351336
} // namespace firestore
352337
} // namespace firebase

0 commit comments

Comments
 (0)