Skip to content
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8004ad0
field path wip
var-const Jan 31, 2018
2080f96
First iteration:
var-const Jan 31, 2018
05cf106
very wip splitting into files
var-const Jan 31, 2018
6c5a60e
split into files, using crtp, ready to port unit tests
var-const Feb 1, 2018
880b115
add unit test file for base path
var-const Feb 1, 2018
5076872
add new files to projects
var-const Feb 1, 2018
0b49e35
add abseil files
var-const Feb 1, 2018
f387147
absl dependencies
var-const Feb 1, 2018
286111e
compilation wip
var-const Feb 1, 2018
6979f62
compiles and constructor test runs!
var-const Feb 1, 2018
e5a0776
constructor test
var-const Feb 1, 2018
7b480b5
add and use shorter assert macro
var-const Feb 1, 2018
e8fa45f
indexing tests succeed
var-const Feb 1, 2018
608bcf0
withoutfirst test works
var-const Feb 1, 2018
fa5aa94
withoutlast test works
var-const Feb 1, 2018
42c106c
concatenation test works
var-const Feb 1, 2018
0d89120
comparison test works
var-const Feb 1, 2018
53e5564
isprefixof test works
var-const Feb 1, 2018
e58bb49
test for failures
var-const Feb 1, 2018
7bb768e
replace base path tests with field path tests
var-const Feb 1, 2018
60317fa
test parsing (found a few bugs)
var-const Feb 2, 2018
3a7c97e
use raw string literals
var-const Feb 2, 2018
62fdfcb
add todos, make vector in base const
var-const Feb 2, 2018
822ef1d
parse test - expect round trip
var-const Feb 2, 2018
4e8aab4
more parsing tests, and the escaped dot is probably a bug
var-const Feb 2, 2018
cf43ba0
start with resourcepath tests
var-const Feb 2, 2018
7761737
remove helper functions with asserts in tests
var-const Feb 2, 2018
6404f06
a weirder string to test parsing, update todo
var-const Feb 2, 2018
ef584ec
all comparison operators + tests
var-const Feb 2, 2018
068e15c
keyfieldpath
var-const Feb 2, 2018
1a071a4
fix wrong name
var-const Feb 2, 2018
6c14417
comments
var-const Feb 2, 2018
0505370
naming
var-const Feb 2, 2018
bb39ef9
style guide order of includes
var-const Feb 2, 2018
355f506
remove reminder
var-const Feb 2, 2018
ad7582b
Merge branch 'master' into varconst-port-paths
var-const Feb 2, 2018
62e45a1
Review feedback.
var-const Feb 5, 2018
b93f2f4
finish review comments
var-const Feb 5, 2018
868254f
Merge branch 'master' into varconst-port-paths
var-const Feb 6, 2018
dfd73cb
Remove accidentally added files
var-const Feb 6, 2018
bb8006c
C++ port: add C++ equivalent of FSTDocumentKey.
var-const Feb 6, 2018
d672a0a
Review feedback
var-const Feb 7, 2018
f288779
Merge branch 'master' into varconst-port-document-key
var-const Feb 7, 2018
e106787
merge leftover
var-const Feb 7, 2018
2ff6c49
Review feedback: make implementation of DocumentKey store a shared_pt…
var-const Feb 7, 2018
6ae8395
style.sh
var-const Feb 7, 2018
8414bb8
Merge branch 'master' into varconst-port-document-key
var-const Feb 8, 2018
fb710fd
Merge branch 'master' into varconst-port-document-key
wilhuff Feb 9, 2018
4913889
review comments
var-const Feb 9, 2018
2f52e1f
Merge branch 'varconst-port-document-key' of github.com:firebase/fire…
var-const Feb 9, 2018
03163e5
add new files to cmakelists
var-const Feb 9, 2018
0bd9898
remove leftover forward declaration
var-const Feb 9, 2018
d507494
fix style
var-const Feb 9, 2018
6583dcc
assert_death -> assert_any_throw; fix incorrect expectation that crea…
var-const Feb 9, 2018
12d37a5
Merge branch 'master' into varconst-port-document-key
var-const Feb 10, 2018
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: 4 additions & 0 deletions Firestore/Example/Firestore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
ABE6637A201FA81900ED349A /* database_id_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB71064B201FA60300344F18 /* database_id_test.cc */; };
ABF6506C201131F8005F2C74 /* timestamp_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = ABF6506B201131F8005F2C74 /* timestamp_test.cc */; };
AFE6114F0D4DAECBA7B7C089 /* Pods_Firestore_IntegrationTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2FA635DF5D116A67A7441CD /* Pods_Firestore_IntegrationTests.framework */; };
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6152AD5202A5385000E5744 /* document_key_test.cc */; };
B686F2AF2023DDEE0028D6BE /* field_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2AD2023DDB20028D6BE /* field_path_test.cc */; };
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2B02024FFD70028D6BE /* resource_path_test.cc */; };
C4E749275AD0FBDF9F4716A8 /* Pods_SwiftBuildTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32AD40BF6B0E849B07FFD05E /* Pods_SwiftBuildTest.framework */; };
Expand Down Expand Up @@ -352,6 +353,7 @@
ABC1D7E22023CDC500BA84F0 /* firebase_credentials_provider_test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = firebase_credentials_provider_test.mm; sourceTree = "<group>"; };
ABF6506B201131F8005F2C74 /* timestamp_test.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = timestamp_test.cc; sourceTree = "<group>"; };
B2FA635DF5D116A67A7441CD /* Pods_Firestore_IntegrationTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Firestore_IntegrationTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B6152AD5202A5385000E5744 /* document_key_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document_key_test.cc; sourceTree = "<group>"; };
B686F2AD2023DDB20028D6BE /* field_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = field_path_test.cc; sourceTree = "<group>"; };
B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
CE00BABB5A3AAB44A4C209E2 /* Pods-Firestore_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestore_Tests/Pods-Firestore_Tests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -582,6 +584,7 @@
AB356EF5200E9D1A0089B766 /* model */ = {
isa = PBXGroup;
children = (
B6152AD5202A5385000E5744 /* document_key_test.cc */,
B686F2B02024FFD70028D6BE /* resource_path_test.cc */,
B686F2AD2023DDB20028D6BE /* field_path_test.cc */,
AB71064B201FA60300344F18 /* database_id_test.cc */,
Expand Down Expand Up @@ -1320,6 +1323,7 @@
5492E0C82021557E00B64F25 /* FSTDatastoreTests.mm in Sources */,
5492E065202154B900B64F25 /* FSTViewTests.mm in Sources */,
5492E03C2021401F00B64F25 /* XCTestCase+Await.mm in Sources */,
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */,
54764FAF1FAA21B90085E60A /* FSTGoogleTestTests.mm in Sources */,
AB380D04201BC6E400D97691 /* ordered_code_test.cc in Sources */,
5492E03F2021401F00B64F25 /* FSTHelpers.mm in Sources */,
Expand Down
93 changes: 93 additions & 0 deletions Firestore/core/src/firebase/firestore/model/document_key.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright 2018 Google
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "Firestore/core/src/firebase/firestore/model/document_key.h"

#include <utility>

#include "Firestore/core/src/firebase/firestore/model/resource_path.h"
#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"

namespace firebase {
namespace firestore {
namespace model {

namespace {

void AssertValidPath(const ResourcePath& path) {
FIREBASE_ASSERT_MESSAGE(DocumentKey::IsDocumentKey(path),
"invalid document key path: %s",
path.CanonicalString().c_str());
}

} // namespace

DocumentKey::DocumentKey() : path_{std::make_shared<ResourcePath>()} {
}

DocumentKey::DocumentKey(const ResourcePath& path)
: path_{std::make_shared<ResourcePath>(path)} {
AssertValidPath(*path_);
}

DocumentKey::DocumentKey(ResourcePath&& path)
: path_{std::make_shared<ResourcePath>(std::move(path))} {
AssertValidPath(*path_);
}

DocumentKey DocumentKey::FromPathString(const absl::string_view path) {
return DocumentKey{ResourcePath::FromString(path)};
}

DocumentKey DocumentKey::FromSegments(std::initializer_list<std::string> list) {
return DocumentKey{ResourcePath{list}};
}

const DocumentKey& DocumentKey::Empty() {
static DocumentKey empty;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be static const DocumentKey empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

return empty;
}

bool DocumentKey::IsDocumentKey(const ResourcePath& path) {
return path.size() % 2 == 0;
}

const ResourcePath& DocumentKey::path() const {
return path_ ? *path_ : Empty().path();
}

bool operator==(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() == rhs.path();
}
bool operator!=(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() != rhs.path();
}
bool operator<(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() < rhs.path();
}
bool operator<=(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() <= rhs.path();
}
bool operator>(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() > rhs.path();
}
bool operator>=(const DocumentKey& lhs, const DocumentKey& rhs) {
return lhs.path() >= rhs.path();
}

} // namespace model
} // namespace firestore
} // namespace firebase
80 changes: 80 additions & 0 deletions Firestore/core/src/firebase/firestore/model/document_key.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
* Copyright 2018 Google
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DOCUMENT_KEY_H_
#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DOCUMENT_KEY_H_

#include <initializer_list>
#include <memory>
#include <string>

#include "absl/strings/string_view.h"

namespace firebase {
namespace firestore {
namespace model {

class ResourcePath;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this build-time optimization is worthwhile. It forces the entire implementation out into the .cc file, where this would otherwise be a very lightweight wrapper around a ResourcePath.

I don't feel strongly that these things should be defined inline and perhaps this is beneficial because it forces all these things to be defined out-of-line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted back.


/**
* DocumentKey represents the location of a document in the Firestore database.
*/
class DocumentKey {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uber-nit: Some of your methods have a blank line after them (eg lines 39, 51, 58, etc) while others don't (eg 34,45, 68, etc). Consider unifying.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to group together more-or-less related methods. So I'm mildly in favor of keeping (provided it's not against the style guide), but not too much against removing as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT, it's not at all against the style guide. From the examples listed, the style guide usually omits blank lines after methods that are entirely contained on a single line, but adds them when the definition spans lines. (See guide for examples). But I don't think there's any requirement here.

I'm fine with it as is.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please port comments:

/** DocumentKey represents the location of a document in the Firestore database. */

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

public:
/** Creates a "blank" document key not associated with any document. */
DocumentKey();

/** Creates a new document key containing a copy of the given path. */
explicit DocumentKey(const ResourcePath& path);

/** Creates a new document key, taking ownership of the given path. */
explicit DocumentKey(ResourcePath&& path);

/**
* Creates and returns a new document key using '/' to split the string into
* segments.
*/
static DocumentKey FromPathString(absl::string_view path);

/** Creates and returns a new document key with the given segments. */
static DocumentKey FromSegments(std::initializer_list<std::string> list);

/** Returns a shared instance of an empty document key. */
static const DocumentKey& Empty();

/** Returns true iff the given path is a path to a document. */
static bool IsDocumentKey(const ResourcePath& path);
/** The path to the document. */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing newline?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

const ResourcePath& path() const;

private:
// This is an optimization to make passing DocumentKey around cheaper (it's
// copied often).
std::shared_ptr<const ResourcePath> path_;
};

bool operator==(const DocumentKey& lhs, const DocumentKey& rhs);
bool operator!=(const DocumentKey& lhs, const DocumentKey& rhs);
bool operator<(const DocumentKey& lhs, const DocumentKey& rhs);
bool operator<=(const DocumentKey& lhs, const DocumentKey& rhs);
bool operator>(const DocumentKey& lhs, const DocumentKey& rhs);
bool operator>=(const DocumentKey& lhs, const DocumentKey& rhs);

} // namespace model
} // namespace firestore
} // namespace firebase

#endif // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DOCUMENT_KEY_H_
7 changes: 2 additions & 5 deletions Firestore/core/src/firebase/firestore/model/field_path.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ namespace model {

namespace {

// TODO(varconst): move to C++ equivalent of FSTDocumentKey.{h,cc}
const char* const kDocumentKeyPath = "__name__";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at other SDKs:

  • each SDK has its own place to store this constant;
  • this constant is only used in FieldPath and inside tests.

So it seemed easiest to just move it to the point of usage. Please let me know if there's a reason to have it inside DocumentKey/make it a global variable/etc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to make organizational changes but when you notice inconsistencies like these please fix them :-).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be fair, there seem to be reasons for this inconsistencies. E.g., Java can't have a global variable, so the variable is wrapped into a class, whereas Typescript even has a nice syntax for exporting variables.


/**
* True if the string could be used as a segment in a field path without
* escaping. Valid identifies follow the regex [a-zA-Z_][a-zA-Z0-9_]*
Expand Down Expand Up @@ -146,12 +143,12 @@ const FieldPath& FieldPath::EmptyPath() {
}

const FieldPath& FieldPath::KeyFieldPath() {
static const FieldPath key_field_path{kDocumentKeyPath};
static const FieldPath key_field_path{FieldPath::kDocumentKeyPath};
return key_field_path;
}

bool FieldPath::IsKeyFieldPath() const {
return size() == 1 && first_segment() == kDocumentKeyPath;
return size() == 1 && first_segment() == FieldPath::kDocumentKeyPath;
}

std::string FieldPath::CanonicalString() const {
Expand Down
3 changes: 3 additions & 0 deletions Firestore/core/src/firebase/firestore/model/field_path.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ namespace model {
*/
class FieldPath : public impl::BasePath<FieldPath> {
public:
/** The field path string that represents the document's key. */
static constexpr const char* kDocumentKeyPath = "__name__";

// Note: Xcode 8.2 requires explicit specification of the constructor.
FieldPath() : impl::BasePath<FieldPath>() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace firebase {
namespace firestore {
namespace model {

ResourcePath ResourcePath::Parse(const absl::string_view path) {
ResourcePath ResourcePath::FromString(const absl::string_view path) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to be more similar to other SDKs.

// NOTE: The client is ignorant of any path segments containing escape
// sequences (e.g. __id123__) and just passes them through raw (they exist
// for legacy reasons and should not be used frequently).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ResourcePath : public impl::BasePath<ResourcePath> {
* Creates and returns a new path from the given resource-path string, where
* the path segments are separated by a slash "/".
*/
static ResourcePath Parse(absl::string_view path);
static ResourcePath FromString(absl::string_view path);

/** Returns a standardized string representation of this path. */
std::string CanonicalString() const;
Expand Down
Loading