Merge pull request #15442 from vespa-engine/arnej/flip-engine-default

Flip default to FastValueBuilderFactory

6 files changed, 10 insertions, 35 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index 92e9ca43193..fe0b9841d1c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -993,29 +993,4 @@ public class ContentClusterTest extends ContentBaseTest {
         assertDirectStorageApiRpcFlagIsPropagatedToConfig(true);
     }
 
-
-    @Test
-    public void use_fast_value_tensor_implementation_config_is_controlled_by_properties() {
-        assertUseFastValueTensorImplementationFlagIsPropagatedToConfig(false);
-        assertUseFastValueTensorImplementationFlagIsPropagatedToConfig(true);
-    }
-
-    void assertUseFastValueTensorImplementationFlagIsPropagatedToConfig(boolean useFastValueTensorImplementation) {
-        VespaModel model = createEnd2EndOneNode(new TestProperties().setUseFastValueTensorImplementation(useFastValueTensorImplementation));
-        ContentCluster cc = model.getContentClusters().get("storage");
-        var node = cc.getSearch().getSearchNodes().get(0);
-        if (useFastValueTensorImplementation) {
-            assertTensorImplementationConfig(ProtonConfig.Tensor_implementation.FAST_VALUE, node);
-        } else {
-            assertTensorImplementationConfig(ProtonConfig.Tensor_implementation.TENSOR_ENGINE, node);
-        }
-    }
-
-    void assertTensorImplementationConfig(ProtonConfig.Tensor_implementation.Enum exp, SearchNode node) {
-        var builder = new ProtonConfig.Builder();
-        node.getConfig(builder);
-        var config = new ProtonConfig(builder);
-        assertEquals(exp, config.tensor_implementation());
-    }
-
 }
diff --git a/document/src/test/resources/tensor/multi_cell_tensor__cpp b/document/src/test/resources/tensor/multi_cell_tensor__cpp
index 9adda236a4a..deb53463fb5 100644
--- a/document/src/test/resources/tensor/multi_cell_tensor__cpp
+++ b/document/src/test/resources/tensor/multi_cell_tensor__cpp
diff --git a/eval/src/tests/eval/engine_or_factory/engine_or_factory_override_test.cpp b/eval/src/tests/eval/engine_or_factory/engine_or_factory_override_test.cpp
index 8480bb7d39e..3aa804b0722 100644
--- a/eval/src/tests/eval/engine_or_factory/engine_or_factory_override_test.cpp
+++ b/eval/src/tests/eval/engine_or_factory/engine_or_factory_override_test.cpp
@@ -10,16 +10,16 @@ using namespace vespalib::eval;
 using namespace vespalib::tensor;
 
 TEST(EngineOrFactoryOverrideTest, set_can_override_get_result) {
-    EngineOrFactory::set(FastValueBuilderFactory::get());
-    EXPECT_EQ(EngineOrFactory::get().to_string(), "FastValueBuilderFactory");
+    EngineOrFactory::set(DefaultTensorEngine::ref());
+    EXPECT_EQ(EngineOrFactory::get().to_string(), "DefaultTensorEngine");
 }
 
 TEST(EngineOrFactoryOverrideTest, set_with_same_value_is_allowed) {
-    EngineOrFactory::set(FastValueBuilderFactory::get());
+    EngineOrFactory::set(DefaultTensorEngine::ref());
 }
 
 TEST(EngineOrFactoryOverrideTest, set_with_another_value_is_not_allowed) {
-    EXPECT_THROW(EngineOrFactory::set(DefaultTensorEngine::ref()), vespalib::IllegalStateException);
+    EXPECT_THROW(EngineOrFactory::set(FastValueBuilderFactory::get()), vespalib::IllegalStateException);
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/eval/src/tests/eval/engine_or_factory/engine_or_factory_test.cpp b/eval/src/tests/eval/engine_or_factory/engine_or_factory_test.cpp
index 6cb9cc0c89c..3acfc40f5b5 100644
--- a/eval/src/tests/eval/engine_or_factory/engine_or_factory_test.cpp
+++ b/eval/src/tests/eval/engine_or_factory/engine_or_factory_test.cpp
@@ -9,16 +9,16 @@
 using namespace vespalib::eval;
 using namespace vespalib::tensor;
 
-TEST(EngineOrFactoryTest, default_is_default_tensor_engine) {
-    EXPECT_EQ(EngineOrFactory::get().to_string(), "DefaultTensorEngine");
+TEST(EngineOrFactoryTest, default_is_fast_value_builder_factory) {
+    EXPECT_EQ(EngineOrFactory::get().to_string(), "FastValueBuilderFactory");
 }
 
 TEST(EngineOrFactoryTest, set_with_same_value_is_allowed) {
-    EngineOrFactory::set(DefaultTensorEngine::ref());
+    EngineOrFactory::set(FastValueBuilderFactory::get());
 }
 
 TEST(EngineOrFactoryTest, set_with_another_value_is_not_allowed) {
-    EXPECT_THROW(EngineOrFactory::set(FastValueBuilderFactory::get()), vespalib::IllegalStateException);
+    EXPECT_THROW(EngineOrFactory::set(DefaultTensorEngine::ref()), vespalib::IllegalStateException);
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/eval/src/vespa/eval/eval/engine_or_factory.cpp b/eval/src/vespa/eval/eval/engine_or_factory.cpp
index 4a95a57e10e..dc29bfa1852 100644
--- a/eval/src/vespa/eval/eval/engine_or_factory.cpp
+++ b/eval/src/vespa/eval/eval/engine_or_factory.cpp
@@ -26,7 +26,7 @@ using namespace vespalib::eval::instruction;
 
 namespace vespalib::eval {
 
-EngineOrFactory EngineOrFactory::_default{tensor::DefaultTensorEngine::ref()};
+EngineOrFactory EngineOrFactory::_default{FastValueBuilderFactory::get()};
 
 
 EngineOrFactory
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index 5ace4b66803..08bb68b1b40 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -499,4 +499,4 @@ bucketdb.checksumtype enum {LEGACY, XXHASH64} default = LEGACY restart
 ## TENSOR_ENGINE (default) uses DefaultTensorEngine, which has been the production implementation for years.
 ## FAST_VALUE uses the new and optimized FastValueBuilderFactory instead.
 ## TODO: Remove when default has been switched to FAST_VALUE.
-tensor_implementation enum {TENSOR_ENGINE, FAST_VALUE} default = TENSOR_ENGINE
+tensor_implementation enum {TENSOR_ENGINE, FAST_VALUE} default = FAST_VALUE