Do not optimize URLs with query strings and switch to interleaved arrays in ArrayPropertyGetter

Author: adwsingh

rulesengine/src/main/java/software/amazon/smithy/java/rulesengine/ArrayPropertyGetter.java

@@ -6,15 +6,16 @@
 package software.amazon.smithy.java.rulesengine;
 
 /**
- * Lightweight PropertyGetter backed by parallel key/value arrays.
+ * Lightweight PropertyGetter backed by an interleaved value/key array.
+ * Layout: [value0, key0, value1, key1, ...]. Keys are at odd indices.
  * More efficient than Map for small fixed-key lookups (linear scan beats hashing for ~4 entries).
  */
-record ArrayPropertyGetter(String[] keys, Object[] values) implements PropertyGetter {
+record ArrayPropertyGetter(Object[] data) implements PropertyGetter {
     @Override
     public Object getProperty(String name) {
-        for (int i = 0; i < keys.length; i++) {
-            if (name.equals(keys[i])) {
-                return values[i];
+        for (int i = 1; i < data.length; i += 2) {
+            if (name.equals(data[i])) {
+                return data[i - 1];
             }
         }
         return null;

rulesengine/src/main/java/software/amazon/smithy/java/rulesengine/BytecodeCompiler.java

@@ -180,6 +180,12 @@ private void compileEndpointUrl(Expression urlExpression) {
             var parts = template.getParts();
             if (parts.size() > 1 && parts.getFirst() instanceof Template.Literal firstLit) {
                 String firstStr = firstLit.toString();
+                // Bail out if any literal part contains characters that indicate
+                // query strings or userInfo — these need full URI.create() parsing.
+                if (containsUriSpecialChars(parts)) {
+                    compileExpression(urlExpression);
+                    return;
+                }
                 int schemeEnd = firstStr.indexOf("://");
                 if (schemeEnd > 0) {
                     String scheme = firstStr.substring(0, schemeEnd);
@@ -255,6 +261,18 @@ private void compileEndpointUrl(Expression urlExpression) {
         compileExpression(urlExpression);
     }
 
+    private static boolean containsUriSpecialChars(List<Template.Part> parts) {
+        for (var part : parts) {
+            if (part instanceof Template.Literal lit) {
+                String s = lit.toString();
+                if (s.indexOf('?') >= 0 || s.indexOf('@') >= 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private void compileErrorRule(ErrorRule rule) {
         compileExpression(rule.getError());
         writer.writeByte(Opcodes.RETURN_ERROR);

rulesengine/src/main/java/software/amazon/smithy/java/rulesengine/BytecodeEvaluator.java

@@ -285,13 +285,12 @@ private Object runLoop(byte[] instructions, RulesFunction[] functions, Object[]
                 }
                 case Opcodes.STRUCTN -> {
                     var size = instructions[pc++] & 0xFF;
-                    var keys = new String[size];
-                    var values = new Object[size];
-                    for (var i = 0; i < size; i++) {
-                        keys[i] = (String) stack[--stackPosition];
-                        values[i] = stack[--stackPosition];
-                    }
-                    push(new ArrayPropertyGetter(keys, values));
+                    int totalSlots = size * 2;
+                    int base = stackPosition - totalSlots;
+                    var data = new Object[totalSlots];
+                    System.arraycopy(stack, base, data, 0, totalSlots);
+                    stack[base] = new ArrayPropertyGetter(data);
+                    stackPosition = base + 1;
                 }
                 case Opcodes.RESOLVE_TEMPLATE -> {
                     int argCount = instructions[pc++] & 0xFF;