From 0fff3eae52dd162eb0f3a55646d459b5a3590987 Mon Sep 17 00:00:00 2001
From: Bret McGuire <bret.mcguire@datastax.com>
Date: Tue, 19 May 2020 13:44:43 -0500
Subject: [PATCH 1/3] Bits necessary to move Graal substitution for Guava's
 UnsignedBytes into driver core

---
 core/pom.xml                                  |  4 ++
 .../UnsignedBytesSubstitutions.java           | 42 +++++++++++++++++++
 pom.xml                                       |  7 +++-
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java

diff --git a/core/pom.xml b/core/pom.xml
index 47858cd2427..c9803a00c97 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -132,6 +132,10 @@
       <artifactId>graal-sdk</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.graalvm.nativeimage</groupId>
+      <artifactId>svm</artifactId>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
diff --git a/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java
new file mode 100644
index 00000000000..c99b873c684
--- /dev/null
+++ b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * 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 com.datastax.oss.driver.shaded.guava.common.primitives;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Delete;
+import com.oracle.svm.core.annotate.RecomputeFieldValue;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import java.util.Comparator;
+
+@TargetClass(UnsignedBytes.LexicographicalComparatorHolder.UnsafeComparator.class)
+@Delete
+final class UnsafeComparatorSubstitutions {}
+
+@TargetClass(UnsignedBytes.LexicographicalComparatorHolder.class)
+final class LexicographicalComparatorHolderSubstitutions {
+
+  @Alias
+  @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
+  static Comparator<byte[]> BEST_COMPARATOR = UnsignedBytes.lexicographicalComparatorJavaImpl();
+
+  /* All known cases should be covered by the field substitution above... keeping this only
+   * for sake of completeness */
+  @Substitute
+  static Comparator<byte[]> getBestComparator() {
+    return UnsignedBytes.lexicographicalComparatorJavaImpl();
+  }
+}
diff --git a/pom.xml b/pom.xml
index ffbaa5e93d8..3e07ec120ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,6 +382,11 @@
         <artifactId>graal-sdk</artifactId>
         <version>20.0.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.graalvm.nativeimage</groupId>
+        <artifactId>svm</artifactId>
+        <version>20.0.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -693,7 +698,7 @@ limitations under the License.]]></inlineHeader>
           <verbose>false</verbose>
           <quiet>true</quiet>
           <doclint>all,-missing</doclint>
-          <excludePackageNames>com.datastax.*.driver.internal*</excludePackageNames>
+          <excludePackageNames>com.datastax.*.driver.internal*,com.datastax.oss.driver.shaded.guava.common.primitives</excludePackageNames>
           <tags>
             <!--
               For custom `leaks-private-api` tag (apparently dash separators are not handled

From 5cf59dc516f97658261c1847ee6374e173d21444 Mon Sep 17 00:00:00 2001
From: Bret McGuire <bret.mcguire@datastax.com>
Date: Wed, 20 May 2020 02:00:24 -0500
Subject: [PATCH 2/3] Marking Graal svm lib as having provided scope

---
 core/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/pom.xml b/core/pom.xml
index c9803a00c97..f690caa1b9c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -135,6 +135,7 @@
     <dependency>
       <groupId>org.graalvm.nativeimage</groupId>
       <artifactId>svm</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>

From 00a9021962cc1769586c84569fa577ef14e4ab0b Mon Sep 17 00:00:00 2001
From: Bret McGuire <bret.mcguire@datastax.com>
Date: Wed, 20 May 2020 15:00:31 -0500
Subject: [PATCH 3/3] Fixing my bone-headed mistakes

---
 ...raphicalComparatorHolderSubstitution.java} |  7 +-----
 .../UnsafeComparatorSubstitution.java         | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 rename core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/{UnsignedBytesSubstitutions.java => LexicographicalComparatorHolderSubstitution.java} (85%)
 create mode 100644 core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsafeComparatorSubstitution.java

diff --git a/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/LexicographicalComparatorHolderSubstitution.java
similarity index 85%
rename from core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java
rename to core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/LexicographicalComparatorHolderSubstitution.java
index c99b873c684..518f53069d2 100644
--- a/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsignedBytesSubstitutions.java
+++ b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/LexicographicalComparatorHolderSubstitution.java
@@ -16,18 +16,13 @@
 package com.datastax.oss.driver.shaded.guava.common.primitives;
 
 import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import java.util.Comparator;
 
-@TargetClass(UnsignedBytes.LexicographicalComparatorHolder.UnsafeComparator.class)
-@Delete
-final class UnsafeComparatorSubstitutions {}
-
 @TargetClass(UnsignedBytes.LexicographicalComparatorHolder.class)
-final class LexicographicalComparatorHolderSubstitutions {
+final class LexicographicalComparatorHolderSubstitution {
 
   @Alias
   @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias)
diff --git a/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsafeComparatorSubstitution.java b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsafeComparatorSubstitution.java
new file mode 100644
index 00000000000..974c7c8a89e
--- /dev/null
+++ b/core/src/main/java/com/datastax/oss/driver/shaded/guava/common/primitives/UnsafeComparatorSubstitution.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * 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 com.datastax.oss.driver.shaded.guava.common.primitives;
+
+import com.oracle.svm.core.annotate.Delete;
+import com.oracle.svm.core.annotate.TargetClass;
+
+@TargetClass(UnsignedBytes.LexicographicalComparatorHolder.UnsafeComparator.class)
+@Delete
+final class UnsafeComparatorSubstitution {}