Apache Solr open-source search software
SOLR-16869: Use Panama Vector apis for Java 20/21 (#1758)
Houston Putman19a02650ab76
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 05a3594f63a..d34dea5e300 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -235,6 +235,9 @@ Optimizations* SOLR-16846: Use IndexOrDocValuesQuery for PointFields on Set queries. This improves the performance in some scenarios whenthe set query is combined with other selective queries. (Tomás Fernández Löbbe, Alex Deparvu)+* SOLR-16869: Enable Incubating Java Panama Vector APIs when using Java 20 or 21.+ When run using compatible hardware, Vector search will see considerable speed up. (Houston Putman, Uwe Schindler)+Bug Fixes---------------------diff --git a/solr/bin/solr b/solr/bin/solrindex ce4fd583bb2..b9aab9bbfd3 100644--- a/solr/bin/solr+++ b/solr/bin/solr@@ -1879,6 +1879,13 @@ function start_solr() {echo "Java $JAVA_VER_NUM detected. Enabled workaround for SOLR-16463"fi+ # Vector optimizations are only supported for Java 20 and 21 for now.+ # This will need to change as Lucene is upgraded and newer Java versions are released+ if [[ "$JAVA_VER_NUM" -ge "20" ]] && [[ "$JAVA_VER_NUM" -le "21" ]] ; then+ SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")+ echo "Java $JAVA_VER_NUM detected. Incubating Panama Vector APIs have been enabled"+ fi+SOLR_START_OPTS=('-server' "${JAVA_MEM_OPTS[@]}" "${GC_TUNE_ARR[@]}" "${GC_LOG_OPTS[@]}" "${IP_ACL_OPTS[@]}" \"${REMOTE_JMX_OPTS[@]}" "${CLOUD_MODE_OPTS[@]}" ${SOLR_LOG_LEVEL_OPT:-} -Dsolr.log.dir="$SOLR_LOGS_DIR" \"-Djetty.port=$SOLR_PORT" "-DSTOP.PORT=$stop_port" "-DSTOP.KEY=$STOP_KEY" \diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 43f60f9628c..f0ba5839468 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -1134,6 +1134,13 @@ if !JAVA_MAJOR_VERSION! GEQ 17 (echo Java %JAVA_MAJOR_VERSION% detected. Enabled workaround for SOLR-16463)+REM Vector optimizations are only supported for Java 20 and 21 for now.+REM This will need to change as Lucene is upgraded and newer Java versions are released+if !JAVA_MAJOR_VERSION! GEQ 20 if !JAVA_MAJOR_VERSION! LEQ 21 (+ set SOLR_OPTS=%SOLR_OPTS% --add-modules jdk.incubator.vector+ echo Java %JAVA_MAJOR_VERSION% detected. Incubating Panama Vector APIs have been enabled+)+if !JAVA_MAJOR_VERSION! GEQ 9 if NOT "%JAVA_VENDOR%" == "OpenJ9" (IF NOT "%GC_LOG_OPTS%"=="" (echo ERROR: On Java 9 you cannot set GC_LOG_OPTS, only default GC logging is available. Exiting