Skip to content
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.

Sign up for GitHub

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

Rewrite Show statements to Select #68

Merged
merged 11 commits into from
Mar 8, 2016
Merged

Rewrite Show statements to Select #68

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca78b7e
Introspect csv, Show-rewrite as select, jsontype
Feb 29, 2016
81618e1
Show -> Select rewrite
Mar 1, 2016
e6f5746
Merge branch 'master' into 57_show
Mar 2, 2016
b26ca2b
Update all dependencies to newest
Mar 2, 2016
af1f54d
Schema for Show to Select conversion
Mar 3, 2016
3428b34
Show to select rewrite
Mar 4, 2016
51064f7
rewrite show to select statement refs #57
Mar 5, 2016
a943754
@@vars in SHOW statement with rewrite
Mar 6, 2016
f9a33b5
Show Create Table and cleanup datasource registry
Mar 6, 2016
31806da
remove unused Show, Describe plans
Mar 7, 2016
e94473d
Fix sourceexec implementation
Mar 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix sourceexec implementation
  • Loading branch information
Aaron Raddon committed Mar 8, 2016
commit e94473de706c12f7e26d9a51cf08c38501b1222d
19 changes: 17 additions & 2 deletions exec/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,23 @@ func (m *JobExecutor) WalkCommand(p *plan.Command) (Task, error) {
}
func (m *JobExecutor) WalkSource(p *plan.Source) (Task, error) {
//u.Debugf("%p NewSource? %p", m, p)
if p.SourceExec {
return m.WalkSourceExec(p)
if p.Conn == nil {
u.Warnf("no conn? %T", p.DataSource)
if p.DataSource == nil {
u.Warnf("no datasource")
return nil, fmt.Errorf("missing data source")
}
source, err := p.DataSource.Open(p.Stmt.SourceName())
if err != nil {
return nil, err
}
p.Conn = source
//u.Debugf("setting p.Conn %p %T", p.Conn, p.Conn)
}

e, hasSourceExec := p.Conn.(ExecutorSource)
if hasSourceExec {
return e.WalkExecSource(p)
}
return NewSource(m.Ctx, p)
}
Expand Down
6 changes: 4 additions & 2 deletions exec/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func NewSource(ctx *plan.Context, p *plan.Source) (*Source, error) {
u.Warnf("source %T does not implement datasource.Scanner", p.Conn)
return nil, fmt.Errorf("%T Must Implement Scanner for %q", p.Conn, p.Stmt.String())
}

//u.Debugf("NewSource: hasScanner? %T", scanner)
s := &Source{
TaskBase: NewTaskBase(ctx),
Scanner: scanner,
Expand Down Expand Up @@ -110,7 +110,9 @@ func (m *Source) Run() error {
defer m.Ctx.Recover()
defer close(m.msgOutCh)

//u.Infof("Run() ")
if m.Scanner == nil {
return fmt.Errorf("No datasource found")
}

//u.Debugf("scanner: %T %#v", scanner, scanner)
iter := m.Scanner.CreateIterator(nil)
Expand Down