From 6deb18c0de1ba060984a2ce4de22dd065a49456d Mon Sep 17 00:00:00 2001 From: Drew Raines Date: Fri, 30 Jun 2017 13:22:20 -0500 Subject: [PATCH] Preliminary support for ARM This commit adds preliminary support for 64-bit ARM architectures. Relates #25318 --- buildSrc/version.properties | 2 +- .../src/test/java/org/elasticsearch/client/SearchIT.java | 2 +- core/licenses/jna-4.4.0-1.jar.sha1 | 1 + core/licenses/jna-4.4.0.jar.sha1 | 1 - .../main/java/org/elasticsearch/bootstrap/SystemCallFilter.java | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 core/licenses/jna-4.4.0-1.jar.sha1 delete mode 100644 core/licenses/jna-4.4.0.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index bec919cf0f6..e92d4f4c2d7 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -10,7 +10,7 @@ snakeyaml = 1.15 # When updating log4j, please update also docs/java-api/index.asciidoc log4j = 2.8.2 slf4j = 1.6.2 -jna = 4.4.0 +jna = 4.4.0-1 # test dependencies randomizedrunner = 2.5.0 diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java index 8dad369cacb..d73e746528d 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java @@ -269,7 +269,7 @@ public class SearchIT extends ESRestHighLevelClientTestCase { assertEquals(5, matrixStats.getFieldCount("num2")); assertEquals(29d, matrixStats.getMean("num2"), 0d); assertEquals(330d, matrixStats.getVariance("num2"), 0d); - assertEquals(-0.13568039346585542, matrixStats.getSkewness("num2"), 0d); + assertEquals(-0.13568039346585542, matrixStats.getSkewness("num2"), 1.0e-16); assertEquals(1.3517561983471074, matrixStats.getKurtosis("num2"), 0d); assertEquals(-767.5, matrixStats.getCovariance("num", "num2"), 0d); assertEquals(-0.9876336291667923, matrixStats.getCorrelation("num", "num2"), 0d); diff --git a/core/licenses/jna-4.4.0-1.jar.sha1 b/core/licenses/jna-4.4.0-1.jar.sha1 new file mode 100644 index 00000000000..6b564834b57 --- /dev/null +++ b/core/licenses/jna-4.4.0-1.jar.sha1 @@ -0,0 +1 @@ +c9dfcec6f07ee4b1d7a6c09a7eaa9dd4fb6d2c79 \ No newline at end of file diff --git a/core/licenses/jna-4.4.0.jar.sha1 b/core/licenses/jna-4.4.0.jar.sha1 deleted file mode 100644 index f760fe11e11..00000000000 --- a/core/licenses/jna-4.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6edc9b4514969d768039acf43f04210b15658cd7 \ No newline at end of file diff --git a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java b/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java index c9971a8a72a..ecb313780f6 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java @@ -242,6 +242,7 @@ final class SystemCallFilter { static { Map m = new HashMap<>(); m.put("amd64", new Arch(0xC000003E, 0x3FFFFFFF, 57, 58, 59, 322, 317)); + m.put("aarch64", new Arch(0xC00000B7, 0xFFFFFFFF, 1079, 1071, 221, 281, 277)); ARCHITECTURES = Collections.unmodifiableMap(m); }