Use your own rankprofile, and avoid breaking public API.

1 files changed, 9 insertions, 15 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/SessionId.java b/container-search/src/main/java/com/yahoo/search/query/SessionId.java
index b4b844961f6..38fdadd7c59 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SessionId.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SessionId.java
@@ -1,7 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query;
 
-import com.yahoo.container.Server;
+import com.yahoo.text.Utf8String;
+
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
@@ -12,23 +13,16 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class SessionId {
 
-    private static final String serverId = Server.get().getServerDiscriminator();
-    private static final AtomicLong sequenceCounter = new AtomicLong();
-
-    private final String id;
+    private final Utf8String id;
 
-    private SessionId(String serverId, long timestamp, long sequence) {
-        this.id = serverId + "." + timestamp + "." + sequence;
+    public SessionId(UniqueRequestId requestId, String extraDifferentiator) {
+        this.id = new Utf8String(requestId.toString() + "." + extraDifferentiator);
     }
 
-    public String toString() { return id; }
-
-    /**
-     * Creates a session id which is unique across the cluster this runtime is a member of each time this is called.
-     * Calling this causes synchronization.
-     */
-    public static SessionId next() {
-        return new SessionId(serverId, System.currentTimeMillis(), sequenceCounter.getAndIncrement());
+    @Override
+    public String toString() {
+        return id.toString();
     }
 
+    public Utf8String asUtf8String() { return id; }
 }