remove clone() and equals() on all Value subclasses

9 files changed, 0 insertions, 65 deletions

diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp
index da0e67975ef..757072e74c4 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.cpp
@@ -190,31 +190,6 @@ DenseTensorView::apply(const CellFunction &func) const
     return dispatch_1<CallApply>(_cellsRef, _typeRef, func);
 }
 
-bool
-DenseTensorView::equals(const Tensor &arg) const
-{
-    if (fast_type() == arg.type()) {
-        return sameCells(cells(), arg.cells());
-    }
-    return false;
-}
-
-struct CallClone {
-    template<class CT>
-    static Tensor::UP
-    call(const ConstArrayRef<CT> &cells, eval::ValueType newType)
-    {
-        std::vector<CT> newCells(cells.begin(), cells.end());
-        return std::make_unique<DenseTensor<CT>>(std::move(newType), std::move(newCells));
-    }
-};
-
-Tensor::UP
-DenseTensorView::clone() const
-{
-    return dispatch_1<CallClone>(_cellsRef, _typeRef);
-}
-
 namespace {
 
 void
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h
index cd0e1ae84da..3ebd62208c3 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h
+++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_view.h
@@ -41,8 +41,6 @@ public:
     std::unique_ptr<Tensor> modify(join_fun_t op, const CellValues &cellValues) const override;
     std::unique_ptr<Tensor> add(const Tensor &arg) const override;
     std::unique_ptr<Tensor> remove(const CellValues &) const override;
-    bool equals(const Tensor &arg) const override;
-    Tensor::UP clone() const override;
     eval::TensorSpec toSpec() const override;
     void accept(TensorVisitor &visitor) const override;
     MemoryUsage get_memory_usage() const override {
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp
index bd6c2b28157..5149b5bfb86 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.cpp
@@ -75,16 +75,6 @@ SparseTensor::type() const
     return _type;
 }
 
-bool
-SparseTensor::equals(const Tensor &arg) const
-{
-    const SparseTensor *rhs = dynamic_cast<const SparseTensor *>(&arg);
-    if (!rhs) {
-        return false;
-    }
-    return *this == *rhs;
-}
-
 TensorSpec
 SparseTensor::toSpec() const
 {
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h
index 441dd2670f9..5fdd466d15f 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h
@@ -32,7 +32,6 @@ public:
     eval::ValueType combineDimensionsWith(const SparseTensor &rhs) const;
 
     const eval::ValueType &type() const override;
-    bool equals(const Tensor &arg) const override;
     eval::TensorSpec toSpec() const override;
 };
 
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.cpp
index d47ba27d796..164d9bc957f 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.cpp
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.cpp
@@ -169,13 +169,6 @@ SparseTensorT<T>::apply(const CellFunction &func) const
 
 template<typename T>
 Tensor::UP
-SparseTensorT<T>::clone() const
-{
-    return std::make_unique<SparseTensorT<T>>(fast_type(), index().shrunk_copy(), _values);
-}
-
-template<typename T>
-Tensor::UP
 SparseTensorT<T>::join(join_fun_t function, const Tensor &arg) const
 {
     const SparseTensor *rhs = dynamic_cast<const SparseTensor *>(&arg);
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.h
index 5a9aaa224c6..ed8c1f427f9 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.h
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_t.h
@@ -29,7 +29,6 @@ public:
     void accept(TensorVisitor &visitor) const override;
     Tensor::UP add(const Tensor &arg) const override;
     Tensor::UP apply(const CellFunction &func) const override;
-    Tensor::UP clone() const override;
     Tensor::UP join(join_fun_t function, const Tensor &arg) const override;
     Tensor::UP merge(join_fun_t function, const Tensor &arg) const override;
     Tensor::UP modify(join_fun_t op, const CellValues &cellValues) const override;
diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h
index 6a8fd9adc45..01cf6e8e61d 100644
--- a/eval/src/vespa/eval/tensor/tensor.h
+++ b/eval/src/vespa/eval/tensor/tensor.h
@@ -56,8 +56,6 @@ public:
      */
     virtual std::unique_ptr<Tensor> remove(const CellValues &cellAddresses) const = 0;
 
-    virtual bool equals(const Tensor &arg) const = 0; // want to remove, but needed by document
-    virtual Tensor::UP clone() const = 0; // want to remove, but needed by document
     virtual eval::TensorSpec toSpec() const = 0;
     virtual void accept(TensorVisitor &visitor) const = 0;
 
diff --git a/eval/src/vespa/eval/tensor/wrapped_simple_tensor.cpp b/eval/src/vespa/eval/tensor/wrapped_simple_tensor.cpp
index 178935fce00..fd49d1d83bc 100644
--- a/eval/src/vespa/eval/tensor/wrapped_simple_tensor.cpp
+++ b/eval/src/vespa/eval/tensor/wrapped_simple_tensor.cpp
@@ -16,14 +16,6 @@ namespace vespalib::tensor {
 using eval::SimpleTensor;
 using eval::TensorSpec;
 
-bool
-WrappedSimpleTensor::equals(const Tensor &arg) const
-{
-    auto lhs_spec = _tensor.engine().to_spec(_tensor);
-    auto rhs_spec = arg.engine().to_spec(arg);
-    return (lhs_spec == rhs_spec);
-}
-
 eval::TensorSpec
 WrappedSimpleTensor::toSpec() const
 {
@@ -67,13 +59,6 @@ WrappedSimpleTensor::get_memory_usage() const
     return MemoryUsage(used, used, 0, 0);
 }
 
-Tensor::UP
-WrappedSimpleTensor::clone() const
-{
-    auto tensor = std::make_unique<eval::SimpleTensor>(_tensor.type(), _tensor.my_cells());
-    return std::make_unique<WrappedSimpleTensor>(std::move(tensor));
-}
-
 //-----------------------------------------------------------------------------
 
 Tensor::UP
diff --git a/eval/src/vespa/eval/tensor/wrapped_simple_tensor.h b/eval/src/vespa/eval/tensor/wrapped_simple_tensor.h
index 87b08427765..c2199ccb49d 100644
--- a/eval/src/vespa/eval/tensor/wrapped_simple_tensor.h
+++ b/eval/src/vespa/eval/tensor/wrapped_simple_tensor.h
@@ -31,12 +31,10 @@ public:
     ~WrappedSimpleTensor() {}
     const eval::SimpleTensor &get() const { return _tensor; }
     const eval::ValueType &type() const override { return _tensor.type(); }
-    bool equals(const Tensor &arg) const override;
     eval::TensorSpec toSpec() const override;
     double as_double() const override;
     void accept(TensorVisitor &visitor) const override;
     MemoryUsage get_memory_usage() const override;
-    Tensor::UP clone() const override;
     // functions below should not be used for this implementation
     Tensor::UP apply(const CellFunction &) const override;
     Tensor::UP join(join_fun_t, const Tensor &) const override;