commit
be5491ea77
|
@ -1378,7 +1378,7 @@ func MatchSource(sources Sources, name string) string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// Target represents a target (destination) policy, measurment, and DB.
|
// Target represents a target (destination) policy, measurement, and DB.
|
||||||
type Target struct {
|
type Target struct {
|
||||||
// Measurement to write into.
|
// Measurement to write into.
|
||||||
Measurement *Measurement
|
Measurement *Measurement
|
||||||
|
@ -1643,7 +1643,7 @@ func (s *ShowMeasurementsStatement) RequiredPrivileges() ExecutionPrivileges {
|
||||||
return ExecutionPrivileges{{Name: "", Privilege: ReadPrivilege}}
|
return ExecutionPrivileges{{Name: "", Privilege: ReadPrivilege}}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DropMeasurmentStatement represents a command to drop a measurement.
|
// DropMeasurementStatement represents a command to drop a measurement.
|
||||||
type DropMeasurementStatement struct {
|
type DropMeasurementStatement struct {
|
||||||
// Name of the measurement to be dropped.
|
// Name of the measurement to be dropped.
|
||||||
Name string
|
Name string
|
||||||
|
|
|
@ -46,7 +46,7 @@ func (d *DatabaseIndex) Measurement(name string) *Measurement {
|
||||||
return d.measurements[name]
|
return d.measurements[name]
|
||||||
}
|
}
|
||||||
|
|
||||||
// MeasurementSeriesCounts returns the number of measurments and series currently indexed by the database.
|
// MeasurementSeriesCounts returns the number of measurements and series currently indexed by the database.
|
||||||
// Useful for reporting and monitoring.
|
// Useful for reporting and monitoring.
|
||||||
func (d *DatabaseIndex) MeasurementSeriesCounts() (nMeasurements int, nSeries int) {
|
func (d *DatabaseIndex) MeasurementSeriesCounts() (nMeasurements int, nSeries int) {
|
||||||
d.mu.RLock()
|
d.mu.RLock()
|
||||||
|
@ -78,7 +78,7 @@ func (s *DatabaseIndex) createSeriesIndexIfNotExists(measurementName string, ser
|
||||||
return series
|
return series
|
||||||
}
|
}
|
||||||
|
|
||||||
// addMeasurementToIndexIfNotExists creates or retrieves an in memory index object for the measurement
|
// createMeasurementIndexIfNotExists creates or retrieves an in memory index object for the measurement
|
||||||
func (s *DatabaseIndex) createMeasurementIndexIfNotExists(name string) *Measurement {
|
func (s *DatabaseIndex) createMeasurementIndexIfNotExists(name string) *Measurement {
|
||||||
m := s.measurements[name]
|
m := s.measurements[name]
|
||||||
if m == nil {
|
if m == nil {
|
||||||
|
@ -147,6 +147,7 @@ func (db *DatabaseIndex) measurementsByExpr(expr influxql.Expr) (Measurements, e
|
||||||
return nil, fmt.Errorf("%#v", expr)
|
return nil, fmt.Errorf("%#v", expr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// measurementsByTagFilters returns the measurements matching the filters on tag values.
|
||||||
func (db *DatabaseIndex) measurementsByTagFilters(filters []*TagFilter) Measurements {
|
func (db *DatabaseIndex) measurementsByTagFilters(filters []*TagFilter) Measurements {
|
||||||
// If no filters, then return all measurements.
|
// If no filters, then return all measurements.
|
||||||
if len(filters) == 0 {
|
if len(filters) == 0 {
|
||||||
|
|
|
@ -355,7 +355,7 @@ func (q *QueryExecutor) expandSources(sources influxql.Sources) (influxql.Source
|
||||||
// Get measurements from the database that match the regex.
|
// Get measurements from the database that match the regex.
|
||||||
measurements := db.measurementsByRegex(src.Regex.Val)
|
measurements := db.measurementsByRegex(src.Regex.Val)
|
||||||
|
|
||||||
// Add those measurments to the set.
|
// Add those measurements to the set.
|
||||||
for _, m := range measurements {
|
for _, m := range measurements {
|
||||||
m2 := &influxql.Measurement{
|
m2 := &influxql.Measurement{
|
||||||
Database: src.Database,
|
Database: src.Database,
|
||||||
|
|
Loading…
Reference in New Issue