diff --git a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
index a287b3d9ed28..1942c844e3b4 100644
--- a/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
+++ b/core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java
@@ -5329,9 +5329,9 @@ public static Map mapFromArrays(List keysArray, List valuesArray) {
    */
   public static Map map(Object... args) {
     final Map map = new LinkedHashMap<>();
-    for (int i = 0; i < args.length; i++) {
-      Object key = args[i++];
-      Object value = args[i];
+    for (int i = 0; i < args.length; i+=2) {
+      Object key = args[i];
+      Object value = args[i+1];
       map.put(key, value);
     }
     return map;