Advanced SQL Analytics Framework #9
+47
−34
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package sql | ||
|
|
||
| import ( | ||
| "errors" | ||
|
|
||
| "github.com/grafana/grafana-plugin-sdk-go/data" | ||
| ) | ||
|
|
||
| type DB struct { | ||
| } | ||
|
|
||
| func (db *DB) TablesList(rawSQL string) ([]string, error) { | ||
| return nil, errors.New("not implemented") | ||
| } | ||
|
Comment on lines
+12
to
+14
There was a problem hiding this comment. logic: This method is called by sql.TablesList() in parser.go but always fails, preventing SQL query validation |
||
|
|
||
| func (db *DB) RunCommands(commands []string) (string, error) { | ||
| return "", errors.New("not implemented") | ||
| } | ||
|
|
||
| func (db *DB) QueryFramesInto(name string, query string, frames []*data.Frame, f *data.Frame) error { | ||
| return errors.New("not implemented") | ||
| } | ||
|
Comment on lines
+20
to
+22
There was a problem hiding this comment. logic: This method is called directly by SQLCommand.Execute() but always fails, breaking SQL expressions when enabled |
||
|
|
||
| func NewInMemoryDB() *DB { | ||
| return &DB{} | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ import ( | |
|
|
||
| "github.com/grafana/grafana/pkg/infra/log" | ||
| "github.com/jeremywohl/flatten" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -21,7 +20,7 @@ var logger = log.New("sql_expr") | |
|
|
||
| // TablesList returns a list of tables for the sql statement | ||
| func TablesList(rawSQL string) ([]string, error) { | ||
| duckDB := NewInMemoryDB() | ||
|
There was a problem hiding this comment. logic: This now calls a stub implementation that always returns 'not implemented' error, breaking SQL parsing functionality There was a problem hiding this comment. logic: This now calls a stub implementation that always returns 'not implemented' error, breaking SQL parsing functionality There was a problem hiding this comment. logic: This now calls a stub implementation that always returns 'not implemented' error, breaking SQL parsing functionality |
||
| rawSQL = strings.Replace(rawSQL, "'", "''", -1) | ||
| cmd := fmt.Sprintf("SELECT json_serialize_sql('%s')", rawSQL) | ||
| ret, err := duckDB.RunCommands([]string{cmd}) | ||
|
Comment on lines
25
to
26
There was a problem hiding this comment. logic: The |
||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ import ( | |
| "time" | ||
|
|
||
| "github.com/grafana/grafana-plugin-sdk-go/data" | ||
|
|
||
| "github.com/grafana/grafana/pkg/apimachinery/errutil" | ||
| "github.com/grafana/grafana/pkg/expr/mathexp" | ||
|
|
@@ -94,11 +93,11 @@ func (gr *SQLCommand) Execute(ctx context.Context, now time.Time, vars mathexp.V | |
|
|
||
| rsp := mathexp.Results{} | ||
|
|
||
| db := sql.NewInMemoryDB() | ||
| var frame = &data.Frame{} | ||
|
|
||
| logger.Debug("Executing query", "query", gr.query, "frames", len(allFrames)) | ||
| err := db.QueryFramesInto(gr.refID, gr.query, allFrames, frame) | ||
| if err != nil { | ||
| logger.Error("Failed to query frames", "error", err.Error()) | ||
| rsp.Error = err | ||
|
|
||
Oops, something went wrong.
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.
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.
logic: Logic error: The double negation here means
enabledwill be true when the feature flag is OFF, which is counterintuitive