Remove unused code

4 files changed, 0 insertions, 33 deletions

diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
index b47b3b59b4f..904e8a66c27 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
@@ -6,7 +6,6 @@
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/storage/common/content_bucket_space_repo.h>
 #include <vespa/storage/common/nodestateupdater.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index d1f0a24178a..bf0244255c1 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -11,7 +11,6 @@
 #include <vespa/storage/config/config-stor-server.h>
 #include <vespa/storage/persistence/bucketownershipnotifier.h>
 #include <vespa/storage/persistence/persistencethread.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/storageapi/message/batch.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/state.h>
diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
index 01a84177e43..650637f206d 100644
--- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
+++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
@@ -2,7 +2,6 @@
 
 #include "bucketintegritychecker.h"
 #include <vespa/storage/common/bucketmessages.h>
-#include <vespa/storage/storageutil/log.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/vdslib/distribution/distribution.h>
diff --git a/storage/src/vespa/storage/storageutil/log.h b/storage/src/vespa/storage/storageutil/log.h
deleted file mode 100644
index f7e89443b32..00000000000
--- a/storage/src/vespa/storage/storageutil/log.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-#include <vespa/log/log.h>
-
-#define STORAGE_LOG_INTERVAL 30
-
-#define STORAGE_LOG_COUNT(name, interval)   do { \
-                                static uint64_t C_count ## name = 0; \
-                                static time_t C_last ## name = time(NULL); \
-                                C_count ## name ++; \
-                                time_t C_now ## name = time(NULL); \
-                                if (C_now  ## name - C_last ## name >= interval)  { \
-                                    EV_COUNT(#name, C_count ## name); \
-                                    C_last ## name = C_now ## name;       \
-                                } } while (false)
-
-#define STORAGE_LOG_AVERAGE(name, value, interval) do {  \
-                                static uint64_t A_count ## name = 0; \
-                                static float A_total ## name = 0.0; \
-                                static time_t A_last ## name = time(NULL); \
-                                A_count ## name ++; \
-                                A_total ## name += value; \
-                                time_t A_now ## name = time(NULL); \
-                                if (A_now  ## name - A_last ## name >= interval)  { \
-                                    EV_VALUE(#name, A_total ## name / A_count ## name); \
-                                    A_count ## name = 0; \
-                                    A_total ## name = 0; \
-                                    A_last ## name = A_now ## name;       \
-                                }} while (false)
-