fix uint deserialization in expressions

Author: aalkin

Framework/Core/src/ExpressionJSONHelpers.cxx

@@ -365,13 +365,7 @@ struct ExpressionReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>,
           value = (uint16_t)i;
           break;
         case atype::UINT32:
-          value = i;
-          break;
-        case atype::UINT64:
-          value = (uint64_t)i;
-          break;
-        case atype::INT64:
-          value = (int64_t)i;
+          value = (uint32_t)i;
           break;
         default:
           states.push(State::IN_ERROR);
@@ -450,7 +444,17 @@ struct ExpressionReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>,
     debug << "Int64(" << i << ")" << std::endl;
     // can only be a literal node value
     if (states.top() == State::IN_NODE_LITERAL && currentKey.compare("value") == 0) {
-      value = i;
+      switch (type) {
+        case atype::UINT64:
+          value = (uint64_t)i;
+          break;
+        case atype::INT64:
+          value = (int64_t)i;
+          break;
+        default:
+          states.push(State::IN_ERROR);
+          return false;
+      }
       return true;
     }
     states.push(State::IN_ERROR); // no other contexts allow int64s
@@ -460,13 +464,9 @@ struct ExpressionReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>,
   bool Uint64(uint64_t i)
   {
     debug << "Uint64(" << i << ")" << std::endl;
-    // can only be a literal node value
-    if (states.top() == State::IN_NODE_LITERAL && currentKey.compare("value") == 0) {
-      value = i;
-      return true;
-    }
-    states.push(State::IN_ERROR); // no other contexts allow uints
-    return false;
+    // any positive value will be first read as unsigned, however the actual type is determined by node's arrow_type
+    debug << ">> falling back to Int64" << std::endl;
+    return Int64(i);
   }
 
   bool Double(double d)

Framework/Core/test/test_Expressions.cxx

@@ -397,10 +397,15 @@ TEST_CASE("TestExpressionSerialization")
 {
   Filter f = o2::aod::track::signed1Pt > 0.f && ifnode(nabs(o2::aod::track::eta) < 1.0f, nabs(o2::aod::track::x) > 2.0f, nabs(o2::aod::track::y) > 3.0f);
   Projector p = -1.f * nlog(ntan(o2::constants::math::PIQuarter - 0.5f * natan(o2::aod::fwdtrack::tgl)));
+  Projector p1 = ifnode(o2::aod::track::itsClusterSizes > (uint32_t)0, static_cast<uint8_t>(o2::aod::track::ITS), (uint8_t)0x0) |
+                 ifnode(o2::aod::track::tpcNClsFindable > (uint8_t)0, static_cast<uint8_t>(o2::aod::track::TPC), (uint8_t)0x0) |
+                 ifnode(o2::aod::track::trdPattern > (uint8_t)0, static_cast<uint8_t>(o2::aod::track::TRD), (uint8_t)0x0) |
+                 ifnode((o2::aod::track::tofChi2 >= 0.f) && (o2::aod::track::tofExpMom > 0.f), static_cast<uint8_t>(o2::aod::track::TOF), (uint8_t)0x0);
 
   std::vector<Projector> projectors;
   projectors.emplace_back(std::move(f));
   projectors.emplace_back(std::move(p));
+  projectors.emplace_back(std::move(p1));
 
   std::stringstream osm;
   ExpressionJSONHelpers::write(osm, projectors);
@@ -423,6 +428,15 @@ TEST_CASE("TestExpressionSerialization")
   auto t22 = createExpressionTree(s22, schemap);
   REQUIRE(t12->ToString() == t22->ToString());
 
+  auto s13 = createOperations(projectors[2]);
+  auto s23 = createOperations(ps[2]);
+  auto schemap1 = std::make_shared<arrow::Schema>(std::vector{o2::aod::track::ITSClusterSizes::asArrowField(), o2::aod::track::TPCNClsFindable::asArrowField(),
+                                                              o2::aod::track::TRDPattern::asArrowField(), o2::aod::track::TOFChi2::asArrowField(),
+                                                              o2::aod::track::TOFExpMom::asArrowField()});
+  auto t13 = createExpressionTree(s13, schemap1);
+  auto t23 = createExpressionTree(s23, schemap1);
+  REQUIRE(t13->ToString() == t23->ToString());
+
   osm.clear();
   osm.str("");
   ArrowJSONHelpers::write(osm, schemaf);