GC unused code and simplify StructFieldValue.

2 files changed, 3 insertions, 65 deletions

diff --git a/storage/src/vespa/storage/storageserver/storagemetricsset.cpp b/storage/src/vespa/storage/storageserver/storagemetricsset.cpp
index f0e64f0dfd1..f3240f0663b 100644
--- a/storage/src/vespa/storage/storageserver/storagemetricsset.cpp
+++ b/storage/src/vespa/storage/storageserver/storagemetricsset.cpp
@@ -16,37 +16,6 @@ MessageMemoryUseMetricSet::MessageMemoryUseMetricSet(metrics::MetricSet* owner)
 
 MessageMemoryUseMetricSet::~MessageMemoryUseMetricSet() = default;
 
-DocumentSerializationMetricSet::DocumentSerializationMetricSet(metrics::MetricSet* owner)
-    : metrics::MetricSet("document_serialization", {{"docserialization"}},
-            "Counts of document serialization of various types", owner),
-      usedCachedSerializationCount(
-            "cached_serialization_count", {{"docserialization"}},
-            "Number of times we didn't need to serialize the document as "
-            "we already had serialized version cached", this),
-      compressedDocumentCount(
-            "compressed_serialization_count", {{"docserialization"}},
-            "Number of times we compressed document when serializing",
-            this),
-      compressionDidntHelpCount(
-            "compressed_didnthelp_count", {{"docserialization"}},
-            "Number of times we compressed document when serializing, but "
-            "the compressed version was bigger, so it was dumped", this),
-      uncompressableCount(
-            "uncompressable_serialization_count", {{"docserialization"}},
-            "Number of times we didn't attempt compression as document "
-            "had already been tagged uncompressable", this),
-      serializedUncompressed(
-            "uncompressed_serialization_count", {{"docserialization"}},
-            "Number of times we serialized a document uncompressed", this),
-      inputWronglySerialized(
-            "input_wrongly_serialized_count", {{"docserialization"}},
-            "Number of times we reserialized a document because the "
-            "compression it had in cache did not match what was configured",
-            this)
-{}
-
-DocumentSerializationMetricSet::~DocumentSerializationMetricSet() = default;
-
 StorageMetricSet::StorageMetricSet()
     : metrics::MetricSet("server", {{"memory"}},
           "Metrics for VDS applications"),
@@ -54,28 +23,12 @@ StorageMetricSet::StorageMetricSet()
       memoryUse_messages(this),
       memoryUse_visiting("memoryusage_visiting", {{"memory"}},
             "Message use from visiting", this),
-      documentSerialization(this),
       tls_metrics(this)
 {}
 
 StorageMetricSet::~StorageMetricSet() = default;
 
 void StorageMetricSet::updateMetrics() {
-    document::SerializableArray::Statistics stats(
-            document::SerializableArray::getStatistics());
-
-    documentSerialization.usedCachedSerializationCount.set(
-            stats._usedCachedSerializationCount);
-    documentSerialization.compressedDocumentCount.set(
-            stats._compressedDocumentCount);
-    documentSerialization.compressionDidntHelpCount.set(
-            stats._compressionDidntHelpCount);
-    documentSerialization.uncompressableCount.set(
-            stats._uncompressableCount);
-    documentSerialization.serializedUncompressed.set(
-            stats._serializedUncompressed);
-    documentSerialization.inputWronglySerialized.set(
-            stats._inputWronglySerialized);
 
     // Delta snapshotting is destructive, so if an explicit snapshot is triggered
     // (instead of just regular periodic snapshots), some events will effectively
diff --git a/storage/src/vespa/storage/storageserver/storagemetricsset.h b/storage/src/vespa/storage/storageserver/storagemetricsset.h
index e9378010540..49795c63324 100644
--- a/storage/src/vespa/storage/storageserver/storagemetricsset.h
+++ b/storage/src/vespa/storage/storageserver/storagemetricsset.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include "tls_statistics_metrics_wrapper.h"
-
 #include <vespa/metrics/metrics.h>
 
 namespace storage {
@@ -17,21 +16,8 @@ public:
     metrics::LongValueMetric highpri;
     metrics::LongValueMetric veryhighpri;
 
-    MessageMemoryUseMetricSet(metrics::MetricSet* owner);
-    ~MessageMemoryUseMetricSet();
-};
-
-struct DocumentSerializationMetricSet : public metrics::MetricSet
-{
-    metrics::LongCountMetric usedCachedSerializationCount;
-    metrics::LongCountMetric compressedDocumentCount;
-    metrics::LongCountMetric compressionDidntHelpCount;
-    metrics::LongCountMetric uncompressableCount;
-    metrics::LongCountMetric serializedUncompressed;
-    metrics::LongCountMetric inputWronglySerialized;
-
-    DocumentSerializationMetricSet(metrics::MetricSet* owner);
-    ~DocumentSerializationMetricSet();
+    explicit MessageMemoryUseMetricSet(metrics::MetricSet* owner);
+    ~MessageMemoryUseMetricSet() override;
 };
 
 struct StorageMetricSet : public metrics::MetricSet
@@ -39,12 +25,11 @@ struct StorageMetricSet : public metrics::MetricSet
     metrics::LongValueMetric memoryUse;
     MessageMemoryUseMetricSet memoryUse_messages;
     metrics::LongValueMetric memoryUse_visiting;
-    DocumentSerializationMetricSet documentSerialization;
 
     TlsStatisticsMetricsWrapper tls_metrics;
 
     StorageMetricSet();
-    ~StorageMetricSet();
+    ~StorageMetricSet() override;
     void updateMetrics();
 };