diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-04-18 13:12:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-18 13:12:55 +0200 |
commit | 4dd12fde1043fb42eeac2917d40e77e2682403e4 (patch) | |
tree | b3f44656ab364bc533cb5783608d11a1e6e8e1d2 /container-search/src/main/java/com/yahoo/prelude | |
parent | 73ef2088a353406467ba0f18e8d483944d228d0c (diff) | |
parent | 2e2d9c57a39425273d12b49183b55b46b5c680b2 (diff) |
Merge pull request #26754 from vespa-engine/bratseth/jdk20
Build with jdk20
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java | 2 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java index 7ba7a13936f..3dac4cb92c0 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java @@ -271,7 +271,7 @@ public class MultiRangeItem<Type extends Number> extends MultiTermItem { if (endInclusive) metadata |= 0b00000100; encoder = type.encoderFor(sortedRanges()); - metadata |= encoder.id << 3; + metadata |= (byte)(encoder.id << 3); buffer.put(metadata); putString(startIndex, buffer); diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java index a7ca62d153c..03a661499e0 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java @@ -67,8 +67,8 @@ abstract class MultiTermItem extends SimpleTaggableItem { super.encodeThis(buffer); byte metadata = 0; - metadata |= (operatorType().code << 5) & 0b11100000; - metadata |= ( termType().code ) & 0b00011111; + metadata |= (byte)((byte)(operatorType().code << 5) & (byte)0b11100000); + metadata |= (byte)(termType().code & (byte)0b00011111); buffer.put(metadata); buffer.putInt(terms()); encodeBlueprint(buffer); |