Merge parameters consistently in mergemany.

scikit-hep · Aug 18, 2022 · 0272819 · 0272819
1 parent 723c6f2
commit 0272819
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/src/awkward/_v2/contents/indexedarray.py b/src/awkward/_v2/contents/indexedarray.py
@@ -563,9 +563,10 @@ def mergemany(self, others):
         nextindex = ak._v2.index.Index64.empty(total_length, self._nplike)
         parameters = self._parameters
 
+        parameters = self._parameters
         for array in head:
             parameters = ak._v2._util.merge_parameters(
-                self._parameters, array._parameters, True
+                parameters, array._parameters, True
             )
 
             if isinstance(

diff --git a/src/awkward/_v2/contents/indexedoptionarray.py b/src/awkward/_v2/contents/indexedoptionarray.py
@@ -667,9 +667,10 @@ def mergemany(self, others):
         nextindex = ak._v2.index.Index64.empty(total_length, self._nplike)
         parameters = self._parameters
 
+        parameters = self._parameters
         for array in head:
             parameters = ak._v2._util.merge_parameters(
-                self._parameters, array._parameters, True
+                parameters, array._parameters, True
             )
 
             if isinstance(

diff --git a/src/awkward/_v2/contents/listarray.py b/src/awkward/_v2/contents/listarray.py
@@ -948,9 +948,10 @@ def mergemany(self, others):
 
         contents = []
 
+        parameters = self._parameters
         for array in head:
             parameters = ak._v2._util.merge_parameters(
-                self._parameters, array._parameters, True
+                parameters, array._parameters, True
             )
 
             if isinstance(

diff --git a/src/awkward/_v2/contents/numpyarray.py b/src/awkward/_v2/contents/numpyarray.py
@@ -482,9 +482,10 @@ def mergemany(self, others):
 
         contiguous_arrays = []
 
+        parameters = self._parameters
         for array in head:
             parameters = ak._v2._util.merge_parameters(
-                self._parameters, array._parameters, True
+                parameters, array._parameters, True
             )
             if isinstance(array, ak._v2.contents.emptyarray.EmptyArray):
                 pass

diff --git a/src/awkward/_v2/contents/recordarray.py b/src/awkward/_v2/contents/recordarray.py
@@ -570,9 +570,10 @@ def mergemany(self, others):
             for_each_field.append([field])
 
         if self.is_tuple:
+            parameters = self._parameters
             for array in headless:
                 parameters = ak._v2._util.merge_parameters(
-                    self._parameters, array._parameters, True
+                    parameters, array._parameters, True
                 )
 
                 if isinstance(array, ak._v2.contents.recordarray.RecordArray):
@@ -607,7 +608,12 @@ def mergemany(self, others):
             these_fields = self._fields.copy()
             these_fields.sort()
 
+            parameters = self._parameters
             for array in headless:
+                parameters = ak._v2._util.merge_parameters(
+                    parameters, array._parameters, True
+                )
+
                 if isinstance(array, ak._v2.contents.recordarray.RecordArray):
                     if not array.is_tuple:
                         those_fields = array._fields.copy()

diff --git a/src/awkward/_v2/contents/unionarray.py b/src/awkward/_v2/contents/unionarray.py
@@ -883,9 +883,10 @@ def mergemany(self, others):
         length_so_far = 0
         parameters = self._parameters
 
+        parameters = self._parameters
         for array in head:
             parameters = ak._v2._util.merge_parameters(
-                self._parameters, array._parameters, True
+                parameters, array._parameters, True
             )
             if isinstance(array, ak._v2.contents.unionarray.UnionArray):
                 union_tags = ak._v2.index.Index(array.tags)