[c++] Add ManagedQuery constructor that takes SOMAArray

single-cell-data · Nov 2, 2024 · 6f1119a · 6f1119a
1 parent 5f154bf
commit 6f1119a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/libtiledbsoma/src/soma/managed_query.cc b/libtiledbsoma/src/soma/managed_query.cc
@@ -56,6 +56,17 @@ ManagedQuery::ManagedQuery(
     reset();
 }
 
+ManagedQuery::ManagedQuery(
+    std::unique_ptr<SOMAArray> array,
+    std::shared_ptr<Context> ctx,
+    std::string_view name)
+    : array_(array->arr_)
+    , ctx_(ctx)
+    , name_(name)
+    , schema_(std::make_shared<ArraySchema>(array->arr_->schema())) {
+    reset();
+}
+
 void ManagedQuery::close() {
     array_->close();
 }

diff --git a/libtiledbsoma/src/soma/managed_query.h b/libtiledbsoma/src/soma/managed_query.h
@@ -48,6 +48,7 @@
 namespace tiledbsoma {
 
 using namespace tiledb;
+class SOMAArray;
 
 // Probably we should just use a std::tuple here
 class StatusAndException {
@@ -86,6 +87,11 @@ class ManagedQuery {
         std::shared_ptr<Context> ctx,
         std::string_view name = "unnamed");
 
+    ManagedQuery(
+        std::unique_ptr<SOMAArray> array,
+        std::shared_ptr<Context> ctx,
+        std::string_view name = "unnamed");
+
     ManagedQuery() = delete;
 
     ManagedQuery(const ManagedQuery&) = delete;
@@ -406,6 +412,16 @@ class ManagedQuery {
         return query_->query_type();
     }
 
+    /**
+     * @brief Return the query status.
+     *
+     * @return tiledb::Query::Status INCOMPLETE, COMPLETE, INPROGRESS, FAILED,
+     * UNINITIALIZED, or INITIALIZED
+     */
+    Query::Status query_status() const {
+        return query_->query_status();
+    }
+
    private:
     //===================================================================
     //= private non-static

diff --git a/libtiledbsoma/src/soma/soma_array.h b/libtiledbsoma/src/soma/soma_array.h
@@ -98,6 +98,8 @@ enum class Domainish {
 
 class SOMAArray : public SOMAObject {
    public:
+    friend class ManagedQuery;
+
     //===================================================================
     //= public static
     //===================================================================