fix: remove unused time column when update dataset #14969
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
Codecov Report
@@ Coverage Diff @@
## master #14969 +/- ##
==========================================
- Coverage 77.08% 76.84% -0.24%
==========================================
Files 984 984
Lines 51787 51796 +9
Branches 7036 7041 +5
==========================================
- Hits 39920 39804 -116
- Misses 11642 11767 +125
Partials 225 225
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
|
Awesome PR description! thanks for the fix 🙏 |
|
@junlincc Ephemeral environment spinning up at http://52.42.220.175:8080. Credentials are |
zhaoyongjie
force-pushed
the
remove_time_column
branch
from
ba74605
to
c60d9a8
Compare
|
Ephemeral environment shutdown and build artifacts deleted. |
villebro
reviewed
Jun 8, 2021
superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
Outdated
Show resolved
Hide resolved
Comment on lines
121
to
134
| // remove time column in the form_data | ||
| const timeCol = this.props.form_data?.granularity_sqla; // eslint-disable-line camelcase | ||
| const { columns } = this.props.datasource; | ||
| if ( | ||
| datasource.type === 'table' && | ||
| !columns.find(({ column_name }) => column_name === timeCol)?.is_dttm // eslint-disable-line camelcase | ||
| ) { | ||
| this.props.actions.setControlValue('granularity_sqla', null); | ||
| } |
There was a problem hiding this comment.
When the time column control is empty and a column is made is_dttm, the time column control stays empty, despite being required (not possible to remove value once set). Would it make sense to default to the first temporal column if the value is unset? Something like this:
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
index 873067565..44452fb0c 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -121,12 +121,20 @@ class DatasourceControl extends React.PureComponent {
// remove time column in the form_data
const timeCol = this.props.form_data?.granularity_sqla; // eslint-disable-line camelcase
const { columns } = this.props.datasource;
+ const firstDttmCol = columns.find(column => column.is_dttm);
if (
datasource.type === 'table' &&
+ timeCol &&
!columns.find(({ column_name }) => column_name === timeCol)?.is_dttm // eslint-disable-line camelcase
) {
this.props.actions.setControlValue('granularity_sqla', null);
+ } else if (datasource.type === 'table' && !timeCol && firstDttmCol) {
+ this.props.actions.setControlValue(
+ 'granularity_sqla',
+ firstDttmCol.column_name,
+ );
}
+
if (this.props.onDatasourceSave) {
this.props.onDatasourceSave(datasource);
}There was a problem hiding this comment.
thanks for your comments! This has the side effect of leaving an unexpected column to do the filtering and grain(in other words, first datetime column depends on the order of the columns in the database.). What do you think about?
There was a problem hiding this comment.
Done this change. Thanks for the comment!
zhaoyongjie
force-pushed
the
remove_time_column
branch
from
c60d9a8
to
37c00eb
Compare
zhaoyongjie
force-pushed
the
remove_time_column
branch
from
37c00eb
to
d6a8a5a
Compare
opus-42
pushed a commit
to opus-42/incubator-superset
that referenced
this pull request
Nov 14, 2021
* fix: remove unused time column when update dataset * fix lint * set dttm to first datatime column
cccs-RyanS
pushed a commit
to CybercentreCanada/superset
that referenced
this pull request
Dec 17, 2021
* fix: remove unused time column when update dataset * fix lint * set dttm to first datatime column
QAlexBall
pushed a commit
to QAlexBall/superset
that referenced
this pull request
Dec 29, 2021
* fix: remove unused time column when update dataset * fix lint * set dttm to first datatime column
cccs-rc
pushed a commit
to CybercentreCanada/superset
that referenced
this pull request
Mar 6, 2024
* fix: remove unused time column when update dataset * fix lint * set dttm to first datatime column
mistercrunch
added
🏷️ bot
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.
SUMMARY
closes: #14683
superset-ui related PR: apache-superset/superset-ui#1148
Since the early Superset TableSource references to Druid table structure, there was always a time dimension(time partition column) in all tables(as known as, datasource or dataset). But this concept is not suitable for other data warehouses or databases.
There is a
main_dttm_colfield in the superset dataset, service time dimension. Now if a time column is not passed to superset backend, themain_dttm_colwill be used in the time column.This change
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
Before
before.mp4
After
after.mp4
TESTING INSTRUCTIONS
ADDITIONAL INFORMATION