Pull in some object store changes #3718
Merged
Conversation
This file contains 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
|
Looks good to me. |
| ObjectSchemaValidationException(object_type), m_old_property(old_property), m_new_property(new_property) | ||
| { | ||
| if (new_property.type != old_property.type) { | ||
| m_what = "Property types for '" + old_property.name + "' property do not match. Old type '" + string_for_property_type(old_property.type) + | ||
| "', new type '" + string_for_property_type(new_property.type) + "'"; | ||
| m_what = util::format("Property types for '%1' property doe not match. Old type '%2', new type '%3'.", |
|
It still looks good. |
bdash
force-pushed
the
mar/update-object-store
branch
from
f61d2a7 to
dbeb922
Compare
The main motivation for this is that building error messages via string concatenation is tedious and makes it hard to judge what the actual message looks like when there are a lot of parts being inserted, to the extent that I've been tempted to leave out some potentially useful information because the code was getting unwieldy. It also has some small functional benefits: bools are printed as true/false rather than 1/0, and it is optimized for minimizing the compiled size. Currently it cuts ~30 KB off librealm-object-store.dylib even with the addition of new functionality.
make_unique<TableView> causes ambiguous call with NDK's default gnustl. Compiler fails to decide which constructor of Query to use.
This brings them into line with the equivalent exceptions used by `Results`. `DetatchedAccessorException` is removed as it is never thrown by `List`.
bdash
force-pushed
the
mar/update-object-store
branch
from
dbeb922 to
b81362f
Compare
|
👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
These changes are primarily recent work related to formatting error messages. The aim here is simply to reduce the diff between our version of the object store and upstream to avoid future merge issues.