Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

query isn't always a select query

pull/521/merge
John Shahid 2014-05-30 19:11:30 -04:00
parent 70fb954d44
commit a3d8b3786e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster/shard.go
View File

@ -356,8 +356,8 @@ func (self *ShardData) String() string {
}
func (self *ShardData) ShouldAggregateLocally(querySpec *parser.QuerySpec) bool {
f := querySpec.SelectQuery().GetFromClause()
if f.Type == parser.FromClauseInnerJoin || f.Type == parser.FromClauseMerge {
f := querySpec.GetFromClause()
if f != nil && (f.Type == parser.FromClauseInnerJoin || f.Type == parser.FromClauseMerge) {
return false
}

7
src/parser/query_spec.go
View File

@ -98,6 +98,13 @@ func (self *QuerySpec) SeriesValuesAndColumns() map[*Value][]string {
return self.seriesValuesAndColumns
}
func (self *QuerySpec) GetFromClause() *FromClause {
if q := self.query.SelectQuery; q != nil {
return q.GetFromClause()
}
return nil
}
func (self *QuerySpec) GetGroupByInterval() *time.Duration {
if self.query.SelectQuery == nil {
return nil