add Series getter for hashCode, modify write cache conditions, enhanc…

…e test (#731) * add Series getter for hashCode, modify write cache conditions, update tests * eliminate dup code
spotify · Dec 18, 2020 · 5f757f5 · 5f757f5
1 parent 08a9405
commit 5f757f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/heroic-component/src/main/java/com/spotify/heroic/common/Series.java b/heroic-component/src/main/java/com/spotify/heroic/common/Series.java
@@ -153,6 +153,11 @@ public HashCode getHashCodeTagOnly() {
       return hashCodeTagOnly;
     }
 
+    @JsonIgnore
+    public HashCode getHashCode() {
+        return hashCode;
+    }
+
     private HashCode generateHashTagOnly() {
       final Hasher hasher = HASH_FUNCTION.newHasher();
 

diff --git a/...ic-test/src/main/java/com/spotify/heroic/test/AbstractMetadataBackendIndexResourceIT.java b/...ic-test/src/main/java/com/spotify/heroic/test/AbstractMetadataBackendIndexResourceIT.java
@@ -94,7 +94,7 @@ public abstract class AbstractMetadataBackendIndexResourceIT {
     );
     protected final Series s3 = Series.of(
         "s3",
-        ImmutableMap.of("role", "baz"),
+        ImmutableMap.of("role", "bar"),
         ImmutableMap.of("podname", "foo-bar-789")
     );
 

diff --git a/...sticsearch/src/main/java/com/spotify/heroic/metadata/elasticsearch/MetadataBackendKV.java b/...sticsearch/src/main/java/com/spotify/heroic/metadata/elasticsearch/MetadataBackendKV.java
@@ -236,13 +236,21 @@ public AsyncFuture<WriteMetadata> write(
                 try (Scope ignored = tracer.withSpan(span)) {
                     span.putAttribute("index", AttributeValue.stringAttributeValue(index));
 
-                    if (!writeCache.acquire(Pair.of(index, series.getHashCodeTagOnly()),
+                    HashCode hc =
+                        indexResourceIdentifiers ?
+                            series.getHashCode() :
+                            series.getHashCodeTagOnly();
+
+                    if (!writeCache.acquire(Pair.of(index, hc),
                         reporter::reportWriteDroppedByCacheHit)) {
                         span.setStatus(
-                            Status.ALREADY_EXISTS.withDescription("Write dropped by cache hit"));
+                            Status
+                                .ALREADY_EXISTS
+                                .withDescription("Write dropped by cache hit"));
                         span.end();
                         continue;
                     }
+
                     indexSpans.add(span);
 
                     final XContentBuilder source = XContentFactory.jsonBuilder();