This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new eb29e2c87e HDDS-9849. Improve UUID generator and remove
java-uuid-generator dependency (#5740)
eb29e2c87e is described below
commit eb29e2c87e969d318dd40886446d3245cd87b20d
Author: Slava Tutrinov <[email protected]>
AuthorDate: Thu Dec 7 15:30:47 2023 +0300
HDDS-9849. Improve UUID generator and remove java-uuid-generator dependency
(#5740)
---
hadoop-hdds/common/pom.xml | 4 ----
.../src/main/java/org/apache/hadoop/util/UUIDUtil.java | 14 +++++++++-----
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 1 -
hadoop-ozone/dist/src/main/license/jar-report.txt | 3 +--
.../apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java | 8 +-------
pom.xml | 6 ------
6 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml
index 850d450c54..68cfc71efa 100644
--- a/hadoop-hdds/common/pom.xml
+++ b/hadoop-hdds/common/pom.xml
@@ -240,10 +240,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<version>${io.grpc.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.fasterxml.uuid</groupId>
- <artifactId>java-uuid-generator</artifactId>
- </dependency>
</dependencies>
<build>
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/util/UUIDUtil.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/util/UUIDUtil.java
index b8d949fac9..bebcb2892f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/util/UUIDUtil.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/util/UUIDUtil.java
@@ -18,10 +18,7 @@
package org.apache.hadoop.util;
-import com.fasterxml.uuid.Generators;
-
import java.security.SecureRandom;
-import java.util.UUID;
/**
* Helper methods to deal with random UUIDs.
@@ -35,8 +32,15 @@ public final class UUIDUtil {
private static final ThreadLocal<SecureRandom> GENERATOR =
ThreadLocal.withInitial(SecureRandom::new);
- public static UUID randomUUID() {
- return Generators.randomBasedGenerator(GENERATOR.get()).generate();
+ public static byte[] randomUUIDBytes() {
+ final byte[] bytes = new byte[16];
+ GENERATOR.get().nextBytes(bytes);
+ // See RFC 4122 section 4.4
+ bytes[6] &= 0x0f;
+ bytes[6] |= 0x40;
+ bytes[8] &= 0x3f;
+ bytes[8] |= 0x80;
+ return bytes;
}
}
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index 4249600d7b..a361067ae7 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -448,7 +448,6 @@ Apache License 2.0
org.yaml:snakeyaml
software.amazon.ion:ion-java
org.awaitility:awaitility
- com.fasterxml.uuid:java-uuid-generator
MIT
=====================
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 4cca30879e..e9a781862d 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -273,5 +273,4 @@ share/ozone/lib/weld-servlet-shaded.Final.jar
share/ozone/lib/woodstox-core.jar
share/ozone/lib/zookeeper.jar
share/ozone/lib/zookeeper-jute.jar
-share/ozone/lib/zstd-jni.jar
-share/ozone/lib/java-uuid-generator.jar
\ No newline at end of file
+share/ozone/lib/zstd-jni.jar
\ No newline at end of file
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java
index 9a6bf14279..62ef1590ef 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerServiceGrpc.java
@@ -33,8 +33,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -98,11 +96,7 @@ public class OzoneManagerServiceGrpc extends
OzoneManagerServiceImplBase {
}
private static byte[] getClientId() {
- UUID uuid = UUIDUtil.randomUUID();
- ByteBuffer buf = ByteBuffer.wrap(new byte[16]);
- buf.putLong(uuid.getMostSignificantBits());
- buf.putLong(uuid.getLeastSignificantBits());
- return buf.array();
+ return UUIDUtil.randomUUIDBytes();
}
}
diff --git a/pom.xml b/pom.xml
index 33b3475bdc..668561dd08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<jgrapht.version>1.0.1</jgrapht.version>
<vault.driver.version>5.1.0</vault.driver.version>
- <java.uuid.generator.version>4.3.0</java.uuid.generator.version>
<native.lib.tmp.dir></native.lib.tmp.dir>
</properties>
@@ -1580,11 +1579,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<version>${mockito2.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.fasterxml.uuid</groupId>
- <artifactId>java-uuid-generator</artifactId>
- <version>${java.uuid.generator.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
