Fully working version

Author: saganatt

Framework/Core/include/Framework/BinningPolicy.h

@@ -238,36 +238,28 @@ struct FlexibleBinningPolicy<std::tuple<Ls...>, Ts...> : BinningPolicyBase<sizeo
   }
 
   template <typename T, typename T2>
-  auto getBinningValue(T& rowIterator, arrow::Table* table, uint64_t globalIndex = -1, uint64_t ci = -1, uint64_t ai = -1) const
+  auto getBinningValue(T& rowIterator, arrow::Table* table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
   {
-    using decayed = std::decay_t<T2>;
-    if (globalIndex == -1) {
-      globalIndex = *(std::get<0>(rowIterator.getIndices()));
-    }
-
     if constexpr (has_type_v<T2, pack<Ls...>>) {
-      rowIterator.setCursor(globalIndex);
+      if (globalIndex != -1) {
+        rowIterator.setCursor(globalIndex);
+      }
       return std::get<T2>(mBinningFunctions)(rowIterator);
     } else {
-      if (ci == -1 && ai == -1) {
-        auto colIterator = static_cast<decayed>(rowIterator).mColumnIterator;
-        ci = colIterator.mCurrentChunk;
-        ai = *(colIterator.mCurrentPos) - colIterator.mFirstIndex;
-      }
       return soa::row_helpers::getSingleRowData<T, T2>(table, rowIterator, ci, ai, globalIndex);
     }
   }
 
   template <typename T>
-  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t globalIndex = -1, uint64_t ci = -1, uint64_t ai = -1) const
+  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
   {
-    return std::make_tuple(getBinningValue<T, Ts>(rowIterator, table, globalIndex, ci, ai)...);
+    return std::make_tuple(getBinningValue<T, Ts>(rowIterator, table, ci, ai, globalIndex)...);
   }
 
   template <typename T>
-  auto getBinningValues(typename T::iterator rowIterator, T& table, uint64_t globalIndex = -1, uint64_t ci = -1, uint64_t ai = -1) const
+  auto getBinningValues(typename T::iterator rowIterator, T& table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
   {
-    return getBinningValues(rowIterator, table.asArrowTable().get(), globalIndex, ci, ai);
+    return getBinningValues(rowIterator, table.asArrowTable().get(), ci, ai, globalIndex);
   }
 
   template <typename... T2s>
@@ -289,11 +281,17 @@ struct ColumnBinningPolicy : BinningPolicyBase<sizeof...(Ts)> {
   }
 
   template <typename T>
-  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t ci, uint64_t ai, uint64_t globalIndex) const
+  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
   {
     return std::make_tuple(soa::row_helpers::getSingleRowData<T, Ts>(table, rowIterator, ci, ai, globalIndex)...);
   }
 
+  template <typename T>
+  auto getBinningValues(typename T::iterator rowIterator, T& table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
+  {
+    return getBinningValues(rowIterator, table.asArrowTable().get(), ci, ai, globalIndex);
+  }
+
   int getBin(std::tuple<typename Ts::type...> const& data) const
   {
     return BinningPolicyBase<sizeof...(Ts)>::template getBin<typename Ts::type...>(data);
@@ -311,11 +309,17 @@ struct NoBinningPolicy {
   NoBinningPolicy() = default;
 
   template <typename T>
-  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t ci, uint64_t ai, uint64_t globalIndex) const
+  auto getBinningValues(T& rowIterator, arrow::Table* table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
   {
     return std::make_tuple(soa::row_helpers::getSingleRowData<T, C>(table, rowIterator, ci, ai, globalIndex));
   }
 
+  template <typename T>
+  auto getBinningValues(typename T::iterator rowIterator, T& table, uint64_t ci = -1, uint64_t ai = -1, uint64_t globalIndex = -1) const
+  {
+    return getBinningValues(rowIterator, table.asArrowTable().get(), ci, ai, globalIndex);
+  }
+
   int getBin(std::tuple<typename C::type> const& data) const
   {
     return std::get<0>(data);