From 0cceea148e0bba90057fa4b170b558c208ada290 Mon Sep 17 00:00:00 2001
From: takamabe <7151956+takamabe@users.noreply.github.com>
Date: Fri, 27 Aug 2021 12:05:05 +0900
Subject: set timeout for clone query

---
 container-search/src/main/java/com/yahoo/search/Query.java        | 1 +
 .../src/test/java/com/yahoo/search/test/QueryTestCase.java        | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'container-search')

diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java
index 4ecede819de..8c3a30a5a4d 100644
--- a/container-search/src/main/java/com/yahoo/search/Query.java
+++ b/container-search/src/main/java/com/yahoo/search/Query.java
@@ -982,6 +982,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable {
         clone.properties().setParentQuery(clone);
         assert (clone.properties().getParentQuery() == clone);
 
+        clone.setTimeout(getTimeout());
         clone.setTraceLevel(getTraceLevel());
         clone.setExplainLevel(getExplainLevel());
         clone.setHits(getHits());
diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index ecedcfd0f16..59178b9419a 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -294,6 +294,14 @@ public class QueryTestCase {
         }
     }
 
+    @Test
+    public void testCloneTimeout() {
+        Query q = new Query(httpEncode("/search?timeout=300ms"));
+        assertEquals(300, q.getTimeout());
+        Query clonedQ = q.clone();
+        assertEquals(300, clonedQ.getTimeout());
+    }
+
     @Test
     public void testQueryProfileSubstitution1() {
         QueryProfile profile = new QueryProfile("myProfile");
-- 
cgit v1.2.3