Fix recursive multimap bug

tigrannajaryan · tigrannajaryan · commit 7fbd9a1b4af3 · 2025-10-14T16:31:35.000-04:00
diff --git a/examples/jsonl/internal/jsonstef/jsonobject.go b/examples/jsonl/internal/jsonstef/jsonobject.go
diff --git a/examples/profile/internal/profile/labels.go b/examples/profile/internal/profile/labels.go
diff --git a/go/otel/oteltef/attributes.go b/go/otel/oteltef/attributes.go
diff --git a/go/otel/oteltef/envelopeattributes.go b/go/otel/oteltef/envelopeattributes.go
diff --git a/go/otel/oteltef/keyvaluelist.go b/go/otel/oteltef/keyvaluelist.go
diff --git a/java/src/main/java/com/example/oteltef/Attributes.java b/java/src/main/java/com/example/oteltef/Attributes.java
@@ -135,21 +135,16 @@ public void append(StringValue k, AnyValue v) {
         elems[elemsLen-1] = elem;
     }
 
+    
     // setKey sets the key of the element at index i.
     public void setKey(int i, StringValue k) {
         if (!Types.StringEqual(elems[i].key, k)) {
             elems[i].key = k;
             modifiedElems.markKeyModified(i);
         }
     }
-
-    // setValue sets the value of the element at index i.
-    public void setValue(int i, AnyValue v) {
-        if (!elems[i].value.equals(v)) {
-            elems[i].value = v;
-            modifiedElems.markValModified(i);
-        }
-    }
+    
+    
 
     // byteSize returns approximate memory usage in bytes. Used to calculate
     // memory used by dictionaries.
diff --git a/java/src/main/java/com/example/oteltef/AttributesEncoder.java b/java/src/main/java/com/example/oteltef/AttributesEncoder.java
@@ -112,11 +112,13 @@ private void encodeFull(Attributes list) throws IOException {
 
     public void collectColumns(WriteColumnSet columnSet) {
         columnSet.setBytes(buf);
+    	int colIdx = 0;
         if (!isKeyRecursive) {
-            keyEncoder.collectColumns(columnSet.at(0));
+            keyEncoder.collectColumns(columnSet.at(colIdx));
+            colIdx++;
         }
         if (!isValueRecursive) {
-            valueEncoder.collectColumns(columnSet.at(1));
+            valueEncoder.collectColumns(columnSet.at(colIdx));
         }
     }
 }
diff --git a/java/src/main/java/com/example/oteltef/EnvelopeAttributes.java b/java/src/main/java/com/example/oteltef/EnvelopeAttributes.java
@@ -131,21 +131,24 @@ public void append(StringValue k, BytesValue v) {
         elems[elemsLen-1] = elem;
     }
 
+    
     // setKey sets the key of the element at index i.
     public void setKey(int i, StringValue k) {
         if (!Types.StringEqual(elems[i].key, k)) {
             elems[i].key = k;
             modifiedElems.markKeyModified(i);
         }
     }
-
+    
+    
     // setValue sets the value of the element at index i.
     public void setValue(int i, BytesValue v) {
         if (!Types.BytesEqual(elems[i].value, v)) {
             elems[i].value = v;
             modifiedElems.markValModified(i);
         }
     }
+    
 
     // byteSize returns approximate memory usage in bytes. Used to calculate
     // memory used by dictionaries.
diff --git a/java/src/main/java/com/example/oteltef/EnvelopeAttributesEncoder.java b/java/src/main/java/com/example/oteltef/EnvelopeAttributesEncoder.java
@@ -106,11 +106,13 @@ private void encodeFull(EnvelopeAttributes list) throws IOException {
 
     public void collectColumns(WriteColumnSet columnSet) {
         columnSet.setBytes(buf);
+    	int colIdx = 0;
         if (!isKeyRecursive) {
-            keyEncoder.collectColumns(columnSet.at(0));
+            keyEncoder.collectColumns(columnSet.at(colIdx));
+            colIdx++;
         }
         if (!isValueRecursive) {
-            valueEncoder.collectColumns(columnSet.at(1));
+            valueEncoder.collectColumns(columnSet.at(colIdx));
         }
     }
 }
diff --git a/java/src/main/java/com/example/oteltef/KeyValueList.java b/java/src/main/java/com/example/oteltef/KeyValueList.java
@@ -135,21 +135,16 @@ public void append(StringValue k, AnyValue v) {
         elems[elemsLen-1] = elem;
     }
 
+    
     // setKey sets the key of the element at index i.
     public void setKey(int i, StringValue k) {
         if (!Types.StringEqual(elems[i].key, k)) {
             elems[i].key = k;
             modifiedElems.markKeyModified(i);
         }
     }
-
-    // setValue sets the value of the element at index i.
-    public void setValue(int i, AnyValue v) {
-        if (!elems[i].value.equals(v)) {
-            elems[i].value = v;
-            modifiedElems.markValModified(i);
-        }
-    }
+    
+    
 
     // byteSize returns approximate memory usage in bytes. Used to calculate
     // memory used by dictionaries.
diff --git a/java/src/main/java/com/example/oteltef/KeyValueListEncoder.java b/java/src/main/java/com/example/oteltef/KeyValueListEncoder.java
@@ -112,11 +112,13 @@ private void encodeFull(KeyValueList list) throws IOException {
 
     public void collectColumns(WriteColumnSet columnSet) {
         columnSet.setBytes(buf);
+    	int colIdx = 0;
         if (!isKeyRecursive) {
-            keyEncoder.collectColumns(columnSet.at(0));
+            keyEncoder.collectColumns(columnSet.at(colIdx));
+            colIdx++;
         }
         if (!isValueRecursive) {
-            valueEncoder.collectColumns(columnSet.at(1));
+            valueEncoder.collectColumns(columnSet.at(colIdx));
         }
     }
 }
diff --git a/stefc/generator/testdata/multimap_key_recurse.stef b/stefc/generator/testdata/multimap_key_recurse.stef
@@ -0,0 +1,35 @@
+package com.example.gentest.multimap_key_recurse
+
+enum Enum1 {
+  Item1 = 0
+  Item2 = 1
+  Item3 = 2
+}
+
+enum Enum2 {
+  Item1 = 0
+  Item2 = 1
+}
+
+multimap MultiMap1 {
+  key MultiMap1
+  value Enum1
+}
+
+struct Struct1 root {
+  Field1 Struct3 optional
+}
+
+struct Struct2 {
+  Field1 []Struct1 optional
+  Field2 bool
+  Field3 string optional
+}
+
+struct Struct3 {
+  Field1 bool optional
+  Field2 []Enum1 optional
+  Field3 MultiMap1
+  Field4 Struct2 optional
+  Field5 Enum1
+}
diff --git a/stefc/templates/go/multimap.go.tmpl b/stefc/templates/go/multimap.go.tmpl
@@ -510,11 +510,13 @@ func (e *{{ .MultimapName }}Encoder) encodeFull(list *{{ .MultimapName }}) {
 
 func (e *{{ .MultimapName }}Encoder) CollectColumns(columnSet *pkg.WriteColumnSet) {
 	columnSet.SetBytes(&e.buf)
+	colIdx := 0
 	if !e.isKeyRecursive {
- 		e.keyEncoder.CollectColumns(columnSet.At(0))
+ 		e.keyEncoder.CollectColumns(columnSet.At(colIdx))
+ 		colIdx++
  	}
 	if !e.isValueRecursive {
-		e.valueEncoder.CollectColumns(columnSet.At(1))
+		e.valueEncoder.CollectColumns(columnSet.At(colIdx))
 	}
 }
 
@@ -547,7 +549,7 @@ func (d *{{ .MultimapName }}Decoder) Init(state* ReaderState, columns *pkg.ReadC
 	if state.{{.Key.Type.EncoderType}}Decoder != nil {
 		// Recursion detected, use the existing decoder.
 		d.keyDecoder = state.{{.Key.Type.EncoderType}}Decoder
-		d.isValueRecursive = true // Mark that we are using a recursive decoder.
+		d.isKeyRecursive = true // Mark that we are using a recursive decoder.
 	} else {
 		d.keyDecoder = new({{.Key.Type.EncoderType}}Decoder)
 		err = d.keyDecoder.Init(state, columns.AddSubColumn())
diff --git a/stefc/templates/java/multimap.java.tmpl b/stefc/templates/java/multimap.java.tmpl
@@ -158,14 +158,16 @@ public class {{ .MultimapName }} {
         elems[elemsLen-1] = elem;
     }
 
+    {{if .Key.Type.IsPrimitive}}
     // setKey sets the key of the element at index i.
     public void setKey(int i, {{.Key.Type.Exported}} k) {
         if (!{{.Key.Type.EqualFunc}}(elems[i].key, {{.Key.Type.ToStorage "k"}})) {
             elems[i].key = {{.Key.Type.ToStorage "k"}};
             modifiedElems.markKeyModified(i);
         }
     }
-
+    {{end}}
+    {{if .Value.Type.IsPrimitive}}
     // setValue sets the value of the element at index i.
     public void setValue(int i, {{.Value.Type.Exported}} v) {
         {{- if .Value.Type.IsPrimitive }}
@@ -177,6 +179,7 @@ public class {{ .MultimapName }} {
             modifiedElems.markValModified(i);
         }
     }
+    {{end}}
 
     // byteSize returns approximate memory usage in bytes. Used to calculate
     // memory used by dictionaries.
diff --git a/stefc/templates/java/multimapEncoder.java.tmpl b/stefc/templates/java/multimapEncoder.java.tmpl
@@ -128,11 +128,13 @@ class {{ .MultimapName }}Encoder {
 
     public void collectColumns(WriteColumnSet columnSet) {
         columnSet.setBytes(buf);
+    	int colIdx = 0;
         if (!isKeyRecursive) {
-            keyEncoder.collectColumns(columnSet.at(0));
+            keyEncoder.collectColumns(columnSet.at(colIdx));
+            colIdx++;
         }
         if (!isValueRecursive) {
-            valueEncoder.collectColumns(columnSet.at(1));
+            valueEncoder.collectColumns(columnSet.at(colIdx));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,13 @@ private void encodeFull(Attributes list) throws IOException {`
`112`	`112`
`113`	`113`	`public void collectColumns(WriteColumnSet columnSet) {`
`114`	`114`	`columnSet.setBytes(buf);`
	`115`	`+ int colIdx = 0;`
`115`	`116`	`if (!isKeyRecursive) {`
`116`		`- keyEncoder.collectColumns(columnSet.at(0));`
	`117`	`+ keyEncoder.collectColumns(columnSet.at(colIdx));`
	`118`	`+ colIdx++;`
`117`	`119`	`}`
`118`	`120`	`if (!isValueRecursive) {`
`119`		`- valueEncoder.collectColumns(columnSet.at(1));`
	`121`	`+ valueEncoder.collectColumns(columnSet.at(colIdx));`
`120`	`122`	`}`
`121`	`123`	`}`
`122`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,21 +131,24 @@ public void append(StringValue k, BytesValue v) {`
`131`	`131`	`elems[elemsLen-1] = elem;`
`132`	`132`	`}`
`133`	`133`
	`134`	`+`
`134`	`135`	`// setKey sets the key of the element at index i.`
`135`	`136`	`public void setKey(int i, StringValue k) {`
`136`	`137`	`if (!Types.StringEqual(elems[i].key, k)) {`
`137`	`138`	`elems[i].key = k;`
`138`	`139`	`modifiedElems.markKeyModified(i);`
`139`	`140`	`}`
`140`	`141`	`}`
`141`		`-`
	`142`	`+`
	`143`	`+`
`142`	`144`	`// setValue sets the value of the element at index i.`
`143`	`145`	`public void setValue(int i, BytesValue v) {`
`144`	`146`	`if (!Types.BytesEqual(elems[i].value, v)) {`
`145`	`147`	`elems[i].value = v;`
`146`	`148`	`modifiedElems.markValModified(i);`
`147`	`149`	`}`
`148`	`150`	`}`
	`151`	`+`
`149`	`152`
`150`	`153`	`// byteSize returns approximate memory usage in bytes. Used to calculate`
`151`	`154`	`// memory used by dictionaries.`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,13 @@ private void encodeFull(EnvelopeAttributes list) throws IOException {`
`106`	`106`
`107`	`107`	`public void collectColumns(WriteColumnSet columnSet) {`
`108`	`108`	`columnSet.setBytes(buf);`
	`109`	`+ int colIdx = 0;`
`109`	`110`	`if (!isKeyRecursive) {`
`110`		`- keyEncoder.collectColumns(columnSet.at(0));`
	`111`	`+ keyEncoder.collectColumns(columnSet.at(colIdx));`
	`112`	`+ colIdx++;`
`111`	`113`	`}`
`112`	`114`	`if (!isValueRecursive) {`
`113`		`- valueEncoder.collectColumns(columnSet.at(1));`
	`115`	`+ valueEncoder.collectColumns(columnSet.at(colIdx));`
`114`	`116`	`}`
`115`	`117`	`}`
`116`	`118`	`}`