Merge 66c7248 into ac60625

HDFGroup · Sep 16, 2022 · abc2b98 · abc2b98
2 parents ac60625 + 66c7248
commit abc2b98
Show file tree

Hide file tree

Showing 17 changed files with 690 additions and 291 deletions.
diff --git a/adapter/mpiio/datastructures.h b/adapter/mpiio/datastructures.h
@@ -17,7 +17,7 @@
  * Standard header
  */
 #include <ftw.h>
-
+#include <set>
 #include <string>
 
 /**

diff --git a/adapter/posix/datastructures.h b/adapter/posix/datastructures.h
@@ -17,7 +17,7 @@
  * Standard header
  */
 #include <ftw.h>
-
+#include <set>
 #include <string>
 
 /**

diff --git a/adapter/stdio/datastructures.h b/adapter/stdio/datastructures.h
@@ -17,7 +17,7 @@
  * Standard header
  */
 #include <ftw.h>
-
+#include <set>
 #include <string>
 
 /**
@@ -28,6 +28,7 @@
  * Internal header
  */
 #include <bucket.h>
+#include <vbucket.h>
 #include <buffer_pool.h>
 #include <hermes_types.h>
 #include <traits.h>

diff --git a/adapter/test/vfd/hermes_vfd_test.cc b/adapter/test/vfd/hermes_vfd_test.cc
@@ -218,7 +218,7 @@ struct Hdf5Api {
   }
 
   /**
-   * Create a 1-dimensional dataset named @pdset_name in object @p hid with @p
+   * Create a 1-dimensional dataset named @p dset_name in object @p hid with @p
    * nelems elements from the array @p data.
    */
   void MakeDataset(hid_t hid, const std::string &dset_name, const f32 *data,

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -5,7 +5,7 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Hermes
 PROJECT_NUMBER         = 0.8.0-beta
-PROJECT_BRIEF          = "I/O Buffering System"
+PROJECT_BRIEF          = "Hierarchical Distributed I/O Buffering System"
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
@@ -35,7 +35,11 @@ MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 4
-ALIASES                =
+
+ALIASES += status="A Status object."
+ALIASES += ctx{1}="ctx The Context for this \1."
+ALIASES += bool{1}="true if \1, otherwise false."
+
 TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
@@ -75,7 +79,7 @@ SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO
 SORT_BRIEF_DOCS        = NO
 SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
@@ -113,7 +117,7 @@ INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h \
                          *.cc
 RECURSIVE              = YES
-EXCLUDE                =
+EXCLUDE                = @PROJECT_SOURCE_DIR@/src/stb_ds.h
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -84,7 +84,6 @@ set(HERMES_EXPORTED_LIBS hermes ${HERMES_EXPORTED_LIBS})
 set(HERMES_HEADERS
   ${CMAKE_CURRENT_SOURCE_DIR}/api/bucket.h
   ${CMAKE_CURRENT_SOURCE_DIR}/api/hermes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/api/id.h
   ${CMAKE_CURRENT_SOURCE_DIR}/api/vbucket.h
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer_pool.h
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer_pool_internal.h

diff --git a/src/api/bucket.cc b/src/api/bucket.cc
@@ -97,6 +97,13 @@ size_t Bucket::GetTotalBlobSize() {
   return result;
 }
 
+size_t Bucket::GetBlobSize(const std::string &name, const Context &ctx) {
+  ScopedTemporaryMemory scratch(&hermes_->trans_arena_);
+  size_t result = GetBlobSize(scratch, name, ctx);
+
+  return result;
+}
+
 size_t Bucket::GetBlobSize(Arena *arena, const std::string &name,
                            const Context &ctx) {
   (void)ctx;
@@ -248,6 +255,8 @@ Status Bucket::GetV(void *user_blob, Predicate pred, Context &ctx) {
 
   LOG(INFO) << "Getting blobs by predicate from bucket " << name_ << '\n';
 
+  HERMES_NOT_IMPLEMENTED_YET;
+
   return ret;
 }
 
@@ -315,6 +324,8 @@ std::vector<std::string> Bucket::GetBlobNames(Predicate pred,
 
   LOG(INFO) << "Getting blob names by predicate from bucket " << name_ << '\n';
 
+  HERMES_NOT_IMPLEMENTED_YET;
+
   return std::vector<std::string>();
 }