diff options
author | Arne Juul <arnej@verizonmedia.com> | 2021-04-07 10:55:27 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2021-04-07 10:55:27 +0000 |
commit | 71dc1922dd23599b56cab8fafc10c75f00138e0c (patch) | |
tree | 8e3938c1edaae83b6416f40629c55bbfe3e48adf /eval/src | |
parent | fa409f3a843f4e5c1c17fbd1bcf5b9e09dfad7f1 (diff) |
fix asserts after review
Diffstat (limited to 'eval/src')
-rw-r--r-- | eval/src/vespa/eval/instruction/join_with_number_function.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/eval/src/vespa/eval/instruction/join_with_number_function.cpp b/eval/src/vespa/eval/instruction/join_with_number_function.cpp index 60b3132345d..592076f23ce 100644 --- a/eval/src/vespa/eval/instruction/join_with_number_function.cpp +++ b/eval/src/vespa/eval/instruction/join_with_number_function.cpp @@ -93,7 +93,7 @@ JoinWithNumberFunction::compile_self(const ValueBuilderFactory &, Stash &stash) { const auto ¶m = stash.create<JoinWithNumberParam>(result_type(), _function); auto input_type = (_primary == Primary::LHS) ? lhs().result_type() : rhs().result_type(); - assert(result_type() == input_type.map()); + assert(result_type() == ValueType::join(input_type, ValueType::double_type())); auto op = typify_invoke<4,MyTypify,SelectJoinWithNumberOp>(input_type.cell_meta(), _function, primary_is_mutable(), @@ -114,15 +114,12 @@ JoinWithNumberFunction::optimize(const TensorFunction &expr, Stash &stash) { if (! expr.result_type().is_double()) { if (const auto *join = as<Join>(expr)) { - const ValueType &result_type = join->result_type(); const TensorFunction &lhs = join->lhs(); const TensorFunction &rhs = join->rhs(); if (lhs.result_type().is_double()) { - assert(result_type.dimensions() == rhs.result_type().dimensions()); return stash.create<JoinWithNumberFunction>(*join, true); } if (rhs.result_type().is_double()) { - assert(result_type.dimensions() == lhs.result_type().dimensions()); return stash.create<JoinWithNumberFunction>(*join, false); } } |