Fixed narrowing issue.

substrait-io · Jul 5, 2023 · 42a28d3 · 42a28d3
1 parent f460187
commit 42a28d3
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanRelationVisitor.cpp
@@ -1954,10 +1954,9 @@ int SubstraitPlanRelationVisitor::findFieldReferenceByName(
  auto fieldPlacement =
  generatedField - relationData->generatedFieldReferences.rbegin();
  return static_cast<int32_t>(
- (relationData->generatedFieldReferences.size() -
- fieldPlacement) &
- std::numeric_limits<int32_t>::max()) -
- 1 + fieldReferencesSize;
+ (fieldReferencesSize + relationData->generatedFieldReferences.size() -
+ fieldPlacement - 1) &
+ std::numeric_limits<int32_t>::max());
  }
 
  auto field = std::find_if(
@@ -1972,9 +1971,8 @@ int SubstraitPlanRelationVisitor::findFieldReferenceByName(
  if (field != relationData->fieldReferences.rend()) {
  auto fieldPlacement = field - relationData->fieldReferences.rbegin();
  return static_cast<int32_t>(
- (fieldReferencesSize - fieldPlacement) &
- std::numeric_limits<int32_t>::max()) -
- 1;
+ (fieldReferencesSize - fieldPlacement - 1) &
+ std::numeric_limits<int32_t>::max());
  }
 
  errorListener_->addError(token, "Reference " + name + " does not exist.");