From ce4f560e4826c94254bbdfd51b59e9d286cafeee Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Mon, 11 Mar 2013 14:59:28 -0700 Subject: [PATCH] Encapsulate fingerprint frontier checks in renderView(). --- storage/metric/frontier.go | 4 ++++ storage/metric/tiered.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/storage/metric/frontier.go b/storage/metric/frontier.go index a1e4b579c..d6d612adb 100644 --- a/storage/metric/frontier.go +++ b/storage/metric/frontier.go @@ -38,6 +38,10 @@ func (f *diskFrontier) String() string { return fmt.Sprintf("diskFrontier from %s at %s to %s at %s", f.firstFingerprint.ToRowKey(), f.firstSupertime, f.lastFingerprint.ToRowKey(), f.lastSupertime) } +func (f *diskFrontier) ContainsFingerprint(fingerprint model.Fingerprint) bool { + return fingerprint.Less(f.firstFingerprint) || f.lastFingerprint.Less(fingerprint) +} + func newDiskFrontier(i iterator) (d *diskFrontier, err error) { i.SeekToLast() if i.Key() == nil { diff --git a/storage/metric/tiered.go b/storage/metric/tiered.go index 92f99a775..2aef30b1b 100644 --- a/storage/metric/tiered.go +++ b/storage/metric/tiered.go @@ -365,7 +365,7 @@ func (t *tieredStorage) renderView(viewJob viewJob) (err error) { ) // fmt.Printf("Starting scan of %s...\n", scanJob) - if !(t.diskFrontier == nil || scanJob.fingerprint.Less(t.diskFrontier.firstFingerprint) || t.diskFrontier.lastFingerprint.Less(scanJob.fingerprint)) { + if t.diskFrontier != nil || t.diskFrontier.ContainsFingerprint(scanJob.fingerprint) { // fmt.Printf("Using diskFrontier %s\n", t.diskFrontier) seriesFrontier, err := newSeriesFrontier(scanJob.fingerprint, *t.diskFrontier, iterator) // fmt.Printf("Using seriesFrontier %s\n", seriesFrontier)