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

Add yield func type to clean up method signatures

pull/269/head
Paul Dix 2014-02-17 13:58:11 -05:00
parent f66d16831c
commit a3ebd57316
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/coordinator/coordinator.go
View File

@ -61,6 +61,8 @@ var (
write = protocol.Request_WRITE write = protocol.Request_WRITE
) )
type seriesYieldFunc func(*protocol.Series) error
// usernames and db names should match this regex // usernames and db names should match this regex
var VALID_NAMES *regexp.Regexp var VALID_NAMES *regexp.Regexp
@ -83,7 +85,7 @@ func NewCoordinatorImpl(datastore datastore.Datastore, raftServer ClusterConsens
return coordinator return coordinator
} }
func (self *CoordinatorImpl) RunQuery(user common.User, database string, queryString string, yield func(*protocol.Series) error) (err error) { func (self *CoordinatorImpl) RunQuery(user common.User, database string, queryString string, yield seriesYieldFunc) (err error) {
// don't let a panic pass beyond RunQuery // don't let a panic pass beyond RunQuery
defer recoverFunc(database, queryString) defer recoverFunc(database, queryString)
@ -146,7 +148,7 @@ func (self *CoordinatorImpl) RunQuery(user common.User, database string, querySt
} }
// This should only get run for SelectQuery types // This should only get run for SelectQuery types
func (self *CoordinatorImpl) runQuery(query *parser.Query, user common.User, database string, yield func(*protocol.Series) error) error { func (self *CoordinatorImpl) runQuery(query *parser.Query, user common.User, database string, yield seriesYieldFunc) error {
querySpec := parser.NewQuerySpec(user, database, query) querySpec := parser.NewQuerySpec(user, database, query)
shards := self.clusterConfiguration.GetShards(querySpec) shards := self.clusterConfiguration.GetShards(querySpec)
fmt.Println("COORD: runQuery shards ") fmt.Println("COORD: runQuery shards ")
@ -173,7 +175,7 @@ func (self *CoordinatorImpl) runQuery(query *parser.Query, user common.User, dat
return nil return nil
} }
func (self *CoordinatorImpl) runListSeriesQuery(querySpec *parser.QuerySpec, yield func(*protocol.Series) error) error { func (self *CoordinatorImpl) runListSeriesQuery(querySpec *parser.QuerySpec, yield seriesYieldFunc) error {
shortTermShards := self.clusterConfiguration.GetShortTermShards() shortTermShards := self.clusterConfiguration.GetShortTermShards()
if len(shortTermShards) > SHARDS_TO_QUERY_FOR_LIST_SERIES { if len(shortTermShards) > SHARDS_TO_QUERY_FOR_LIST_SERIES {
shortTermShards = shortTermShards[:SHARDS_TO_QUERY_FOR_LIST_SERIES] shortTermShards = shortTermShards[:SHARDS_TO_QUERY_FOR_LIST_SERIES]
@ -213,7 +215,7 @@ func (self *CoordinatorImpl) runListSeriesQuery(querySpec *parser.QuerySpec, yie
return nil return nil
} }
func (self *CoordinatorImpl) runDeleteQuery(querySpec *parser.QuerySpec, yield func(*protocol.Series) error) error { func (self *CoordinatorImpl) runDeleteQuery(querySpec *parser.QuerySpec, yield seriesYieldFunc) error {
db := querySpec.Database() db := querySpec.Database()
if !querySpec.User().IsDbAdmin(db) { if !querySpec.User().IsDbAdmin(db) {
return common.NewAuthorizationError("Insufficient permission to write to %s", db) return common.NewAuthorizationError("Insufficient permission to write to %s", db)

2
src/coordinator/interface.go
View File

@ -32,7 +32,7 @@ type Coordinator interface {
ListContinuousQueries(user common.User, db string) ([]*protocol.Series, error) ListContinuousQueries(user common.User, db string) ([]*protocol.Series, error)
// v2 clustering, based on sharding instead of the circular hash ring // v2 clustering, based on sharding instead of the circular hash ring
RunQuery(user common.User, db, query string, yield func(*protocol.Series) error) error RunQuery(user common.User, db, query string, yield seriesYieldFunc) error
} }
type UserManager interface { type UserManager interface {