LDEV-5156 allow configuring the default capacity for local and argume…

…nts scopes https://luceeserver.atlassian.net/browse/LDEV-5156
zspitzer · Nov 21, 2024 · 8492e25 · 8492e25
1 parent 35915ab
commit 8492e25
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/type/scope/ArgumentImpl.java b/core/src/main/java/lucee/runtime/type/scope/ArgumentImpl.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import lucee.commons.io.SystemUtil;
 import lucee.commons.lang.CFTypes;
 import lucee.runtime.PageContext;
 import lucee.runtime.config.NullSupportHelper;
@@ -63,14 +64,19 @@ public final class ArgumentImpl extends ScopeSupport implements Argument, ArrayP
 
 	private boolean bind;
 	private Set functionArgumentNames;
+	private static int argumentInitialCapacity;
+
+	static {
+		argumentInitialCapacity = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.scope.arguments.capacity", "4"), 4);
+	}
 	// private boolean supportFunctionArguments;
 
 	/**
 	 * constructor of the class
 	 */
 	public ArgumentImpl() {
 		// super("arguments", SCOPE_ARGUMENTS, StructImpl.TYPE_LINKED, 4);
-		super("arguments", SCOPE_ARGUMENTS, StructImpl.TYPE_LINKED_NOT_SYNC, 4);
+		super("arguments", SCOPE_ARGUMENTS, StructImpl.TYPE_LINKED_NOT_SYNC, argumentInitialCapacity);
 	}
 
 	@Override

diff --git a/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java b/core/src/main/java/lucee/runtime/type/scope/LocalImpl.java
@@ -18,17 +18,24 @@
  **/
 package lucee.runtime.type.scope;
 
+import lucee.commons.io.SystemUtil;
 import lucee.runtime.PageContext;
+import lucee.runtime.op.Caster;
 import lucee.runtime.type.Struct;
 
 public final class LocalImpl extends ScopeSupport implements Scope, Local {
 
 	private static final long serialVersionUID = -7155406303949924403L;
 	private boolean bind;
+	private static int localInitialCapacity;
+
+	static {
+		localInitialCapacity = Caster.toIntValue(SystemUtil.getSystemPropOrEnvVar("lucee.scope.local.capacity", "4"), 4);
+	}
 
 	public LocalImpl() {
 		// super("local", Scope.SCOPE_LOCAL, Struct.TYPE_SYNC, 4);
-		super("local", Scope.SCOPE_LOCAL, Struct.TYPE_REGULAR, 4);
+		super("local", Scope.SCOPE_LOCAL, Struct.TYPE_REGULAR, localInitialCapacity);
 	}
 
 	@Override

diff --git a/core/src/main/java/resource/setting/sysprop-envvar.json b/core/src/main/java/resource/setting/sysprop-envvar.json
@@ -368,5 +368,15 @@
         "sysprop": "lucee.template.charset",
         "envvar": "LUCEE_TEMPLATE_CHARSET",
         "desc": ""
+    },
+    {
+        "sysprop": "lucee.scope.local.capacity",
+        "envvar": "LUCEE_SCOPE_LOCAL_CAPACITY",
+        "desc": "Sets the initial capacity (size) for the local scope hashmap"
+    },
+    {
+        "sysprop": "lucee.scopes.arguments.capacity",
+        "envvar": "LUCEE_SCOPE_ARGUMENTS_CAPACITY",
+        "desc": "Sets the initial capacity (size) for the arguments scope hashmap"
     }
 ]