Allow using Bytes for ID and switch block explorer to that
#1445
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
lutter
force-pushed
the
lutter/id-bytes
branch
from
f889b25 to
71f42ed
Compare
|
Rebased to latest master |
The correct IdType is closely tied to the subgraph and its schema - ultimately, we need the user to tell us whether their subgraph is suitable for using IdType::Bytes. This change only puts the plumbing in place to do so; we still use IdType::String for all subgraphs.
The metadata subgraph has two tables: entities and entity_history. The latter has a column `id` of type `integer`, and we can therefore not use information_schema to determine whether the subgraph uses `String` or `Bytes` for the primary key
For JSONB storage, we have one table with a `text` id, and one with an `int` id; depending on which one we saw first, we might get confused. Instead, special-case JSONB storage and report that it uses `IdType::String`
lutter
force-pushed
the
lutter/id-bytes
branch
from
b67f0a2 to
2654726
Compare
|
Rebased to latest master |
Jannis
reviewed
Jan 17, 2020
Jannis
requested changes
Jan 19, 2020
| @@ -180,6 +180,18 @@ mod public { | |||
| state -> crate::entities::public::DeploymentSchemaStateMapping, | |||
| } | |||
| } | |||
|
|
|||
| // Access to the bits of the information_schema we care about. It conists | |||
| "bytea" => IdType::Bytes, | ||
| _ => { | ||
| return Err(StoreError::Unknown(format_err!( | ||
| "unsupported type `{}` for primary key column in table {} in schema {}(`{}`)", |
There was a problem hiding this comment.
Shouldn't we put `` around the table {} placeholder too?
| pub enum IdType { | ||
| String, | ||
| #[allow(dead_code)] | ||
| Bytes, |
There was a problem hiding this comment.
Interesting, I didn't know you had already prepared this. 😉
Comment on lines
+231
to
+232
| let bytes = scalar::Bytes::from_str(&s) | ||
| .map_err(|e| DieselError::SerializationError(Box::new(e)))?; |
There was a problem hiding this comment.
Isn't this identical to the new str_as_bytes helper?
| scrubbed | ||
| } | ||
|
|
||
| macro_rules! assert_entity_eq { |
There was a problem hiding this comment.
I have nothing against macros, but this to me looks like it could also just be a regular function; unless I'm missing something?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Map between strings that represent bytes and
byteain the database; the difference between subgraphs that useBytesforIDand those that useStringis transparent to subgraph users. The only exception is that when an entity is stored with an id0xdeadbeefit will be returned as the stringdeadbeefstripping the0xprefix.Currently, this is only used for network indexing; all user-supplied subgraphs still use
Stringas theirIDand there is no way for users to switch toBytes.Fixes #1414