Skip to content

Commit

Permalink
Work on SubarrayPartitioner
Browse files Browse the repository at this point in the history
- Removed tiledb_subarray_partitioner_t C API
- Added global order for single range in SubarrayPartitioner
- Refactored all tiledb_subarray_partitioner_t unit tests to test class SubarrayPartitioner instead.
- Added more test combinations for SubarrayPartitioner
- Added unit test helper functions that will help clean up all the other unit tests in the future.

Closes #1225
  • Loading branch information
stavrospapadopoulos committed May 3, 2019
1 parent 193f604 commit 235911b
Show file tree
Hide file tree
Showing 19 changed files with 6,612 additions and 9,867 deletions.
2 changes: 0 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

### C API

* Added functions `tiledb_subarray_partitoner_{next, get_current, done}`.
* Added object `tiledb_subarray_partitioner_t` and functions `tiledb_subarray_partitoner_{alloc, free, set_result_budget, set_result_budget_var, get_result_budget, get_result_budget_var}`.
* Added functions `tiledb_subarray_{get_est_result_size, get_est_result_size_var}`.
* Added object `tiledb_subarray_t` and functions `tiledb_subarray_{alloc, free, get_layout, get_type, get_ndim, get_domain, add_range, get_range_num, get_range}`.
* Added function `tiledb_query_get_layout`
Expand Down
25 changes: 0 additions & 25 deletions doc/source/c-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -373,31 +373,6 @@ Subarray
.. doxygenfunction:: tiledb_subarray_get_est_result_size_var
:project: TileDB-C

SubarrayPartitioner
-------------------
.. doxygenfunction:: tiledb_subarray_partitioner_alloc
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_free
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_set_result_budget
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_set_result_budget_var
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_set_memory_budget
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_get_result_budget
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_get_result_budget_var
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_get_memory_budget
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_next
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_get_current
:project: TileDB-C
.. doxygenfunction:: tiledb_subarray_partitioner_done
:project: TileDB-C

Filter
------
.. doxygenfunction:: tiledb_filter_alloc
Expand Down
5 changes: 4 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ list(APPEND TILEDB_CORE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../tiledb/sm/c_
# Gather the test source files
set(TILEDB_TEST_SOURCES
src/helpers.h
src/helpers.cc
src/unit-backwards_compat.cc
src/unit-buffer.cc
src/unit-capi-any.cc
Expand Down Expand Up @@ -69,7 +70,6 @@ set(TILEDB_TEST_SOURCES
src/unit-capi-sparse_real_2.cc
src/unit-capi-string.cc
src/unit-capi-subarray.cc
src/unit-capi-subarray_partitioner.cc
src/unit-capi-uri.cc
src/unit-capi-version.cc
src/unit-capi-vfs.cc
Expand All @@ -84,6 +84,9 @@ set(TILEDB_TEST_SOURCES
src/unit-s3.cc
src/unit-s3-no-multipart.cc
src/unit-status.cc
src/unit-SubarrayPartitioner-dense.cc
src/unit-SubarrayPartitioner-error.cc
src/unit-SubarrayPartitioner-sparse.cc
src/unit-tbb.cc
src/unit-threadpool.cc
src/unit-uri.cc
Expand Down
Loading

0 comments on commit 235911b

Please sign in to comment.