-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
feat: metadata columns #14057
base: main
Are you sure you want to change the base?
feat: metadata columns #14057
Conversation
return metadata.qualified_field(i - self.inner.len()); | ||
} | ||
} | ||
self.inner.qualified_field(i) |
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.
Is it better not to mix inner field and meta field?
maybe we need another method meta_field(&self, i: usize)
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.
actually implementing another method was my first attempt. but I found that I need to change a lot of code, because column index is used everywhere. that's why in currently implementation metadata column has index + len(fields).
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.
Isn't only where you need meta columns you need to change the code with meta_field
? Others code that call with field
remain the same.
The downside of the current approach is that whenever the schema is changed, the index of meta columns need to adjust too. I think this is error prone. Minimize the dependency of meta schema and schema is better
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.
I see. it's error prone. Can we change the offsets of metadata columns, e.g. (-1 as usize) (-2 as usize) then there's no such problem. I see some databases use this trick.
Isn't only where you need meta columns you need to change the code with meta_field? Others code that call with field remain the same.
yes, we can. but many apis use Vec to represent columns. I have to change many structs and method defnitions to pass extra parameters.
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.
(-1 as usize)
how does this large offset work? We have vector instead of map
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.
Hi @jayzhan211 I pushed a commit, could you please review it again?
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.
Okay this approach looks good to me.
datafusion/common/src/dfschema.rs
Outdated
.collect() | ||
let mut fields: Vec<&Field> = self.inner.fields_with_unqualified_name(name); | ||
if let Some(schema) = self.metadata_schema() { | ||
fields.append(&mut schema.fields_with_unqualified_name(name)); |
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.
fields.append(&mut schema.fields_with_unqualified_name(name)); | |
fields.append(schema.fields_with_unqualified_name(name)); |
datafusion/common/src/dfschema.rs
Outdated
let mut fields: Vec<(Option<&TableReference>, &Field)> = | ||
self.inner.qualified_fields_with_unqualified_name(name); | ||
if let Some(schema) = self.metadata_schema() { | ||
fields.append(&mut schema.qualified_fields_with_unqualified_name(name)); |
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.
fields.append(&mut schema.qualified_fields_with_unqualified_name(name)); | |
fields.append(schema.qualified_fields_with_unqualified_name(name)); |
return ( | ||
Some(table_name.clone()), | ||
Arc::new( | ||
metadata.field(*i - METADATA_OFFSET).clone(), |
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.
handle where i < METADATA_OFFSET
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.
Great, wait others to review this
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.
Thank you @chenkovsky and @jayzhan211 -- this is a neat feature and I think has also been asked for before 💯
Also, I think the code is well structured and tested.
Before we merge this PR I think we need
- a test for more than one metadata column
- ensure this doesn't slow down planning (I will run benchmarks and report back)
I would strongly recommend we do in this PR (but could do as a follow on)
- More documentation (to help others and our future selves use it)
- Change the test to use
assert_batches_eq
&self.inner.schema | ||
} | ||
|
||
pub fn with_metadata_schema( |
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.
Can we please document these APIs
@@ -55,6 +55,11 @@ pub trait TableProvider: Debug + Sync + Send { | |||
/// Get a reference to the schema for this table | |||
fn schema(&self) -> SchemaRef; | |||
|
|||
/// Get metadata columns of this table. | |||
fn metadata_columns(&self) -> Option<SchemaRef> { |
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.
Can you please document this better -- specifically:
- A link to the prior art (spark metadata columns)
- A brief summary of what metadata columns are used for and an example (you can copy the content from the spark docs)
datafusion/common/src/dfschema.rs
Outdated
metadata: Option<QualifiedSchema>, | ||
} | ||
|
||
pub const METADATA_OFFSET: usize = usize::MAX >> 1; |
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.
Can you please document what this is and how it relates to DFSchema::inner
datafusion/common/src/dfschema.rs
Outdated
inner: QualifiedSchema, | ||
/// Stores functional dependencies in the schema. | ||
functional_dependencies: FunctionalDependencies, | ||
/// metadata columns |
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.
Can you provide more documentation here to document what these are (perhaps adding a link to the higher level description you write on TableProvider::metadata_columns
)
pub const METADATA_OFFSET: usize = usize::MAX >> 1; | ||
|
||
#[derive(Debug, Clone, PartialEq, Eq)] | ||
pub struct QualifiedSchema { |
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.
Please document what this struct is used for
} | ||
} | ||
|
||
pub fn metadata_schema(&self) -> &Option<QualifiedSchema> { |
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.
Please add documentation -- imagine you are someone using this API and are not familar with metadata_schema or the content of this API. I think you would want a short summary of what this is and then a link to the full details
use datafusion_common::METADATA_OFFSET; | ||
use itertools::Itertools; | ||
|
||
/// A User, with an id and a bank account |
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.
This is is actually quite a cool example of using metadata index
Eventually I think it would be great to add an example in https://github.com/apache/datafusion/tree/main/datafusion-examples
.unwrap(); | ||
let batch = concat_batches(&all_batchs[0].schema(), &all_batchs).unwrap(); | ||
assert_eq!(batch.num_rows(), 2); | ||
let serializer = CsvSerializer::new().with_header(false); |
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 check the results, can you please use assert_batches_eq
instead of converting to CSV?
That is
- more consistent with the rest of the codebase
- easier to read
- easier to update
For example:
datafusion/datafusion/core/tests/sql/select.rs
Lines 69 to 95 in 167c11e
let expected = vec![ | |
"+----+----+", | |
"| c1 | c2 |", | |
"+----+----+", | |
"| 1 | 1 |", | |
"| 1 | 2 |", | |
"| 1 | 3 |", | |
"| 1 | 4 |", | |
"| 1 | 5 |", | |
"| 1 | 6 |", | |
"| 1 | 7 |", | |
"| 1 | 8 |", | |
"| 1 | 9 |", | |
"| 1 | 10 |", | |
"| 2 | 1 |", | |
"| 2 | 2 |", | |
"| 2 | 3 |", | |
"| 2 | 4 |", | |
"| 2 | 5 |", | |
"| 2 | 6 |", | |
"| 2 | 7 |", | |
"| 2 | 8 |", | |
"| 2 | 9 |", | |
"| 2 | 10 |", | |
"+----+----+", | |
]; | |
assert_batches_sorted_eq!(expected, &results); |
let all_batchs = df5.collect().await.unwrap(); | ||
let batch = concat_batches(&all_batchs[0].schema(), &all_batchs).unwrap(); | ||
let bytes = serializer.serialize(batch, true).unwrap(); | ||
assert_eq!(bytes, "1,2\n"); |
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.
Can we please also add a test for more than one metadata column?
Something other people have asked for in the past (whihc I can't find now) is the ability to know what file a particular row came from in a listing table that combines multiple files Update: I found it at #8906 To be clear I think this PR would enable selecting a subset of files, as described on #8906 (comment) |
We want this as well to hide "special" internal columns we create to speed up JSON columns. +1 for the feature! |
My only question is if "metadata" is the right name for these columns? Could it be "system" columns or something like that? |
Metadata column is the name I'm familiar with in other systems. For example, spark/databricks |
I guess the naming doesn't really hurt our use case so okay let's go with that if it means something in the domain in general 👍🏻 |
FWIW I ran the planning benchmarks on this branch and see no measurable difference. ✅
|
Can these metadata columns utilize normal column properties, like ordering equivalences, constantness, distinctness etc.? For example, AFAIU rowid is an ordered column, and if I sort the table by rowid, the SortExec would be removed? (it seems to me not yet at this point) Can we iterate over the design to support those capabilities, too? |
I with this PR a custom table provider that was ordered by row_id could communicate that information to avoid a SortExec From what I can tell, the metadata columns is only a notion in the Specifically, the |
What I mean is: When I print this query, there exists a SortExec for _rowid. But what I understand is _rowid should be a one-by-one increasing column? |
Maybe not, I use vec to store values in test, but if the inner datastructure is btree, the scan order is not always increasing. |
of course, I want to listen other's opinions. and I also think name is a small thing. changing to system column is also ok. besides _rowid save and load problem. before compare pros and cons, would you mind to add some tests about stopping system column propagation? I haven't seen them on your branch? |
have you seen these? datafusion/datafusion/core/tests/sql/system_columns.rs Lines 318 to 376 in af6e972
|
so for _row_id save load problem. so in your implementation "a system column stops being a system column once it's projected" ? for stopping system column propagation, have you tested other logical plans e.g. union intersect? |
@chenkovsky You mentioned that the issues of #14362 are 1) duplicated field issues 2) HashMap I think overall datafusion only care about the system columns that are generated by datafusion, other system columns from other engine should be considered normal columns, but since this is just based on my guess not from any practical experience, is there any concern of this assumption? For HashMap, I don't think it has performance issue since we only check boolean from it and we don't need to access it frequently given the field should be fixed once created. |
datafusion supports loading files, without such feature, of course, we don't need to take care about this. but with this feature we have to take care about this. and could you please also see the discussion in #14362. we have more different opinions. for example, system/metadata column propagation problem. for _rowid save load problem. currently, data engineers have to write a with clause in #14362 . when using dataframe api, data engineers also have to take more care about metadata dict in #14362. I haven't seen such behavior in other systems. It adds a lot of burden to data engineers. anyway, after #14362 adds more ut about stopping propagation, let's pros and cons. |
I have not tried constructing logical plans directly. My thought was that even if you do some sort of union you'll still have a projection. For example: select *, _rowid
from t1
union all
select *, _rowid
from t2 In this case select *
from t1
union all
select *
from t2 You get no I'm sure you can create funky stuff by constructing a plan without a projection, but I don't think that happens in the real world even with the optimizer: there is always a projection in the first pass and only after that is evaluated would it get pushed down to a tablescan. > SET datafusion.optimizer.max_passes = 0;
0 row(s) fetched.
Elapsed 0.001 seconds.
> create table t (x int, y int);
0 row(s) fetched.
Elapsed 0.002 seconds.
> explain
select *
from t;
+---------------+-----------------------------------------------+
| plan_type | plan |
+---------------+-----------------------------------------------+
| logical_plan | Projection: t.x, t.y |
| | TableScan: t |
| physical_plan | MemoryExec: partitions=1, partition_sizes=[0] |
| | |
+---------------+-----------------------------------------------+
2 row(s) fetched.
Elapsed 0.006 seconds.
> explain
select x
from t;
+---------------+-----------------------------------------------+
| plan_type | plan |
+---------------+-----------------------------------------------+
| logical_plan | Projection: t.x |
| | TableScan: t |
| physical_plan | MemoryExec: partitions=1, partition_sizes=[0] |
| | |
+---------------+-----------------------------------------------+ So I don't think we have to worry about a plan without a projection as long as a plan with a projection correctly evaluates wildcards. |
why do they have to write a INSERT INTO t1
SELECT * FROM t2; Will not include system columns from t2. If they do: INSERT INTO t1
SELECT *, _rowid FROM t2; Then yes this will attempt to insert |
I must say the premise again. just the scenario when data engineers use datafusion as compute engine and want to read and write parquet file. I know there's no problem when we do insert. |
as I previously asked, in your implementation "a system column stops being a system column once it's projected" ? I have to call out it seems that this behavior is incompatible with Spark. I know whether follow Spark's standard is another problem. but community should be aware of this. |
I have to revoke my judgements for #14362 from metadata/system propagation side, because previously judgements are based on the assumption that difference between two approaches is just how to transmit the information, the goal is same. but it seems that it's not true. #14362 has own propagation rules. It's really hard for me to talk about a totally different thing. let's look pros and cons directly. pros of this approach:
|
Do you know the rationale for spark that why it doesn't consider projected columns as normal column? |
If my memory is correct, it's also designed for dataframe api user. for df.withColumn(...).withColumn(...) If project cannot propagate metadata/system columns, it's very hard to use this chain. I cannot tell are there any other differences between spark standard and #14362 's standard because most sqls will have at least one project and implementations are quite different. |
I dont know why it doesn't consider metadata/system column as normal column. from my opnion, normal column can be propagated automatically. but metadata/system column should have another propagate strategy, so putting them in different places is a correct way. I don't know whether I have answered your question. make my statement more clear. I hope that I haven't confused you. @jayzhan211 if a system/metadata column is selected in project, after project, it's normal column now. every design should behavior similarly. |
for #14362 ,if we want to make it feasible, I think at least it should check metadata dict loaded from file for every format. (e.g. parquet), otherwise the whole system may be broken if it reads a file that contains magic meta. Is it right? |
Is this specific to Spark, or do most systems work this way? We should offer customizable options so users can choose their preference—unless this behavior is standard across most systems. |
I agree with you, this should be customizable, although this feature makes dataframe api much easier to use. I think both in this PR and #14362 are customizable, but it's harder in #14362, because many behaviors depend on the assumption "there is always a projection in the first pass, projection will erase system/metadata column". @jayzhan211 could you please also see the UT I put in #14362. you can see that this assumption is not correct in dataframe api. and you can also see the rowid save load problem. when I save a table to csv, it will also save rowid into csv. no system will do like this. |
My problem is with this statement. I don't think there's a universal definition and use case for "system columns". Spark has one. Postgres has another. Our system has another. You use In our case we use system columns to speed up access to JSON: we take a row with json data such as In Postgres: ff=# create table test (x int);
CREATE TABLE
ff=# insert into test values (1);
INSERT 0 1
ff=# \copy (select ctid, * from test) TO 'out.csv' WITH (FORMAT CSV, HEADER);
COPY 1
It's perfectly happy to copy a system column to a file, another table, etc. My thought is to establish a piece of metadata marking a column as a system column with the implementation doing nothing beyond excluding them from |
first, the assumption of projection is not correct in dataframe, right? I agree with you. there's no universal definition. But If I'm a logical plan implementer. in this PR, if I want to support system column, I can create another logical plan. If I don't want to support system column. I even don't need to take care of what is system column. But in #14362 , If I want to support system column, it's easy, because it's propagated automatically, but If I don't want to support system column, I have to take care to erase it, e.g. CopyTo. at least this is counterintuitive for me. Why do I have to take care of something I don't support? for save files, maybe we can implmenent different logical plan for postgres and spark, or just set a switch flag. but if the assumption is not correct, the affected logical plan is not only CopyTo. maybe not only in logical plan, other places where schema is used will be impacted. it's leaked. BTW, maybe CopyTo is much complex than a switch flag. But it's another story. there are two types of system/metadata columns. feel free to correct me.
|
sorry for my arbitrary conclusion, |
I am sorry I have not been following along this PR closely -- is it ready for a final review @chenkovsky and @adriangb ? |
@alamb The discussion was very lively. from my opinion, the pros of this PR are: dataframe api friendly, spark compatible, no need to worry about metadata/system column leakage. for #14362, it makes an assumption on project plan which is not correct for dataframe api, and it should check schema of user input file, otherwise the magic metadata dict will be loaded from file. and it should pay more attention to prevent metadata/system column leakage. in this PR, there are no such problems. In part I agree with @adriangb, If I have another choice, I won't use offset. But I think there is no better option. we also want to hear your opinions. |
Yep I agree with your summary @chenkovsky @alamb , TLDR from my perspective is:
|
Which issue does this PR close?
Closes #13975.
Rationale for this change
many databases support pseudo columns, for example, file_path, file_name, file_size, rowid.
for pseudo columns, we don't want to get them by default, but we want to be able to use them explicitly.
for the database that supports rowid.
select * from tb
won't return rowid. but we can get rowid byselect rowid, * from tb
. spark has already supported metadata columns. this PR want to support it in datafusion.What changes are included in this PR?
Are these changes tested?
Unit test is added
Are there any user-facing changes?
No
For FFI table provider API, one function that returns metadata column is added.