This is an automated email from the ASF dual-hosted git repository.
zhouyuan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 99404d9d84 [GLUTEN-13329][VL] Match the TencentOS Server os-release
name in the shared library loaders (#13331)
99404d9d84 is described below
commit 99404d9d84b683f3e4b38d8032479e488b2a506d
Author: YangJie <[email protected]>
AuthorDate: Mon Oct 19 05:31:50 2026 -0400
[GLUTEN-13329][VL] Match the TencentOS Server os-release name in the shared
library loaders (#13331)
---
.../gluten/spi/SharedLibraryLoaderCentos7.scala | 4 ++-
.../gluten/spi/SharedLibraryLoaderCentos8.scala | 4 ++-
.../gluten/spi/SharedLibraryLoaderCentos8.scala | 4 ++-
.../spi/SharedLibraryLoaderCentosSuite.scala | 34 ++++++++++++++++++++++
4 files changed, 43 insertions(+), 3 deletions(-)
diff --git
a/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos7.scala
b/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos7.scala
index 4d7d3cf5f2..3212bb27ca 100644
---
a/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos7.scala
+++
b/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos7.scala
@@ -18,6 +18,8 @@ package org.apache.gluten.spi
import org.apache.gluten.jni.BoltJniLibLoader
+import java.util.Locale
+
class SharedLibraryLoaderCentos7 extends SharedLibraryLoader {
override def accepts(osName: String, osVersion: String): Boolean = {
(osName.contains("CentOS") && osVersion.startsWith("7")) ||
@@ -25,7 +27,7 @@ class SharedLibraryLoaderCentos7 extends SharedLibraryLoader {
(osName.contains("Anolis") && osVersion.startsWith("7")) ||
(osName.contains("Red Hat") && osVersion.startsWith("7")) ||
(osName.contains("Alibaba Cloud Linux") && osVersion.startsWith("2")) ||
- (osName.contains("tencentos") && osVersion.contains("2.4"))
+ (osName.toLowerCase(Locale.ROOT).contains("tencentos") &&
osVersion.contains("2.4"))
}
override def loadLib(loader: BoltJniLibLoader): Unit = {
diff --git
a/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
b/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
index 92c3d05028..93c7022e07 100755
---
a/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
+++
b/backends-bolt/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
@@ -18,6 +18,8 @@ package org.apache.gluten.spi
import org.apache.gluten.jni.BoltJniLibLoader
+import java.util.Locale
+
class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
override def accepts(osName: String, osVersion: String): Boolean = {
@@ -26,7 +28,7 @@ class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
(osName.contains("Anolis") && osVersion.startsWith("8")) ||
(osName.contains("Red Hat") && osVersion.startsWith("8")) ||
(osName.contains("Alibaba Cloud Linux") && osVersion.startsWith("3")) ||
- (osName.contains("tencentos") && osVersion.contains("3.2"))
+ (osName.toLowerCase(Locale.ROOT).contains("tencentos") &&
osVersion.contains("3.2"))
}
override def loadLib(loader: BoltJniLibLoader): Unit = {
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
b/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
index d6b4b77ce8..57e768766e 100755
---
a/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderCentos8.scala
@@ -18,6 +18,8 @@ package org.apache.gluten.spi
import org.apache.gluten.jni.JniLibLoader
+import java.util.Locale
+
class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
override def accepts(osName: String, osVersion: String): Boolean = {
@@ -26,7 +28,7 @@ class SharedLibraryLoaderCentos8 extends SharedLibraryLoader {
(osName.contains("Anolis") && osVersion.startsWith("8")) ||
(osName.contains("Red Hat") && osVersion.startsWith("8")) ||
(osName.contains("Alibaba Cloud Linux") && osVersion.startsWith("3")) ||
- (osName.contains("tencentos") && osVersion.contains("3.2"))
+ (osName.toLowerCase(Locale.ROOT).contains("tencentos") &&
osVersion.contains("3.2"))
}
override def loadLib(loader: JniLibLoader): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/spi/SharedLibraryLoaderCentosSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/spi/SharedLibraryLoaderCentosSuite.scala
new file mode 100644
index 0000000000..e07a406b07
--- /dev/null
+++
b/backends-velox/src/test/scala/org/apache/gluten/spi/SharedLibraryLoaderCentosSuite.scala
@@ -0,0 +1,34 @@
+/*
+ * 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 org.apache.gluten.spi
+
+import org.scalatest.funsuite.AnyFunSuite
+
+class SharedLibraryLoaderCentosSuite extends AnyFunSuite {
+ private val centos8 = new SharedLibraryLoaderCentos8
+
+ // NAME and VERSION as read from /etc/os-release on TencentOS Server 3.2.
+ test("TencentOS Server 3.2 is accepted by the centos8 loader") {
+ assert(centos8.accepts("TencentOS Server", "3.2 (Final)"))
+ }
+
+ test("other TencentOS versions are not accepted") {
+ assert(!centos8.accepts("TencentOS Server", "2.4"))
+ assert(!centos8.accepts("TencentOS Server", "3.1 (Final)"))
+ assert(!centos8.accepts("TencentOS Server", "4.2"))
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
