-
Notifications
You must be signed in to change notification settings - Fork 1.6k
C++ port: add C++ equivalent of FSTDocumentKey. #762
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
8004ad0
field path wip
var-const 2080f96
First iteration:
var-const 05cf106
very wip splitting into files
var-const 6c5a60e
split into files, using crtp, ready to port unit tests
var-const 880b115
add unit test file for base path
var-const 5076872
add new files to projects
var-const 0b49e35
add abseil files
var-const f387147
absl dependencies
var-const 286111e
compilation wip
var-const 6979f62
compiles and constructor test runs!
var-const e5a0776
constructor test
var-const 7b480b5
add and use shorter assert macro
var-const e8fa45f
indexing tests succeed
var-const 608bcf0
withoutfirst test works
var-const fa5aa94
withoutlast test works
var-const 42c106c
concatenation test works
var-const 0d89120
comparison test works
var-const 53e5564
isprefixof test works
var-const e58bb49
test for failures
var-const 7bb768e
replace base path tests with field path tests
var-const 60317fa
test parsing (found a few bugs)
var-const 3a7c97e
use raw string literals
var-const 62fdfcb
add todos, make vector in base const
var-const 822ef1d
parse test - expect round trip
var-const 4e8aab4
more parsing tests, and the escaped dot is probably a bug
var-const cf43ba0
start with resourcepath tests
var-const 7761737
remove helper functions with asserts in tests
var-const 6404f06
a weirder string to test parsing, update todo
var-const ef584ec
all comparison operators + tests
var-const 068e15c
keyfieldpath
var-const 1a071a4
fix wrong name
var-const 6c14417
comments
var-const 0505370
naming
var-const bb39ef9
style guide order of includes
var-const 355f506
remove reminder
var-const ad7582b
Merge branch 'master' into varconst-port-paths
var-const 62e45a1
Review feedback.
var-const b93f2f4
finish review comments
var-const 868254f
Merge branch 'master' into varconst-port-paths
var-const dfd73cb
Remove accidentally added files
var-const bb8006c
C++ port: add C++ equivalent of FSTDocumentKey.
var-const d672a0a
Review feedback
var-const f288779
Merge branch 'master' into varconst-port-document-key
var-const e106787
merge leftover
var-const 2ff6c49
Review feedback: make implementation of DocumentKey store a shared_pt…
var-const 6ae8395
style.sh
var-const 8414bb8
Merge branch 'master' into varconst-port-document-key
var-const fb710fd
Merge branch 'master' into varconst-port-document-key
wilhuff 4913889
review comments
var-const 2f52e1f
Merge branch 'varconst-port-document-key' of github.com:firebase/fire…
var-const 03163e5
add new files to cmakelists
var-const 0bd9898
remove leftover forward declaration
var-const d507494
fix style
var-const 6583dcc
assert_death -> assert_any_throw; fix incorrect expectation that crea…
var-const 12d37a5
Merge branch 'master' into varconst-port-document-key
var-const File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
Firestore/core/src/firebase/firestore/model/document_key.cc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* 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/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(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_); | ||
} | ||
|
||
const DocumentKey& DocumentKey::Empty() { | ||
static const DocumentKey empty; | ||
return empty; | ||
} | ||
|
||
} // namespace model | ||
} // namespace firestore | ||
} // namespace firebase |
101 changes: 101 additions & 0 deletions
101
Firestore/core/src/firebase/firestore/model/document_key.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
/* | ||
* 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 "Firestore/core/src/firebase/firestore/model/resource_path.h" | ||
#include "absl/strings/string_view.h" | ||
|
||
namespace firebase { | ||
namespace firestore { | ||
namespace model { | ||
|
||
/** | ||
* DocumentKey represents the location of a document in the Firestore database. | ||
*/ | ||
class DocumentKey { | ||
public: | ||
/** Creates a "blank" document key not associated with any document. */ | ||
DocumentKey() : path_{std::make_shared<ResourcePath>()} { | ||
} | ||
|
||
/** 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(const absl::string_view path) { | ||
return DocumentKey{ResourcePath::FromString(path)}; | ||
} | ||
|
||
/** Creates and returns a new document key with the given segments. */ | ||
static DocumentKey FromSegments(std::initializer_list<std::string> list) { | ||
return DocumentKey{ResourcePath{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) { | ||
return path.size() % 2 == 0; | ||
} | ||
|
||
/** The path to the document. */ | ||
const ResourcePath& path() const { | ||
return path_ ? *path_ : Empty().path(); | ||
} | ||
|
||
private: | ||
// This is an optimization to make passing DocumentKey around cheaper (it's | ||
// copied often). | ||
std::shared_ptr<const ResourcePath> path_; | ||
}; | ||
|
||
inline bool operator==(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() == rhs.path(); | ||
} | ||
inline bool operator!=(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() != rhs.path(); | ||
} | ||
inline bool operator<(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() < rhs.path(); | ||
} | ||
inline bool operator<=(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() <= rhs.path(); | ||
} | ||
inline bool operator>(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() > rhs.path(); | ||
} | ||
inline bool operator>=(const DocumentKey& lhs, const DocumentKey& rhs) { | ||
return lhs.path() >= rhs.path(); | ||
} | ||
|
||
} // namespace model | ||
} // namespace firestore | ||
} // namespace firebase | ||
|
||
#endif // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_DOCUMENT_KEY_H_ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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). | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking at other SDKs:
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.
There was a problem hiding this comment.
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 :-).
There was a problem hiding this comment.
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.