diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-21 16:11:25 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-21 16:11:25 +0100 |
| commit | d189d83e7c14590027c6342eff8ed28d0af78dcb (patch) | |
| tree | 64afafce940737f1bbd5a0c713784680ee7d48b6 | |
| parent | 88a4c159d2fa483e6b1cbcfc7bc56667e3427828 (diff) | |
Improve comment and cleanup duplicate openhft dependency management
| -rw-r--r-- | container-dev/pom.xml | 4 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/string_hash.cpp | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/container-dev/pom.xml b/container-dev/pom.xml index be497963f6e..85c6371d59c 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -171,10 +171,6 @@ <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </exclusion> - <exclusion> - <groupId>net.openhft</groupId> - <artifactId>zero-allocation-hashing</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 743bcd05b8b..01babcb9020 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -707,11 +707,6 @@ <version>${jna.version}</version> </dependency> <dependency> - <groupId>net.openhft</groupId> - <artifactId>zero-allocation-hashing</artifactId> - <version>0.16</version> - </dependency> - <dependency> <groupId>net.spy</groupId> <artifactId>spymemcached</artifactId> <version>2.10.1</version> diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java index c668292c0ab..6ec08daf3b5 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/StringValue.java @@ -43,7 +43,7 @@ public class StringValue extends Value { byte[] data = value.getBytes(StandardCharsets.UTF_8); long h = LongHashFunction.xx3().hashBytes(data); if ((h & 0x7ff0000000000000L) == 0x7ff0000000000000L) { - // Avoid nan + // Avoid nan and inf h = h & 0xffefffffffffffffL; } return Double.longBitsToDouble(h); diff --git a/vespalib/src/vespa/vespalib/util/string_hash.cpp b/vespalib/src/vespa/vespalib/util/string_hash.cpp index de0865fe86f..b3a6fc51995 100644 --- a/vespalib/src/vespa/vespalib/util/string_hash.cpp +++ b/vespalib/src/vespa/vespalib/util/string_hash.cpp @@ -8,7 +8,7 @@ namespace vespalib { double hash2d(const char *str, size_t len) { size_t h = hashValue(str, len); if ((h & 0x7ff0000000000000ul) == 0x7ff0000000000000ul) { - // Avoid nan + // Avoid nan and inf h = h & 0xffeffffffffffffful; } double d = 0; |