From 1090928c1426b9c738f2e6050da083ef38c4cb06 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com>
Date: Tue, 13 Jun 2023 09:44:58 +0100
Subject: [PATCH] Implement VectorUtilProvider with Java 21 Project Pamana
 Vector API (#12363)

This commit enables the Panama Vector API for Java 21. The version of
VectorUtilPanamaProvider for Java 21 is identical to that of Java 20.
As such, there is no specific 21 version - the Java 20 version will be
loaded from the MRJAR.
---
 gradle/generation/extract-jdk-apis.gradle                   | 2 +-
 lucene/CHANGES.txt                                          | 6 +++---
 .../src/java/org/apache/lucene/util/VectorUtilProvider.java | 6 +++---
 .../org/apache/lucene/util/VectorUtilPanamaProvider.txt     | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 lucene/core/src/java21/org/apache/lucene/util/VectorUtilPanamaProvider.txt

diff --git a/gradle/generation/extract-jdk-apis.gradle b/gradle/generation/extract-jdk-apis.gradle
index 6a5fb5ad8fd0..78e74aa261a3 100644
--- a/gradle/generation/extract-jdk-apis.gradle
+++ b/gradle/generation/extract-jdk-apis.gradle
@@ -20,7 +20,7 @@ def resources = scriptResources(buildscript)
 configure(rootProject) {
   ext {
     // also change this in extractor tool: ExtractForeignAPI
-    vectorIncubatorJavaVersions = [ JavaVersion.VERSION_20 ] as Set
+    vectorIncubatorJavaVersions = [ JavaVersion.VERSION_20, JavaVersion.VERSION_21 ] as Set
   }
 }
 
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8b82e3c79ea1..0e7dd6a57a67 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -138,9 +138,9 @@ New Features
 
 * GITHUB#12257: Create OnHeapHnswGraphSearcher to let OnHeapHnswGraph to be searched in a thread-safety manner. (Patrick Zhai)
 
-* GITHUB#12302, GITHUB#12311: Add vectorized implementations of VectorUtil.dotProduct(),
-  squareDistance(), cosine() with Java 20 jdk.incubator.vector APIs. Applications started
-  with command line parameter "java --add-modules jdk.incubator.vector" on exactly Java 20
+* GITHUB#12302, GITHUB#12311, GITHUB#12363: Add vectorized implementations of VectorUtil.dotProduct(),
+  squareDistance(), cosine() with Java 20 or 21 jdk.incubator.vector APIs. Applications started
+  with command line parameter "java --add-modules jdk.incubator.vector" on exactly Java 20 or 21
   will automatically use the new vectorized implementations if running on a supported platform
   (x86 AVX2 or later, ARM NEON). This is an opt-in feature and requires explicit Java
   command line flag! When enabled, Lucene logs a notice using java.util.logging. Please test
diff --git a/lucene/core/src/java/org/apache/lucene/util/VectorUtilProvider.java b/lucene/core/src/java/org/apache/lucene/util/VectorUtilProvider.java
index 813f0e470ff0..ee5547f66a65 100644
--- a/lucene/core/src/java/org/apache/lucene/util/VectorUtilProvider.java
+++ b/lucene/core/src/java/org/apache/lucene/util/VectorUtilProvider.java
@@ -56,7 +56,7 @@ interface VectorUtilProvider {
 
   static VectorUtilProvider lookup() {
     final int runtimeVersion = Runtime.version().feature();
-    if (runtimeVersion == 20) {
+    if (runtimeVersion >= 20 && runtimeVersion <= 21) {
       // is locale sane (only buggy in Java 20)
       if (isAffectedByJDK8301190()) {
         LOG.warning(
@@ -98,9 +98,9 @@ static VectorUtilProvider lookup() {
       } catch (ClassNotFoundException cnfe) {
         throw new LinkageError("VectorUtilPanamaProvider is missing in Lucene JAR file", cnfe);
       }
-    } else if (runtimeVersion >= 21) {
+    } else if (runtimeVersion >= 22) {
       LOG.warning(
-          "You are running with Java 21 or later. To make full use of the Vector API, please update Apache Lucene.");
+          "You are running with Java 22 or later. To make full use of the Vector API, please update Apache Lucene.");
     }
     return new VectorUtilDefaultProvider();
   }
diff --git a/lucene/core/src/java21/org/apache/lucene/util/VectorUtilPanamaProvider.txt b/lucene/core/src/java21/org/apache/lucene/util/VectorUtilPanamaProvider.txt
new file mode 100644
index 000000000000..db75951206ef
--- /dev/null
+++ b/lucene/core/src/java21/org/apache/lucene/util/VectorUtilPanamaProvider.txt
@@ -0,0 +1,2 @@
+The version of VectorUtilPanamaProvider for Java 21 is identical to that of Java 20.
+As such, there is no specific 21 version - the Java 20 version will be loaded from the MRJAR.
\ No newline at end of file