Skip to content

The Unified and Autonomous Development Platform

fix: Javascript symbol parsing hangs occasionally for large code base (#1802)

Robin Shenc59c987de069
diff --git a/pom.xml b/pom.xml
index 1bf650a42c..cef82deb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,8 +630,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.8.8</commons.version>
- <agent.version>1.10.12</agent.version>
+ <commons.version>2.8.9</commons.version>
+ <agent.version>1.10.13</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
index 1f0bd06545..694eccc547 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultCodeIndexManager.java
@@ -71,6 +71,8 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {
private static final int DATA_VERSION = 7;
+ private static final int MAX_SYMBOL_LEN = 256;
+
private final BatchWorkManager batchWorkManager;
private final SessionManager sessionManager;
@@ -251,7 +253,7 @@ public class DefaultCodeIndexManager implements CodeIndexManager, Serializable {
if (symbols != null) {
for (Symbol symbol: symbols) {
String fieldValue = symbol.getName();
- if (fieldValue != null && symbol.isSearchable()) {
+ if (fieldValue != null && fieldValue.length() <= MAX_SYMBOL_LEN && symbol.isSearchable()) {
fieldValue = fieldValue.toLowerCase();
String fieldName;
diff --git a/server-ee b/server-ee
index df25bfafe0..24e5894297 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit df25bfafe0baae5b0b17ae7b7bc35ac0ddf4edfb
+Subproject commit 24e58942972bd355c11d2237d8a0e0974ef15542