Improved constructors [skip ci]

Author: ankane

include/pgvector/halfvec.hpp

@@ -16,32 +16,18 @@ namespace pgvector {
 /// A half vector.
 class HalfVector {
   public:
-    /// @private
-    // TODO remove in 0.3.0
-    HalfVector() = default;
-
     /// Creates a half vector from a `std::vector<float>`.
-    // TODO add explicit in 0.3.0
-    HalfVector(const std::vector<float>& value) {
+    explicit HalfVector(const std::vector<float>& value) {
         value_ = value;
     }
 
     /// Creates a half vector from a `std::vector<float>`.
-    // TODO add explicit in 0.3.0
-    // TODO add noexcept in 0.3.0
-    HalfVector(std::vector<float>&& value) {
+    explicit HalfVector(std::vector<float>&& value) noexcept {
         value_ = std::move(value);
     }
 
-    /// Creates a half vector from an array.
-    // TODO remove in 0.3.0
-    HalfVector(const float* value, size_t n) {
-        value_ = std::vector<float>{value, value + n};
-    }
-
     /// Creates a half vector from a span.
-    // TODO add explicit in 0.3.0
-    HalfVector(std::span<const float> value) {
+    explicit HalfVector(std::span<const float> value) {
         value_ = std::vector<float>(value.begin(), value.end());
     }
 

include/pgvector/sparsevec.hpp

@@ -18,10 +18,6 @@ namespace pgvector {
 /// A sparse vector.
 class SparseVector {
   public:
-    /// @private
-    // TODO remove in 0.3.0
-    SparseVector() = default;
-
     /// @private
     SparseVector(int dimensions, const std::vector<int>& indices, const std::vector<float>& values) {
         if (values.size() != indices.size()) {
@@ -33,8 +29,7 @@ class SparseVector {
     }
 
     /// Creates a sparse vector from a dense vector.
-    // TODO add explicit in 0.3.0
-    SparseVector(const std::vector<float>& value) {
+    explicit SparseVector(const std::vector<float>& value) {
         dimensions_ = value.size();
         for (size_t i = 0; i < value.size(); i++) {
             float v = value[i];
@@ -46,8 +41,7 @@ class SparseVector {
     }
 
     /// Creates a sparse vector from a span.
-    // TODO add explicit in 0.3.0
-    SparseVector(std::span<const float> value) {
+    explicit SparseVector(std::span<const float> value) {
         dimensions_ = value.size();
         for (size_t i = 0; i < value.size(); i++) {
             float v = value[i];

include/pgvector/vector.hpp

@@ -16,32 +16,18 @@ namespace pgvector {
 /// A vector.
 class Vector {
   public:
-    /// @private
-    // TODO remove in 0.3.0
-    Vector() = default;
-
     /// Creates a vector from a `std::vector<float>`.
-    // TODO add explicit in 0.3.0
-    Vector(const std::vector<float>& value) {
+    explicit Vector(const std::vector<float>& value) {
         value_ = value;
     }
 
     /// Creates a vector from a `std::vector<float>`.
-    // TODO add explicit in 0.3.0
-    // TODO add noexcept in 0.3.0
-    Vector(std::vector<float>&& value) {
+    explicit Vector(std::vector<float>&& value) noexcept {
         value_ = std::move(value);
     }
 
-    /// Creates a vector from an array.
-    // TODO remove in 0.3.0
-    Vector(const float* value, size_t n) {
-        value_ = std::vector<float>{value, value + n};
-    }
-
     /// Creates a vector from a span.
-    // TODO add explicit in 0.3.0
-    Vector(std::span<const float> value) {
+    explicit Vector(std::span<const float> value) {
         value_ = std::vector<float>(value.begin(), value.end());
     }
 

test/pqxx_test.cpp

@@ -26,7 +26,7 @@ void test_vector(pqxx::connection &conn) {
     auto embedding = pgvector::Vector({1, 2, 3});
     assert(embedding.dimensions() == 3);
     float arr[] = {4, 5, 6};
-    auto embedding2 = pgvector::Vector(arr, 3);
+    auto embedding2 = pgvector::Vector(std::span{arr, 3});
     tx.exec("INSERT INTO items (embedding) VALUES ($1), ($2), ($3)", {embedding, embedding2, std::nullopt});
 
     pqxx::result res = tx.exec("SELECT embedding FROM items ORDER BY embedding <-> $1", {embedding2});
@@ -43,7 +43,7 @@ void test_halfvec(pqxx::connection &conn) {
     auto embedding = pgvector::HalfVector({1, 2, 3});
     assert(embedding.dimensions() == 3);
     float arr[] = {4, 5, 6};
-    auto embedding2 = pgvector::HalfVector(arr, 3);
+    auto embedding2 = pgvector::HalfVector(std::span{arr, 3});
     tx.exec("INSERT INTO items (half_embedding) VALUES ($1), ($2), ($3)", {embedding, embedding2, std::nullopt});
 
     pqxx::result res = tx.exec("SELECT half_embedding FROM items ORDER BY half_embedding <-> $1", {embedding2});