-
Notifications
You must be signed in to change notification settings - Fork 122
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
Ensure table_schema arg is not modified inplace #278
Ensure table_schema arg is not modified inplace #278
Conversation
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.
Looks great, thanks @bsolomon1124
Re the test failing: are we sure the schema isn't change upstream of load_chunks
? I can look more if it's a quandary.
So, I might be thinking too hard about this one @tswast / @max-sixty , but this seems to only occur if the GBQ table does not exist. Giving myself a headache after a long day at work.. Case 1: Called when In [17]: original_schema = [
...: {"name": "field1", "type": "STRING", "mode": "REQUIRED"},
...: {"name": "field2", "type": "INTEGER"},
...: {"name": "field3", "type": "DATE"},
...: ]
...: gbq.to_gbq(df, "dataset.schematest", project_id="xxx", table_schema=original_schema, if_exists="append")
In [18]: original_schema
Out[18]:
[{'name': 'field1', 'type': 'STRING', 'mode': 'REQUIRED'},
{'name': 'field2', 'type': 'INTEGER', 'mode': 'NULLABLE'},
{'name': 'field3', 'type': 'DATE', 'mode': 'NULLABLE'}] Now, called again directly after the above, when table exists; seemingly no problem here: In [19]: df = DataFrame(
...: {
...: "field1": ["a", "b"],
...: "field2": [1, 2],
...: "field3": [datetime.date(2019, 1, 1), datetime.date(2019, 5, 1)],
...: }
...: )
...: original_schema = [
...: {"name": "field1", "type": "STRING", "mode": "REQUIRED"},
...: {"name": "field2", "type": "INTEGER"},
...: {"name": "field3", "type": "DATE"},
...: ]
...: gbq.to_gbq(df, "dataset.schematest", project_id="xxx", table_schema=original_schema, if_exists="append")
In [20]: original_schema
Out[20]:
[{'name': 'field1', 'type': 'STRING', 'mode': 'REQUIRED'},
{'name': 'field2', 'type': 'INTEGER'},
{'name': 'field3', 'type': 'DATE'}] ...which would seem to imply something funky is happening here: https://github.com/bsolomon1124/pandas-gbq/blob/488f6b7e984757c79bbc4f59b1121fcd6e3afbbf/pandas_gbq/gbq.py#L1124, in the call to |
I think no function in this library should modify its arguments. So we should do the |
Aha. It looks like the same pattern is repeated in https://github.com/bsolomon1124/pandas-gbq/blob/488f6b7e984757c79bbc4f59b1121fcd6e3afbbf/pandas_gbq/gbq.py#L1272. (Seeing some similar patterns in |
Fixes #277. If any dictionary entry in the `table_schema` arg did not contain a "mode" key, a mode="NULLABLE" kv pair would be created; because `schema.update_schema()` returns an object with references to its mutable input, this allows the argument to ultimately be modified by the function rather than the caller. This pattern was used in both gbq.py and load.py, so it was refactored into a helper function in schema.py, which now returns a modified *copy*. Deepcopy is used because the input is a list of dictionaries, so a shallow copy would be insufficient.
Ok, I think we've got it @max-sixty @tswast . See the note above regarding I do wonder if there are other more subtle cases like this hidden in Also, I think that In other words, when |
That's perfect! Ideal design and implementation. I'll merge tomorrow unless anyone has any thoughts. Re the |
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.
LGTM. Thanks!
Fixes #277.
If any dictionary entry in the
table_schema
arg didnot contain a "mode" key, a mode="NULLABLE" kv pair
would be created; because
schema.update_schema()
returns an object with references to its mutable input,
this allows the argument to ultimately be modified
by the function rather than the caller.
This pattern was used in both gbq.py and load.py,
so it was refactored into a helper function in
schema.py, which now returns a modified copy.
Deepcopy is used because the input is a list of
dictionaries, so a shallow copy would be insufficient.