You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2020/06/16 19:39:47 UTC
[orc] branch branch-1.6 updated (efd77c1 -> fe85f9b)
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a change to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git.
from efd77c1 Preparing for post-1.6.3 development.
new c461853 ORC-609: Upgrade aircompressor to 0.16
new fe85f9b ORC-641: Remove unnecessary stubs for Slice
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/core/src/java/io/airlift/slice/Slice.java | 38 ------
java/core/src/java/io/airlift/slice/Slices.java | 26 ----
.../java/io/airlift/slice/UnsafeSliceFactory.java | 33 -----
.../core/src/java/io/airlift/slice/UnsafeUtil.java | 66 ----------
java/core/src/java/io/airlift/slice/XxHash64.java | 139 ---------------------
java/pom.xml | 8 +-
6 files changed, 1 insertion(+), 309 deletions(-)
delete mode 100644 java/core/src/java/io/airlift/slice/Slice.java
delete mode 100644 java/core/src/java/io/airlift/slice/Slices.java
delete mode 100644 java/core/src/java/io/airlift/slice/UnsafeSliceFactory.java
delete mode 100644 java/core/src/java/io/airlift/slice/UnsafeUtil.java
delete mode 100644 java/core/src/java/io/airlift/slice/XxHash64.java
[orc] 02/02: ORC-641: Remove unnecessary stubs for Slice
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git
commit fe85f9b133cb71aaa15ad833861a09db214a1d11
Author: David Phillips <da...@acz.org>
AuthorDate: Mon Jun 15 19:18:45 2020 -0700
ORC-641: Remove unnecessary stubs for Slice
Aircompressor no longer depends on Slice.
Fixes #515
Signed-off-by: Owen O'Malley <om...@apache.org>
---
java/core/src/java/io/airlift/slice/Slice.java | 38 ------
java/core/src/java/io/airlift/slice/Slices.java | 26 ----
.../java/io/airlift/slice/UnsafeSliceFactory.java | 33 -----
.../core/src/java/io/airlift/slice/UnsafeUtil.java | 66 ----------
java/core/src/java/io/airlift/slice/XxHash64.java | 139 ---------------------
5 files changed, 302 deletions(-)
diff --git a/java/core/src/java/io/airlift/slice/Slice.java b/java/core/src/java/io/airlift/slice/Slice.java
deleted file mode 100644
index e768a2c..0000000
--- a/java/core/src/java/io/airlift/slice/Slice.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.airlift.slice;
-
-/**
- * A stub to avoid the jol-core dependency of slice.
- */
-public final class Slice {
- final Object base;
- final long address;
- final int length;
-
- public Slice() {
- this(null, 0, 0);
- }
-
- public Slice(Object base, long address, int length) {
- this.base = base;
- this.address = address;
- this.length = length;
- }
-}
diff --git a/java/core/src/java/io/airlift/slice/Slices.java b/java/core/src/java/io/airlift/slice/Slices.java
deleted file mode 100644
index 320e8c2..0000000
--- a/java/core/src/java/io/airlift/slice/Slices.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.airlift.slice;
-
-/**
- * A stub to avoid the jol-core dependency of slice.
- */
-public final class Slices {
- public static final Slice EMPTY_SLICE = new Slice();
-}
diff --git a/java/core/src/java/io/airlift/slice/UnsafeSliceFactory.java b/java/core/src/java/io/airlift/slice/UnsafeSliceFactory.java
deleted file mode 100644
index 654045e..0000000
--- a/java/core/src/java/io/airlift/slice/UnsafeSliceFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.airlift.slice;
-
-/**
- * A stub to avoid the jol-core dependency of slice.
- */
-public final class UnsafeSliceFactory {
-
- public static UnsafeSliceFactory getInstance() {
- return new UnsafeSliceFactory();
- }
-
- public Slice newSlice(Object base, long address, int length) {
- return new Slice(base, address, length);
- }
-}
diff --git a/java/core/src/java/io/airlift/slice/UnsafeUtil.java b/java/core/src/java/io/airlift/slice/UnsafeUtil.java
deleted file mode 100644
index 61b4608..0000000
--- a/java/core/src/java/io/airlift/slice/UnsafeUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.airlift.slice;
-
-import io.airlift.compress.IncompatibleJvmException;
-import sun.misc.Unsafe;
-
-import java.lang.reflect.Field;
-import java.nio.Buffer;
-import java.nio.ByteOrder;
-
-import static java.lang.String.format;
-
-final class UnsafeUtil
-{
- public static final Unsafe UNSAFE;
- private static final Field ADDRESS_ACCESSOR;
-
- private UnsafeUtil() {}
-
- static {
- ByteOrder order = ByteOrder.nativeOrder();
- if (!order.equals(ByteOrder.LITTLE_ENDIAN)) {
- throw new IncompatibleJvmException(format("Zstandard requires a little endian platform (found %s)", order));
- }
-
- try {
- Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
- theUnsafe.setAccessible(true);
- UNSAFE = (Unsafe) theUnsafe.get(null);
- }
- catch (Exception e) {
- throw new IncompatibleJvmException("Zstandard requires access to sun.misc.Unsafe");
- }
-
- try {
- Field field = Buffer.class.getDeclaredField("address");
- field.setAccessible(true);
- ADDRESS_ACCESSOR = field;
- }
- catch (Exception e) {
- throw new IncompatibleJvmException("Zstandard requires access to java.nio.Buffer raw address field");
- }
- }
-
- public static long getAddress(Buffer buffer)
- {
- try {
- return (long) ADDRESS_ACCESSOR.get(buffer);
- }
- catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/java/core/src/java/io/airlift/slice/XxHash64.java b/java/core/src/java/io/airlift/slice/XxHash64.java
deleted file mode 100644
index 6cb5bfc..0000000
--- a/java/core/src/java/io/airlift/slice/XxHash64.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.airlift.slice;
-
-import static io.airlift.slice.UnsafeUtil.UNSAFE;
-import static java.lang.Long.rotateLeft;
-
-// forked from https://github.com/airlift/slice
-public final class XxHash64
-{
- private static final long PRIME64_1 = 0x9E3779B185EBCA87L;
- private static final long PRIME64_2 = 0xC2B2AE3D27D4EB4FL;
- private static final long PRIME64_3 = 0x165667B19E3779F9L;
- private static final long PRIME64_4 = 0x85EBCA77C2b2AE63L;
- private static final long PRIME64_5 = 0x27D4EB2F165667C5L;
-
- private XxHash64() {}
-
- public static long hash(long seed, Slice slice)
- {
- long hash;
- if (slice.length >= 32) {
- hash = updateBody(seed, slice.base, slice.address, slice.length);
- }
- else {
- hash = seed + PRIME64_5;
- }
-
- hash += slice.length;
-
- // round to the closest 32 byte boundary
- // this is the point up to which updateBody() processed
- int index = slice.length & 0xFFFFFFE0;
-
- return updateTail(hash, slice.base, slice.address, index, slice.length);
- }
-
- private static long updateTail(long hash, Object base, long address, int index, int length)
- {
- while (index <= length - 8) {
- hash = updateTail(hash, UNSAFE.getLong(base, address + index));
- index += 8;
- }
-
- if (index <= length - 4) {
- hash = updateTail(hash, UNSAFE.getInt(base, address + index));
- index += 4;
- }
-
- while (index < length) {
- hash = updateTail(hash, UNSAFE.getByte(base, address + index));
- index++;
- }
-
- hash = finalShuffle(hash);
-
- return hash;
- }
-
- private static long updateBody(long seed, Object base, long address, int length)
- {
- long v1 = seed + PRIME64_1 + PRIME64_2;
- long v2 = seed + PRIME64_2;
- long v3 = seed;
- long v4 = seed - PRIME64_1;
-
- int remaining = length;
- while (remaining >= 32) {
- v1 = mix(v1, UNSAFE.getLong(base, address));
- v2 = mix(v2, UNSAFE.getLong(base, address + 8));
- v3 = mix(v3, UNSAFE.getLong(base, address + 16));
- v4 = mix(v4, UNSAFE.getLong(base, address + 24));
-
- address += 32;
- remaining -= 32;
- }
-
- long hash = rotateLeft(v1, 1) + rotateLeft(v2, 7) + rotateLeft(v3, 12) + rotateLeft(v4, 18);
-
- hash = update(hash, v1);
- hash = update(hash, v2);
- hash = update(hash, v3);
- hash = update(hash, v4);
-
- return hash;
- }
-
- private static long mix(long current, long value)
- {
- return rotateLeft(current + value * PRIME64_2, 31) * PRIME64_1;
- }
-
- private static long update(long hash, long value)
- {
- long temp = hash ^ mix(0, value);
- return temp * PRIME64_1 + PRIME64_4;
- }
-
- private static long updateTail(long hash, long value)
- {
- long temp = hash ^ mix(0, value);
- return rotateLeft(temp, 27) * PRIME64_1 + PRIME64_4;
- }
-
- private static long updateTail(long hash, int value)
- {
- long unsigned = value & 0xFFFF_FFFFL;
- long temp = hash ^ (unsigned * PRIME64_1);
- return rotateLeft(temp, 23) * PRIME64_2 + PRIME64_3;
- }
-
- private static long updateTail(long hash, byte value)
- {
- int unsigned = value & 0xFF;
- long temp = hash ^ (unsigned * PRIME64_5);
- return rotateLeft(temp, 11) * PRIME64_1;
- }
-
- private static long finalShuffle(long hash)
- {
- hash ^= hash >>> 33;
- hash *= PRIME64_2;
- hash ^= hash >>> 29;
- hash *= PRIME64_3;
- hash ^= hash >>> 32;
- return hash;
- }
-}
[orc] 01/02: ORC-609: Upgrade aircompressor to 0.16
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git
commit c461853a377ec5d2c05c9a10b996f4711ac0c5c5
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Fri Mar 6 11:29:45 2020 -0800
ORC-609: Upgrade aircompressor to 0.16
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
java/pom.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/java/pom.xml b/java/pom.xml
index 8000726..5c234c6 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -450,13 +450,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
- <version>0.15</version>
- <exclusions>
- <exclusion>
- <groupId>io.airlift</groupId>
- <artifactId>slice</artifactId>
- </exclusion>
- </exclusions>
+ <version>0.16</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>