RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fuck you, Travis.

This commit is contained in:
Matt T. Proud 2013-05-20 20:31:58 +02:00
parent e5ac91222b
commit ec5b5bae28
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -2,11 +2,17 @@
language: go language: go
# Detective work is required to ascertain why this is required BOTH in the # Explicitly stop before_script from doing anything by giving 'em nil work.
# before_script directive and in the shell library.
before_script: before_script:
- gvm install go1.1 || true - echo "Before Script"
- gvm use go1.1 || true
# Explicitly stop install from doing anything by giving 'em nil work.
install:
- echo "Install"
script: script:
- echo "Script"
- cd ${TRAVIS_BUILD_DIR}
- gvm install go1.1 || true
- gvm use go1.1 || true
- bash -l ./tests-for-die-in-a-fire-travis.sh - bash -l ./tests-for-die-in-a-fire-travis.sh

12
storage/metric/memory.go
View File

@ -186,7 +186,7 @@ func (s *memorySeriesStorage) GetFingerprintsForLabelSet(l model.LabelSet) (fing
return fingerprints, nil return fingerprints, nil
} }
func (s *memorySeriesStorage) GetFingerprintsForLabelName(l model.LabelName) (fingerprints model.Fingerprints, err error) { func (s *memorySeriesStorage) GetFingerprintsForLabelName(l model.LabelName) (fingerprints model.Fingerprints, _ error) {
values := s.labelNameToFingerprints[l] values := s.labelNameToFingerprints[l]
fingerprints = append(fingerprints, values...) fingerprints = append(fingerprints, values...)
@ -194,7 +194,7 @@ func (s *memorySeriesStorage) GetFingerprintsForLabelName(l model.LabelName) (fi
return fingerprints, nil return fingerprints, nil
} }
func (s memorySeriesStorage) GetMetricForFingerprint(f model.Fingerprint) (model.Metric, error) { func (s *memorySeriesStorage) GetMetricForFingerprint(f model.Fingerprint) (model.Metric, error) {
series, ok := s.fingerprintToSeries[f] series, ok := s.fingerprintToSeries[f]
if !ok { if !ok {
return nil, nil return nil, nil
@ -249,7 +249,7 @@ func (s *memorySeriesStorage) GetValueAtTime(f model.Fingerprint, t time.Time) (
return samples return samples
} }
func (s memorySeriesStorage) GetBoundaryValues(f model.Fingerprint, i model.Interval) (model.Values, model.Values) { func (s *memorySeriesStorage) GetBoundaryValues(f model.Fingerprint, i model.Interval) (model.Values, model.Values) {
return s.GetValueAtTime(f, i.OldestInclusive), s.GetValueAtTime(f, i.NewestInclusive) return s.GetValueAtTime(f, i.OldestInclusive), s.GetValueAtTime(f, i.NewestInclusive)
} }
@ -295,7 +295,7 @@ func (s *memorySeriesStorage) GetRangeValues(f model.Fingerprint, i model.Interv
return samples return samples
} }
func (s memorySeriesStorage) Close() { func (s *memorySeriesStorage) Close() {
s.fingerprintToSeries = map[model.Fingerprint]*stream{} s.fingerprintToSeries = map[model.Fingerprint]*stream{}
s.labelPairToFingerprints = map[model.LabelPair]model.Fingerprints{} s.labelPairToFingerprints = map[model.LabelPair]model.Fingerprints{}
s.labelNameToFingerprints = map[model.LabelName]model.Fingerprints{} s.labelNameToFingerprints = map[model.LabelName]model.Fingerprints{}
@ -324,8 +324,8 @@ func (s *memorySeriesStorage) ForEachSample(builder IteratorsForFingerprintBuild
return return
} }
func NewMemorySeriesStorage() memorySeriesStorage { func NewMemorySeriesStorage() *memorySeriesStorage {
return memorySeriesStorage{ return &memorySeriesStorage{
fingerprintToSeries: make(map[model.Fingerprint]*stream), fingerprintToSeries: make(map[model.Fingerprint]*stream),
labelPairToFingerprints: make(map[model.LabelPair]model.Fingerprints), labelPairToFingerprints: make(map[model.LabelPair]model.Fingerprints),
labelNameToFingerprints: make(map[model.LabelName]model.Fingerprints), labelNameToFingerprints: make(map[model.LabelName]model.Fingerprints),