Copilot commented on code in PR #12290:
URL: https://github.com/apache/gluten/pull/12290#discussion_r3409124499
##########
cpp/velox/substrait/SubstraitToVeloxExpr.cc:
##########
@@ -217,13 +217,29 @@ std::shared_ptr<const core::FieldAccessTypedExpr>
SubstraitVeloxExprConverter::t
auto inputColumnType = inputType;
for (;;) {
auto idx = tmp->field();
- fieldAccess = makeFieldAccessExpr(inputColumnType->nameOf(idx),
inputColumnType->childAt(idx), fieldAccess);
+ VELOX_USER_CHECK(
+ idx >= 0 && static_cast<uint32_t>(idx) < inputColumnType->size(),
+ "Field reference index {} is out of range for the {}-field row
type.",
+ idx,
+ inputColumnType->size());
Review Comment:
The wording `"{}-field row type"` is a bit awkward (e.g., “1-field row
type”). Consider changing to a clearer phrasing like “row type with {} fields”
to improve readability and make the message more consistent for users.
##########
cpp/velox/tests/SubstraitVeloxExprConverterTest.cc:
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "substrait/SubstraitToVeloxExpr.h"
+
+#include "velox/common/base/tests/GTestUtils.h"
+#include "velox/type/Type.h"
+
+using namespace facebook::velox;
+
+namespace gluten {
+
+// Regression test for a SIGSEGV in
+// SubstraitVeloxExprConverter::toVeloxExpr(Expression::FieldReference, ...).
+// The direct-reference loop descends one nested struct_field at a time with
+// `inputColumnType = asRowType(childAt(idx))`. When the field path traverses a
+// non-struct child -- e.g. a field nested under an array, as produced by
Delta's
+// nested-array UPDATE rewrite ("nested data support - ... updating array
type")
+// -- asRowType() returns null and the next iteration dereferenced that null
+// RowType, crashing the whole forked JVM. A SIGSEGV is not catchable, so plan
+// validation could not fall back. The converter must instead throw a
+// VeloxUserError, which SubstraitToVeloxPlanValidator catches to fall back to
+// vanilla execution.
+TEST(SubstraitVeloxExprConverterTest, nestedFieldReferenceIntoNonStructThrows)
{
+ // Schema with a single array column.
+ RowTypePtr inputType = ROW({"arr"}, {ARRAY(INTEGER())});
+
+ // Reference column 0 (the array), then descend one more level via a child
+ // struct_field -- i.e. into the array's element, which is not a struct/row.
+ ::substrait::Expression::FieldReference fieldReference;
+ auto* structField =
fieldReference.mutable_direct_reference()->mutable_struct_field();
+ structField->set_field(0);
+ structField->mutable_child()->mutable_struct_field()->set_field(0);
+
+ VELOX_ASSERT_THROW(
+ SubstraitVeloxExprConverter::toVeloxExpr(fieldReference, inputType),
+ "Nested field reference into a non-struct type");
+}
+
+// A field-reference index past the end of the row type must be rejected
cleanly
+// instead of indexing out of bounds (the raw RowType::childAt/nameOf accessors
+// use unchecked operator[]).
+TEST(SubstraitVeloxExprConverterTest, fieldReferenceIndexOutOfRangeThrows) {
+ RowTypePtr inputType = ROW({"a", "b"}, {INTEGER(), INTEGER()});
+
+ ::substrait::Expression::FieldReference fieldReference;
+
fieldReference.mutable_direct_reference()->mutable_struct_field()->set_field(5);
+
+ VELOX_ASSERT_THROW(SubstraitVeloxExprConverter::toVeloxExpr(fieldReference,
inputType), "out of range");
Review Comment:
The asserted substring `"out of range"` is fairly generic and could match
unrelated failures, making the test less precise. Consider asserting a more
specific substring (e.g., including “Field reference index” or “row type”) so
the test reliably verifies the intended error path.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
