diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-05 15:24:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 15:24:01 +0100 |
| commit | 87f76621e0952b56513a0206522ee55f4cc9557b (patch) | |
| tree | 4dc722d696fc3c5b0f07d7009de5f1edb946bbfe /container-search/src/main/java/com | |
| parent | 24094168ea91eb1663d9fe2f40b8ba62b552ce19 (diff) | |
Revert "Revert "Balder/again when time is up it is up""
Diffstat (limited to 'container-search/src/main/java/com')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java | 5 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/fs4/QueryPacket.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java index a40f5d55317..63fa313fe72 100644 --- a/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/GetDocSumsPacket.java @@ -102,10 +102,9 @@ public class GetDocSumsPacket extends Packet { buffer.putInt((int)features); buffer.putInt(0); //Unused, was docstamp long timeLeft = query.getTimeLeft(); - final int minTimeout = 50; - buffer.putInt(Math.max(minTimeout, (int)timeLeft)); + buffer.putInt((int)timeLeft); if (log.isLoggable(LogLevel.DEBUG)) { - log.log(LogLevel.DEBUG, "Timeout from query(" + query.getTimeout() + "), sent to backend: " + Math.max(minTimeout, timeLeft)); + log.log(LogLevel.DEBUG, "Timeout from query(" + query.getTimeout() + "), sent to backend: " + timeLeft); } if (queryPacketData != null) diff --git a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java index 1513cf2213c..ff2ca443cbf 100644 --- a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java +++ b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java @@ -123,8 +123,7 @@ public class QueryPacket extends Packet { ignoreableOffset = buffer.position() - relativeZero; IntegerCompressor.putCompressedPositiveNumber(getOffset(), buffer); IntegerCompressor.putCompressedPositiveNumber(getHits(), buffer); - // store the cutoff time in the tag object, and then do a similar Math.max there - buffer.putInt(Math.max(50, (int)query.getTimeLeft())); + buffer.putInt((int)query.getTimeLeft()); ignoreableSize = buffer.position() - relativeZero - ignoreableOffset; buffer.putInt(getFlagInt()); int startOfFieldToSave = buffer.position(); |