From 126a171f62f93b01396f8abb93e12c0b50140cfd Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 22 Jun 2018 10:03:14 +0000 Subject: [PATCH] Make 'fast' merger the default --- app/benchmark_internal_test.go | 9 --------- app/collector.go | 4 ++-- app/multitenant/aws_collector.go | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/benchmark_internal_test.go b/app/benchmark_internal_test.go index fa5944654..ec7814e5a 100644 --- a/app/benchmark_internal_test.go +++ b/app/benchmark_internal_test.go @@ -64,15 +64,6 @@ func BenchmarkReportUpgrade(b *testing.B) { } func BenchmarkReportMerge(b *testing.B) { - reports := upgradeReports(readReportFiles(b, *benchReportPath)) - merger := NewSmartMerger() - b.ResetTimer() - for i := 0; i < b.N; i++ { - merger.Merge(reports) - } -} - -func BenchmarkReportFastMerge(b *testing.B) { reports := upgradeReports(readReportFiles(b, *benchReportPath)) merger := NewFastMerger() b.ResetTimer() diff --git a/app/collector.go b/app/collector.go index 93e71ab2b..e0906b11d 100644 --- a/app/collector.go +++ b/app/collector.go @@ -107,7 +107,7 @@ func NewCollector(window time.Duration) Collector { waitableCondition: waitableCondition{ waiters: map[chan struct{}]struct{}{}, }, - merger: NewSmartMerger(), + merger: NewFastMerger(), } } @@ -292,7 +292,7 @@ func NewFileCollector(path string, window time.Duration) (Collector, error) { go replay(collector, timestamps, reports) return collector, nil } - return StaticCollector(NewSmartMerger().Merge(reports).Upgrade()), nil + return StaticCollector(NewFastMerger().Merge(reports).Upgrade()), nil } func timestampFromFilepath(path string) (time.Time, error) { diff --git a/app/multitenant/aws_collector.go b/app/multitenant/aws_collector.go index d0a75dbf3..e9976d958 100644 --- a/app/multitenant/aws_collector.go +++ b/app/multitenant/aws_collector.go @@ -154,7 +154,7 @@ func NewAWSCollector(config AWSCollectorConfig) (AWSCollector, error) { s3: config.S3Store, userIDer: config.UserIDer, tableName: config.DynamoTable, - merger: app.NewSmartMerger(), + merger: app.NewFastMerger(), inProcess: newInProcessStore(reportCacheSize, config.Window), memcache: config.MemcacheClient, window: config.Window,