Implement parseBytesRef for TimeSeriesRoutingHashFieldType

This implements the `parseBytesRef` method for the `_ts_routing_hash` field so we can parse the values generated by the companion `format` method. We parse the values when fetching them from the source when the field is used as a `sort` paired with `search_after`. Before this change a sort by and search_after `_ts_routing_hash` would yield an `UnsupportedOperationException`
andreidan · Sep 23, 2024 · 7bb5d8f · 7bb5d8f
1 parent 9da39f0
commit 7bb5d8f
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/25_id_generation.yml
@@ -152,6 +152,55 @@ generates a consistent id:
   - match: { hits.hits.8._source.@timestamp: 2021-04-28T18:52:04.467Z }
   - match: { hits.hits.8._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
 
+  - do:
+      search:
+        index: id_generation_test
+        body:
+          query:
+            match_all: {}
+          sort: ["@timestamp", "_ts_routing_hash"]
+          _source: true
+          search_after: [ "2021-04-28T18:50:03.142Z", "cn4exQ" ]
+          docvalue_fields: [_ts_routing_hash]
+
+  - match: {hits.total.value: 9}
+
+  - match: { hits.hits.0._id: cn4excfoxSs_KdA5AAABeRnRFAY }
+  - match: { hits.hits.0.fields._ts_routing_hash: [ cn4exQ ] }
+  - match: { hits.hits.0._source.@timestamp: 2021-04-28T18:50:03.142Z }
+  - match: { hits.hits.0._source.k8s.pod.uid: df3145b3-0563-4d3b-a0f7-897eb2876ea9 }
+
+  - match: { hits.hits.1._id: cZZNs7B9sSWsyrL5AAABeRnRGTM }
+  - match: { hits.hits.1._source.@timestamp: 2021-04-28T18:50:04.467Z }
+  - match: { hits.hits.1._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
+
+  - match: { hits.hits.2._id: cn4excfoxSs_KdA5AAABeRnRYiY }
+  - match: { hits.hits.2._source.@timestamp: 2021-04-28T18:50:23.142Z }
+  - match: { hits.hits.2._source.k8s.pod.uid: df3145b3-0563-4d3b-a0f7-897eb2876ea9 }
+
+  - match: { hits.hits.3._id: cZZNs7B9sSWsyrL5AAABeRnRZ1M }
+  - match: { hits.hits.3._source.@timestamp: 2021-04-28T18:50:24.467Z }
+  - match: { hits.hits.3._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
+
+  - match: { hits.hits.4._id: cZZNs7B9sSWsyrL5AAABeRnRtXM }
+  - match: { hits.hits.4._source.@timestamp: 2021-04-28T18:50:44.467Z }
+  - match: { hits.hits.4._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
+
+  - match: { hits.hits.5._id: cn4excfoxSs_KdA5AAABeRnR11Y }
+  - match: { hits.hits.5._source.@timestamp: 2021-04-28T18:50:53.142Z }
+  - match: { hits.hits.5._source.k8s.pod.uid: df3145b3-0563-4d3b-a0f7-897eb2876ea9 }
+
+  - match: { hits.hits.6._id: cn4excfoxSs_KdA5AAABeRnR_mY }
+  - match: { hits.hits.6._source.@timestamp: 2021-04-28T18:51:03.142Z }
+  - match: { hits.hits.6._source.k8s.pod.uid: df3145b3-0563-4d3b-a0f7-897eb2876ea9 }
+
+  - match: { hits.hits.7._id: cZZNs7B9sSWsyrL5AAABeRnSA5M }
+  - match: { hits.hits.7._source.@timestamp: 2021-04-28T18:51:04.467Z }
+  - match: { hits.hits.7._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
+
+  - match: { hits.hits.8._id: cZZNs7B9sSWsyrL5AAABeRnS7fM }
+  - match: { hits.hits.8._source.@timestamp: 2021-04-28T18:52:04.467Z }
+  - match: { hits.hits.8._source.k8s.pod.uid: 947e4ced-1786-4e53-9e0c-5c447e959507 }
 ---
 index a new document on top of an old one:
   - do:

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java
@@ -65,6 +65,13 @@ public Object format(BytesRef value) {
                 return Uid.decodeId(value.bytes, value.offset, value.length);
             }
 
+            @Override
+            public BytesRef parseBytesRef(Object value) {
+                if (value instanceof BytesRef valueAsBytesRef) {
+                    return valueAsBytesRef;
+                }
+                return new BytesRef(value.toString());
+            }
         };
 
         private TimeSeriesRoutingHashFieldType() {