From e8a733b52598c53877bed2afae9868cbeb29f4ce Mon Sep 17 00:00:00 2001 From: "Matt T. Proud" Date: Thu, 14 Feb 2013 08:07:59 -0800 Subject: [PATCH 1/2] Interface simplifications. GetFingerprintsForLabelSet ([]*Fingerprint, error) -> GetFingerprintsForLabelSet ([]Fingerprint, error) --- rules/ast/persistence_adapter.go | 2 +- storage/metric/interface.go | 2 +- storage/metric/leveldb/leveldb_test.go | 4 ++-- storage/metric/leveldb/reading.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rules/ast/persistence_adapter.go b/rules/ast/persistence_adapter.go index d0c1c61f8b..2ca1b37d25 100644 --- a/rules/ast/persistence_adapter.go +++ b/rules/ast/persistence_adapter.go @@ -37,7 +37,7 @@ func (p *PersistenceAdapter) getMetricsWithLabels(labels model.LabelSet) ([]*mod } metrics := []*model.Metric{} for _, fingerprint := range fingerprints { - metric, err := p.persistence.GetMetricForFingerprint(*fingerprint) + metric, err := p.persistence.GetMetricForFingerprint(fingerprint) if err != nil { return nil, err } diff --git a/storage/metric/interface.go b/storage/metric/interface.go index 74c4416c25..5280cdc732 100644 --- a/storage/metric/interface.go +++ b/storage/metric/interface.go @@ -34,7 +34,7 @@ type MetricPersistence interface { // Get all of the metric fingerprints that are associated with the provided // label set. - GetFingerprintsForLabelSet(model.LabelSet) ([]*model.Fingerprint, error) + GetFingerprintsForLabelSet(model.LabelSet) ([]model.Fingerprint, error) // Get all of the metric fingerprints that are associated for a given label // name. diff --git a/storage/metric/leveldb/leveldb_test.go b/storage/metric/leveldb/leveldb_test.go index 9d4f9310fe..38faa056ff 100644 --- a/storage/metric/leveldb/leveldb_test.go +++ b/storage/metric/leveldb/leveldb_test.go @@ -887,7 +887,7 @@ func TestGetMetricForFingerprint(t *testing.T) { t.Errorf("Expected one element.") } - v, e := persistence.GetMetricForFingerprint(*result[0]) + v, e := persistence.GetMetricForFingerprint(result[0]) if e != nil { t.Error(e) } @@ -912,7 +912,7 @@ func TestGetMetricForFingerprint(t *testing.T) { t.Errorf("Expected one element.") } - v, e = persistence.GetMetricForFingerprint(*result[0]) + v, e = persistence.GetMetricForFingerprint(result[0]) if e != nil { t.Error(e) diff --git a/storage/metric/leveldb/reading.go b/storage/metric/leveldb/reading.go index a45dfd2451..e76851c4d4 100644 --- a/storage/metric/leveldb/reading.go +++ b/storage/metric/leveldb/reading.go @@ -180,7 +180,7 @@ func (l *LevelDBMetricPersistence) GetLabelNameFingerprints(n *dto.LabelName) (c return } -func (l *LevelDBMetricPersistence) GetFingerprintsForLabelSet(labelSet model.LabelSet) (fps []*model.Fingerprint, err error) { +func (l *LevelDBMetricPersistence) GetFingerprintsForLabelSet(labelSet model.LabelSet) (fps []model.Fingerprint, err error) { begin := time.Now() defer func() { @@ -222,10 +222,10 @@ func (l *LevelDBMetricPersistence) GetFingerprintsForLabelSet(labelSet model.Lab for i := 1; i < numberOfSets; i++ { base = base.Intersection(sets[i]) } - fps = []*model.Fingerprint{} + fps = []model.Fingerprint{} for _, e := range base.Elements() { fingerprint := e.(model.Fingerprint) - fps = append(fps, &fingerprint) + fps = append(fps, fingerprint) } return From f1245e8dda198276c7ea7fa040f79133b5327dfc Mon Sep 17 00:00:00 2001 From: "Matt T. Proud" Date: Thu, 14 Feb 2013 08:19:41 -0800 Subject: [PATCH 2/2] Interface simplifications. GetFingerprintsForLabelName ([]*Fingerprint, error) -> GetFingerprintsForLabelName ([]Fingerprint, error) --- storage/metric/interface.go | 2 +- storage/metric/leveldb/reading.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/storage/metric/interface.go b/storage/metric/interface.go index 5280cdc732..7ec6762414 100644 --- a/storage/metric/interface.go +++ b/storage/metric/interface.go @@ -38,7 +38,7 @@ type MetricPersistence interface { // Get all of the metric fingerprints that are associated for a given label // name. - GetFingerprintsForLabelName(model.LabelName) ([]*model.Fingerprint, error) + GetFingerprintsForLabelName(model.LabelName) ([]model.Fingerprint, error) GetMetricForFingerprint(model.Fingerprint) (*model.Metric, error) diff --git a/storage/metric/leveldb/reading.go b/storage/metric/leveldb/reading.go index e76851c4d4..a2bd6f7cf8 100644 --- a/storage/metric/leveldb/reading.go +++ b/storage/metric/leveldb/reading.go @@ -222,7 +222,6 @@ func (l *LevelDBMetricPersistence) GetFingerprintsForLabelSet(labelSet model.Lab for i := 1; i < numberOfSets; i++ { base = base.Intersection(sets[i]) } - fps = []model.Fingerprint{} for _, e := range base.Elements() { fingerprint := e.(model.Fingerprint) fps = append(fps, fingerprint) @@ -231,7 +230,7 @@ func (l *LevelDBMetricPersistence) GetFingerprintsForLabelSet(labelSet model.Lab return } -func (l *LevelDBMetricPersistence) GetFingerprintsForLabelName(labelName model.LabelName) (fps []*model.Fingerprint, err error) { +func (l *LevelDBMetricPersistence) GetFingerprintsForLabelName(labelName model.LabelName) (fps []model.Fingerprint, err error) { begin := time.Now() defer func() { @@ -240,8 +239,6 @@ func (l *LevelDBMetricPersistence) GetFingerprintsForLabelName(labelName model.L recordOutcome(storageOperations, storageLatency, duration, err, map[string]string{operation: getFingerprintsForLabelName, result: success}, map[string]string{operation: getFingerprintsForLabelName, result: failure}) }() - fps = make([]*model.Fingerprint, 0, 0) - raw, err := l.labelNameToFingerprints.Get(coding.NewProtocolBufferEncoder(model.LabelNameToDTO(&labelName))) if err != nil { return @@ -256,7 +253,7 @@ func (l *LevelDBMetricPersistence) GetFingerprintsForLabelName(labelName model.L for _, m := range unmarshaled.Member { fp := model.Fingerprint(*m.Signature) - fps = append(fps, &fp) + fps = append(fps, fp) } return