rename new API

new_encode -> encode_value
new_decode -> decode_value

4 files changed, 10 insertions, 10 deletions

diff --git a/eval/src/tests/eval/value_codec/value_codec_test.cpp b/eval/src/tests/eval/value_codec/value_codec_test.cpp
index 12e1af0d7d5..7968e5cb107 100644
--- a/eval/src/tests/eval/value_codec/value_codec_test.cpp
+++ b/eval/src/tests/eval/value_codec/value_codec_test.cpp
@@ -18,7 +18,7 @@ struct Factory {
         return value_from_spec(spec, simple);
     }
     std::unique_ptr<Value> decode(nbostream &input) {
-        return new_decode(input, simple);
+        return decode_value(input, simple);
     }
 } simple_factory;
 
@@ -104,8 +104,8 @@ struct TensorExample {
         encode_with_float(expect_float);
         nbostream data_double;
         nbostream data_float;
-        new_encode(*make_tensor(false), data_double);
-        new_encode(*make_tensor(true), data_float);
+        encode_value(*make_tensor(false), data_double);
+        encode_value(*make_tensor(true), data_float);
         EXPECT_EQ(Memory(data_double.peek(), data_double.size()),
                   Memory(expect_default.peek(), expect_default.size()));
         EXPECT_EQ(Memory(data_float.peek(), data_float.size()),
diff --git a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
index c00b0e5d35b..4a6698b021e 100644
--- a/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
+++ b/eval/src/tests/tensor/tensor_serialization/tensor_serialization_test.cpp
@@ -53,9 +53,9 @@ TensorSpec verify_new_value_serialized(const ExpBuffer &exp, const TensorSpec &s
     auto new_value = vespalib::eval::value_from_spec(spec, factory);
     auto new_value_spec = vespalib::eval::spec_from_value(*new_value);
     nbostream actual;
-    vespalib::eval::new_encode(*new_value, actual);
+    vespalib::eval::encode_value(*new_value, actual);
     ASSERT_EQUAL(exp, actual);
-    auto new_decoded = vespalib::eval::new_decode(actual, factory);
+    auto new_decoded = vespalib::eval::decode_value(actual, factory);
     auto new_decoded_spec = vespalib::eval::spec_from_value(*new_decoded);
     EXPECT_EQUAL(0u, actual.size());
     EXPECT_EQUAL(new_value_spec, new_decoded_spec);
diff --git a/eval/src/vespa/eval/eval/value_codec.cpp b/eval/src/vespa/eval/eval/value_codec.cpp
index ddca54995d0..e1ea0fa04c3 100644
--- a/eval/src/vespa/eval/eval/value_codec.cpp
+++ b/eval/src/vespa/eval/eval/value_codec.cpp
@@ -265,7 +265,7 @@ struct ContentEncoder {
     }
 };
     
-void new_encode(const Value &value, nbostream &output) {
+void encode_value(const Value &value, nbostream &output) {
     size_t num_mapped_dims = value.type().count_mapped_dimensions();
     size_t dense_subspace_size = value.type().dense_subspace_size();
     Format format(value.type());
@@ -276,7 +276,7 @@ void new_encode(const Value &value, nbostream &output) {
     typify_invoke<1,TypifyCellType,ContentEncoder>(value.type().cell_type(), value, state, output);
 }
 
-std::unique_ptr<Value> new_decode(nbostream &input, const ValueBuilderFactory &factory) {
+std::unique_ptr<Value> decode_value(nbostream &input, const ValueBuilderFactory &factory) {
     Format format(input.getInt1_4Bytes());
     ValueType type = decode_type(input, format);
     size_t num_mapped_dims = type.count_mapped_dimensions();
diff --git a/eval/src/vespa/eval/eval/value_codec.h b/eval/src/vespa/eval/eval/value_codec.h
index 08b0ac73cc3..3644f952a6c 100644
--- a/eval/src/vespa/eval/eval/value_codec.h
+++ b/eval/src/vespa/eval/eval/value_codec.h
@@ -10,14 +10,14 @@ namespace vespalib { class nbostream; }
 namespace vespalib::eval {
 
 /**
- * encode a value to binary format
+ * encode a value (which must support the new APIs) to binary format
  **/
-void new_encode(const Value &value, nbostream &output);
+void encode_value(const Value &value, nbostream &output);
 
 /**
  * decode a value from binary format
  **/
-std::unique_ptr<Value> new_decode(nbostream &input, const ValueBuilderFactory &factory);
+std::unique_ptr<Value> decode_value(nbostream &input, const ValueBuilderFactory &factory);
 
 /**
  * Make a value from a tensor spec using a value builder factory