Format and compilation fixes

TileDB-Inc · Nov 14, 2023 · 39e1a84 · 39e1a84
1 parent 45daebd
commit 39e1a84
Show file tree

Hide file tree

Showing 6 changed files with 20,491 additions and 11,771 deletions.
diff --git a/test/src/unit-request-handlers.cc b/test/src/unit-request-handlers.cc
@@ -378,7 +378,6 @@ ArraySchema HandleLoadArraySchemaRequestFx::call_handler(
 }
 
 shared_ptr<ArraySchema> HandleQueryPlanRequestFx::create_schema() {
-  // Create a schema to serialize
   auto schema = make_shared<ArraySchema>(HERE(), ArrayType::DENSE);
   schema->set_capacity(10000);
   throw_if_not_ok(schema->set_cell_order(Layout::ROW_MAJOR));
@@ -409,16 +408,11 @@ std::string HandleQueryPlanRequestFx::call_handler(
     SerializationType stype, Query& query) {
   auto ctx = tiledb::Context();
   auto array = tiledb::Array(ctx, uri_.to_string(), TILEDB_READ);
-  // auto query = tiledb::Query(ctx, array);
   auto req_buf = tiledb_buffer_handle_t::make_handle();
   auto resp_buf = tiledb_buffer_handle_t::make_handle();
 
   serialization::serialize_query_plan_request(
-      //    cfg_, *query.ptr().get()->query_, stype, req_buf->buffer());
-      cfg_,
-      query,
-      stype,
-      req_buf->buffer());
+      cfg_, query, stype, req_buf->buffer());
   auto rval = tiledb_handle_query_plan_request(
       ctx.ptr().get(),
       array.ptr().get(),

diff --git a/tiledb/sm/c_api/tiledb.cc b/tiledb/sm/c_api/tiledb.cc
@@ -4363,6 +4363,7 @@ capi_return_t tiledb_handle_query_plan_request(
       plan.dump_json(),
       static_cast<tiledb::sm::SerializationType>(serialization_type),
       response->buffer());
+
   return TILEDB_OK;
 }
 

diff --git a/tiledb/sm/query_plan/query_plan.cc b/tiledb/sm/query_plan/query_plan.cc
@@ -75,6 +75,7 @@ QueryPlan::QueryPlan(Query& query) {
   if (query.is_dense()) {
     dimensions_ = query.array()->array_schema_latest().dim_names();
   }
+
   std::sort(attributes_.begin(), attributes_.end());
   std::sort(dimensions_.begin(), dimensions_.end());
 }

diff --git a/tiledb/sm/serialization/enumeration.cc b/tiledb/sm/serialization/enumeration.cc
@@ -40,7 +40,9 @@
 // clang-format on
 
 #include "tiledb/sm/array_schema/enumeration.h"
+#include "tiledb/sm/config/config.h"
 #include "tiledb/sm/enums/serialization_type.h"
+#include "tiledb/sm/serialization/enumeration.h"
 
 using namespace tiledb::common;
 
@@ -361,7 +363,7 @@ std::vector<std::string> deserialize_load_enumerations_request(
 }
 
 void serialize_load_enumerations_response(
-    const std::vector<shared_ptr<const Enumeration>>,
+    const std::vector<shared_ptr<const Enumeration>>&,
     SerializationType,
     Buffer&) {
   throw Status_SerializationError(

diff --git a/tiledb/sm/serialization/query_plan.cc b/tiledb/sm/serialization/query_plan.cc
@@ -36,12 +36,15 @@
 #include <capnp/message.h>
 #include <capnp/serialize.h>
 #include "tiledb/sm/serialization/capnp_utils.h"
-#include "tiledb/sm/serialization/query.h"
 #endif
 // clang-format on
 
 #include "tiledb/sm/query_plan/query_plan.h"
+#include "tiledb/common/thread_pool.h"
+#include "tiledb/sm/config/config.h"
 #include "tiledb/sm/enums/serialization_type.h"
+#include "tiledb/sm/serialization/query.h"
+#include "tiledb/sm/serialization/query_plan.h"
 
 using namespace tiledb::common;