From b97adc0d9c185600038025d630dce1fc2c095303 Mon Sep 17 00:00:00 2001 From: Shawn Smith Date: Wed, 4 Oct 2017 17:22:13 +0900 Subject: [PATCH] remove unused stats bolt data --- handlers/check.go | 48 +++----------------------------- handlers/high_scores.go | 12 +------- tools/scores/init_repo_scores.go | 25 ----------------- 3 files changed, 5 insertions(+), 80 deletions(-) diff --git a/handlers/check.go b/handlers/check.go index 7673cc3..9aeeb23 100644 --- a/handlers/check.go +++ b/handlers/check.go @@ -55,18 +55,6 @@ func CheckRepo(db *bolt.DB, repo string, forceRefresh bool) error { log.Println(err) } - // get the old score and store it for stats updating - var oldScore *float64 - if isNewRepo = oldRepoBytes == nil; !isNewRepo { - oldRepo := checksResp{} - err = json.Unmarshal(oldRepoBytes, &oldRepo) - if err != nil { - log.Println("ERROR: could not unmarshal json:", err) - return err - } - oldScore = &oldRepo.Average - } - // if this is a new repo, or the user force-refreshed, update the cache if isNewRepo || forceRefresh { err = db.Update(func(tx *bolt.Tx) error { @@ -82,7 +70,7 @@ func CheckRepo(db *bolt.DB, repo string, forceRefresh bool) error { if err != nil { return err } - return updateMetadata(tx, resp, repo, isNewRepo, oldScore) + return updateMetadata(tx, resp, repo, isNewRepo) }) if err != nil { @@ -183,31 +171,6 @@ func updateHighScores(mb *bolt.Bucket, resp checksResp, repo string) error { return nil } -func updateStats(mb *bolt.Bucket, resp checksResp, oldScore *float64) error { - scores := make([]int, 101, 101) - statsBytes := mb.Get([]byte("stats")) - if statsBytes == nil { - statsBytes, _ = json.Marshal(scores) - } - err := json.Unmarshal(statsBytes, &scores) - if err != nil { - return err - } - scores[int(resp.Average*100)]++ - if oldScore != nil { - scores[int(*oldScore*100)]-- - } - newStats, err := json.Marshal(scores) - if err != nil { - return err - } - err = mb.Put([]byte("stats"), newStats) - if err != nil { - return err - } - return nil -} - func updateReposCount(mb *bolt.Bucket, repo string) (err error) { log.Printf("New repo %q, adding to repo count...", repo) totalInt := 0 @@ -267,7 +230,7 @@ func updateRecentlyViewed(mb *bolt.Bucket, repo string) error { return nil } -func updateMetadata(tx *bolt.Tx, resp checksResp, repo string, isNewRepo bool, oldScore *float64) error { +func updateMetadata(tx *bolt.Tx, resp checksResp, repo string, isNewRepo bool) error { // fetch meta-bucket mb := tx.Bucket([]byte(MetaBucket)) if mb == nil { @@ -280,9 +243,6 @@ func updateMetadata(tx *bolt.Tx, resp checksResp, repo string, isNewRepo bool, o return err } } - err := updateHighScores(mb, resp, repo) - if err != nil { - return err - } - return updateStats(mb, resp, oldScore) + + return updateHighScores(mb, resp, repo) } diff --git a/handlers/high_scores.go b/handlers/high_scores.go index 4774031..b3a03b0 100644 --- a/handlers/high_scores.go +++ b/handlers/high_scores.go @@ -31,7 +31,7 @@ func HighScoresHandler(w http.ResponseWriter, r *http.Request) { } defer db.Close() - count, scores, stats := 0, &ScoreHeap{}, make([]int, 101, 101) + count, scores := 0, &ScoreHeap{} err = db.View(func(tx *bolt.Tx) error { hsb := tx.Bucket([]byte(MetaBucket)) if hsb == nil { @@ -46,15 +46,6 @@ func HighScoresHandler(w http.ResponseWriter, r *http.Request) { } json.Unmarshal(scoreBytes, scores) - statsBytes := hsb.Get([]byte("stats")) - if statsBytes == nil { - statsBytes, err = json.Marshal(stats) - if err != nil { - return err - } - } - json.Unmarshal(statsBytes, &stats) - heap.Init(scores) total := hsb.Get([]byte("total_repos")) @@ -81,7 +72,6 @@ func HighScoresHandler(w http.ResponseWriter, r *http.Request) { t.Execute(w, map[string]interface{}{ "HighScores": sortedScores, - "Stats": stats, "Count": humanize.Comma(int64(count)), "google_analytics_key": googleAnalyticsKey, }) diff --git a/tools/scores/init_repo_scores.go b/tools/scores/init_repo_scores.go index e863fd8..1fd34a0 100644 --- a/tools/scores/init_repo_scores.go +++ b/tools/scores/init_repo_scores.go @@ -26,7 +26,6 @@ func main() { log.Fatal(err) } defer db.Close() - stats := make([]int, 101, 101) err = db.Update(func(tx *bolt.Tx) error { rb := tx.Bucket([]byte(repoBucket)) if rb == nil { @@ -39,33 +38,9 @@ func main() { return err } log.Printf("%s - %.2f", resp.Repo, resp.Average*100) - stats[int(resp.Average*100)]++ return nil }) - // finally update the stats - mb := tx.Bucket([]byte(metaBucket)) - if mb == nil { - return fmt.Errorf("meta bucket not found") - } - var statsBytes []byte - statsBytes, err = json.Marshal(stats) - if err != nil { - return err - } - log.Printf("Stats: %v", stats) - err = mb.Put([]byte("stats"), statsBytes) - if err != nil { - return err - } - - tResp := mb.Get([]byte("stats")) - tStats := []int{} - err = json.Unmarshal(tResp, &tStats) - if err != nil { - return err - } - log.Printf("Stats Confirmation: %v", tStats) return nil }) if err != nil {