diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2016-12-13 16:33:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-13 16:33:12 +0100 |
commit | adba206aa6cc71900716b59ea97a46596feb6f6d (patch) | |
tree | 9389906e9c29f0d5157b5b7514efe5dc63a4bb04 /searchlib/src/tests/fef | |
parent | 0b999914f33a0ef6166beca9a6c45e39a4b5a764 (diff) | |
parent | 7815066daa241b6d80e3a780636bc1c787923305 (diff) |
Merge pull request #1321 from yahoo/havardpe/avoid-match-data-in-feature-inputs-and-outputs
move features out of match data
Diffstat (limited to 'searchlib/src/tests/fef')
-rw-r--r-- | searchlib/src/tests/fef/featureoverride/featureoverride.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/searchlib/src/tests/fef/featureoverride/featureoverride.cpp b/searchlib/src/tests/fef/featureoverride/featureoverride.cpp index 5ae0efa9291..80389064a8f 100644 --- a/searchlib/src/tests/fef/featureoverride/featureoverride.cpp +++ b/searchlib/src/tests/fef/featureoverride/featureoverride.cpp @@ -26,11 +26,7 @@ struct Fixture MatchData::UP md; Fixture() : mdl(), stash(), executors(), md() {} Fixture &add(FeatureExecutor *executor, size_t outCnt) { - executor->inputs_done(); - for (uint32_t outIdx = 0; outIdx < outCnt; ++outIdx) { - executor->bindOutput(mdl.allocFeature()); - } - executor->outputs_done(); + executor->bind_outputs(stash.create_array<NumberOrObject>(outCnt)); executors.push_back(executor); return *this; } @@ -93,7 +89,6 @@ TEST_F("test decorator - non-existing override", Fixture) TEST_F("test decorator - transitive override", Fixture) { - FeatureExecutor::SharedInputs inputs; FeatureExecutor *fe = &f.createValueExecutor(); vespalib::Stash &stash = f.stash; fe = &stash.create<FeatureOverrider>(*fe, 1, 50.0); @@ -101,11 +96,12 @@ TEST_F("test decorator - transitive override", Fixture) EXPECT_EQUAL(fe->outputs().size(), 3u); FeatureExecutor *fe2 = &stash.create<DoubleExecutor>(3); - fe2->bind_shared_inputs(inputs); - fe2->addInput(fe->outputs()[0]); - fe2->addInput(fe->outputs()[1]); - fe2->addInput(fe->outputs()[2]); fe2 = &stash.create<FeatureOverrider>(*fe2, 2, 10.0); + auto inputs = stash.create_array<const NumberOrObject *>(3); + inputs[0] = fe->outputs().get_raw(0); + inputs[1] = fe->outputs().get_raw(1); + inputs[2] = fe->outputs().get_raw(2); + fe2->bind_inputs(inputs); f.add(fe2, 3).run(); EXPECT_EQUAL(fe2->outputs().size(), 3u); |