Remove references to SeriesID in DROP SERIES handlers.
#2624
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
|
+1 with changelog. |
| @@ -1448,9 +1448,6 @@ func (s *ShowSeriesStatement) RequiredPrivileges() ExecutionPrivileges { | |||
|
|
|||
| // DropSeriesStatement represents a command for removing a series from the database. | |||
| type DropSeriesStatement struct { | |||
| // The Id of the series being dropped (optional) | |||
| SeriesID uint64 | |||
|
|
|||
| // Data source that fields are extracted from (optional) | |||
| Source Source | |||
There was a problem hiding this comment.
I didn't update this with the regex changes a while back but it probably should be changed to Sources Sources and change parseDropSeriesStatement to call parseSources. Or, we should add an argument to parseSource to disallow regexp.
| @@ -2568,8 +2556,7 @@ func (s *Server) executeDropSeriesStatement(stmt *influxql.DropSeriesStatement, | |||
| return nil, ErrDatabaseNotFound(database) | |||
| } | |||
|
|
|||
| // Get the list of measurements we're interested in. | |||
| measurements, err := measurementsFromSourceOrDB(stmt.Source, db) | |||
| measurements, err := measurementsFromSourcesOrDB(db, stmt.Sources...) | |||
There was a problem hiding this comment.
need to call expandSources before calling measurmentsFromSourcesOrDB
|
+1 |
|
thanks, guys! |
toddboom
added a commit
that referenced
this pull request
May 21, 2015
Remove references to SeriesID in `DROP SERIES` handlers.
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.
Fixes #2563.