User can now set coordinate buffers separately for each dimension to …

…write queries. (#1458)
TileDB-Inc · Dec 13, 2019 · a6c5381 · a6c5381
1 parent e217587
commit a6c5381
Show file tree

Hide file tree

Showing 35 changed files with 1,230 additions and 568 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -5,6 +5,7 @@
 ## Improvements
 
 * Added support for indicating zero-value metadata by returning `value_num` == 1 from the `_get_metadatata` and `Array::get_metadata` APIs [#1438](https://github.com/TileDB-Inc/TileDB/pull/1438) (this is a non-breaking change, as the documented return of `value == nullptr` to indicate missing keys does not change)`
+* User can set coordinate buffers separately for write queries.
 
 ## Deprecations
 

diff --git a/test/src/helpers.cc b/test/src/helpers.cc
@@ -33,6 +33,9 @@
 #include "helpers.h"
 #include "catch.hpp"
 
+namespace tiledb {
+namespace test {
+
 template <class T>
 void check_partitions(
     tiledb::sm::SubarrayPartitioner& partitioner,
@@ -449,7 +452,7 @@ void write_array(
     tiledb_ctx_t* ctx,
     const std::string& array_name,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers) {
+    const QueryBuffers& buffers) {
   // Open array
   tiledb_array_t* array;
   int rc = tiledb_array_alloc(ctx, array_name.c_str(), &array);
@@ -465,7 +468,7 @@ void write_array(
   CHECK(rc == TILEDB_OK);
 
   // Set buffers
-  for (const auto& b : attr_buffers) {
+  for (const auto& b : buffers) {
     if (b.second.var_ == nullptr) {  // Fixed-sized
       rc = tiledb_query_set_buffer(
           ctx,
@@ -510,7 +513,7 @@ void read_array(
     tiledb_array_t* array,
     const SubarrayRanges<T>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers) {
+    const QueryBuffers& buffers) {
   // Create query
   tiledb_query_t* query;
   int rc = tiledb_query_alloc(ctx, array, TILEDB_READ, &query);
@@ -529,7 +532,7 @@ void read_array(
   }
 
   // Set buffers
-  for (const auto& b : attr_buffers) {
+  for (const auto& b : buffers) {
     if (b.second.var_ == nullptr) {  // Fixed-sized
       rc = tiledb_query_set_buffer(
           ctx,
@@ -566,7 +569,6 @@ void read_array(
 }
 
 // Explicit template instantiations
-
 template void check_subarray<int8_t>(
     tiledb::sm::Subarray& subarray, const SubarrayRanges<int8_t>& ranges);
 template void check_subarray<uint8_t>(
@@ -685,58 +687,62 @@ template void read_array<int8_t>(
     tiledb_array_t* array,
     const SubarrayRanges<int8_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<uint8_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<uint8_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<int16_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<int16_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<uint16_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<uint16_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<int32_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<int32_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<uint32_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<uint32_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<int64_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<int64_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<uint64_t>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<uint64_t>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<float>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<float>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 template void read_array<double>(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<double>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
+
+}  // End of namespace test
+
+}  // End of namespace tiledb
diff --git a/test/src/helpers.h b/test/src/helpers.h
@@ -42,31 +42,38 @@
 #include <string>
 #include <thread>
 
+namespace tiledb {
+
+namespace test {
+
 // For easy reference
 typedef std::pair<tiledb_filter_type_t, int> Compressor;
 template <class T>
 using SubarrayRanges = std::vector<std::vector<T>>;
 
-/** Helper struct for the buffers of an attribute (fixed- or var-sized). */
-struct AttrBuffer {
+/**
+ * Helper struct for the buffers of an attribute/dimension
+ * (fixed- or var-sized).
+ */
+struct QueryBuffer {
   /**
-   * For fixed-sized attributes, it contains the fixed-sized values.
-   * For var-sized attributes, it contains the offsets.
+   * For fixed-sized attributes/dimensions, it contains the fixed-sized values.
+   * For var-sized attributes/dimensions, it contains the offsets.
    * var buffer is nullptr.
    */
   void* fixed_;
   /** Size of fixed buffer. */
   uint64_t fixed_size_;
   /**
-   * For fixed-sized attributes, it is `nullptr`.
-   * For var-sized attributes, it contains the var-sized values.
+   * For fixed-sized attributes/dimensions, it is `nullptr`.
+   * For var-sized attributes/dimensions, it contains the var-sized values.
    */
   void* var_;
   /** Size of var buffer. */
   uint64_t var_size_;
 };
-/** Map attribute_name -> AttrBuffer */
-typedef std::map<std::string, AttrBuffer> AttrBuffers;
+/** Map attribute/dimension name -> QueryBuffer */
+typedef std::map<std::string, QueryBuffer> QueryBuffers;
 
 /**
  * Checks that the input partitioner produces the input partitions
@@ -297,13 +304,13 @@ int set_attribute_compression_filter(
  * @param ctx The TileDB context.
  * @param array_name The array name.
  * @param layout The layout to write into.
- * @param attr_buffers The attribute buffers to be written.
+ * @param buffers The attribute/dimension buffers to be written.
  */
 void write_array(
     tiledb_ctx_t* ctx,
     const std::string& array_name,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
 
 /**
  * Performs a single read to an array.
@@ -313,14 +320,18 @@ void write_array(
  * @param array The input array.
  * @param The subarray ranges.
  * @param layout The query layout.
- * @param attr_buffers The attribute buffers to be read.
+ * @param buffers The attribute/dimension buffers to be read.
  */
 template <class T>
 void read_array(
     tiledb_ctx_t* ctx,
     tiledb_array_t* array,
     const SubarrayRanges<T>& ranges,
     tiledb_layout_t layout,
-    const AttrBuffers& attr_buffers);
+    const QueryBuffers& buffers);
+
+}  // End of namespace test
+
+}  // End of namespace tiledb
 
 #endif
diff --git a/test/src/unit-CellSlabIter.cc b/test/src/unit-CellSlabIter.cc
@@ -44,6 +44,7 @@
 #include <iostream>
 
 using namespace tiledb::sm;
+using namespace tiledb::test;
 
 /* ********************************* */
 /*         STRUCT DEFINITION         */
@@ -151,8 +152,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -200,8 +201,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -254,8 +255,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -306,8 +307,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -355,8 +356,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);

diff --git a/test/src/unit-ReadCellSlabIter.cc b/test/src/unit-ReadCellSlabIter.cc
@@ -44,6 +44,7 @@
 #include <iostream>
 
 using namespace tiledb::sm;
+using namespace tiledb::test;
 
 /* ********************************* */
 /*         STRUCT DEFINITION         */
@@ -199,8 +200,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -257,8 +258,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -315,8 +316,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -379,8 +380,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       TILEDB_ROW_MAJOR,
       TILEDB_ROW_MAJOR,
       2);
@@ -580,8 +581,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       tile_order,
       cell_order,
       2);
@@ -749,8 +750,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       tile_order,
       cell_order,
       2);
@@ -931,8 +932,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       tile_order,
       cell_order,
       2);
@@ -1158,8 +1159,8 @@ TEST_CASE_METHOD(
       {"a", "b"},
       {TILEDB_INT32, TILEDB_INT32},
       {1, TILEDB_VAR_NUM},
-      {::Compressor(TILEDB_FILTER_LZ4, -1),
-       ::Compressor(TILEDB_FILTER_LZ4, -1)},
+      {tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1),
+       tiledb::test::Compressor(TILEDB_FILTER_LZ4, -1)},
       tile_order,
       cell_order,
       2);

diff --git a/test/src/unit-Reader.cc b/test/src/unit-Reader.cc
@@ -44,6 +44,7 @@
 #include <iostream>
 
 using namespace tiledb::sm;
+using namespace tiledb::test;
 
 /* ********************************* */
 /*         STRUCT DEFINITION         */