Merge pull request #51 from Intel-HLS/dev

New C APIs, bug fixes, minor fixes, and error messages

Makefile

@@ -41,15 +41,9 @@ endif
 
 # --- Verbose mode handler --- #
 VERBOSE =
-ifeq ($(VERBOSE),)
-  VERBOSE = 2
-endif
-ifeq ($(VERBOSE),0)
+ifeq ($(VERBOSE),1)
   CPPFLAGS += -DNVERBOSE
 endif
-ifneq ($(VERBOSE),0)
-  CPPFLAGS += -DVERBOSE=$(VERBOSE)
-endif
 
 # --- Compilers --- #
 CXX = g++   

core/include/array/array.h

@@ -56,6 +56,20 @@
 #define TILEDB_AR_ERR        -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_AR_ERRMSG std::string("[TileDB::Array] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_ar_errmsg;
+
+
+
 class ArrayReadState;
 class Fragment;
 

core/include/array/array_iterator.h

@@ -49,6 +49,19 @@
 /**@}*/
 
 
+/** Default error message. */
+#define TILEDB_AIT_ERRMSG std::string("[TileDB::ArrayIterator] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_ait_errmsg;
+
+
 
 
 /** Enables iteration (read) over an array's cells. */

core/include/array/array_read_state.h

@@ -56,6 +56,18 @@
 /** Size of the starting offset of a variable cell value. */
 #define TILEDB_CELL_VAR_OFFSET_SIZE     sizeof(size_t)
 
+/** Default error message. */
+#define TILEDB_ARS_ERRMSG std::string("[TileDB::ArrayReadState] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_ars_errmsg;
+
 
 
 

core/include/array/array_schema.h

@@ -65,6 +65,18 @@
 // Default parameters.
 #define TILEDB_AS_CAPACITY             10000
 
+/** Default error message. */
+#define TILEDB_AS_ERRMSG std::string("[TileDB::ArraySchema] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_as_errmsg;
+
 
 
 

core/include/c_api/c_api.h

@@ -37,8 +37,27 @@
 #include <mpi.h>
 #include <stdint.h>
 #include <stddef.h>
+#include <string>
 #include <unistd.h>
 
+
+/* ********************************* */
+/*             CONSTANTS             */
+/* ********************************* */
+
+/** Default error message. */
+#define TILEDB_ERRMSG std::string("[TileDB] Error: ")
+
+/** Maximum error message length. */
+#define TILEDB_ERRMSG_MAX_LEN 2000
+
+
+
+
+/* ********************************* */
+/*               MACROS              */
+/* ********************************* */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -49,6 +68,18 @@ extern "C" {
 #  define TILEDB_EXPORT
 #endif
 
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern char tiledb_errmsg[TILEDB_ERRMSG_MAX_LEN];
+
+
+
+
 /* ********************************* */
 /*              CONFIG               */
 /* ********************************* */
@@ -1036,6 +1067,16 @@ TILEDB_EXPORT int tiledb_ls_workspaces(
     char** workspaces,
     int* workspace_num);
 
+/**
+ * Counts the number of TileDB workspaces.
+ *
+ * @param tiledb_ctx The TileDB context.
+ * @param workspace_num The number of TileDB workspaces to be returned.
+ * @return TILEDB_OK for success and TILEDB_ERR for error.
+ */
+TILEDB_EXPORT int tiledb_ls_workspaces_c(
+    const TileDB_CTX* tiledb_ctx,
+    int* workspace_num);
 
 /**
  * Lists all the TileDB objects in a directory, copying their names into the 
@@ -1067,6 +1108,19 @@ TILEDB_EXPORT int tiledb_ls(
     int* dir_types,
     int* dir_num);
 
+/**
+ * Counts the TileDB objects in a directory.
+ *
+ * @param tiledb_ctx The TileDB context.
+ * @param parent_dir The parent directory of the TileDB objects to be listed.
+ * @param dir_num The number of TileDB objects to be returned. 
+ * @return TILEDB_OK for success and TILEDB_ERR for error.
+ */
+TILEDB_EXPORT int tiledb_ls_c(
+    const TileDB_CTX* tiledb_ctx,
+    const char* parent_dir,
+    int* dir_num);
+
 
 
 

core/include/c_api/constants.h

@@ -37,7 +37,7 @@
 #include <limits.h>
 
 /** Version. */
-#define TILEDB_VERSION                          "0.3.3"
+#define TILEDB_VERSION                          "0.3.4"
 
 /**@{*/
 /** Return code. */  

core/include/fragment/book_keeping.h

@@ -51,6 +51,18 @@
 #define TILEDB_BK_ERR        -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_BK_ERRMSG std::string("[TileDB::BookKeeping] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_bk_errmsg;
+
 
 
 

core/include/fragment/fragment.h

@@ -53,6 +53,18 @@
 #define TILEDB_FG_ERR      -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_FG_ERRMSG std::string("[TileDB::Fragment] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_fg_errmsg;
+
 
 
 

core/include/fragment/read_state.h

@@ -52,6 +52,18 @@
 #define TILEDB_RS_ERR       -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_RS_ERRMSG std::string("[TileDB::ReadState] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_rs_errmsg;
+
 
 
 

core/include/fragment/write_state.h

@@ -51,6 +51,21 @@
 #define TILEDB_WS_ERR      -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_WS_ERRMSG std::string("[TileDB::WriteState] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_ws_errmsg;
+
+
+
+
 class BookKeeping;
 class Fragment;
 

core/include/metadata/metadata.h

@@ -46,6 +46,20 @@
 #define TILEDB_MT_ERR         -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_MT_ERRMSG std::string("[TileDB::Metadata] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_mt_errmsg;
+
+
+
 
 /** Manages a TileDB metadata object. */
 class Metadata {

core/include/metadata/metadata_iterator.h

@@ -49,6 +49,21 @@
 #define TILEDB_MIT_ERR        -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_MIT_ERRMSG std::string("[TileDB::MetadataIterator] Error: ")
+
+
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_mit_errmsg;
+
+
+
+
 /** Enables iteration (read) over metadata values. */
 class MetadataIterator {
  public:

core/include/misc/utils.h

@@ -54,7 +54,18 @@
 #define TILEDB_UT_ERR       -1
 /**@}*/
 
+/** Default error message. */
+#define TILEDB_UT_ERRMSG std::string("[TileDB::utils] Error: ")
 
+/** Maximum number of bytes written in a single I/O. */
+#define TILEDB_UT_MAX_WRITE_COUNT 1500000000    // ~ 1.5 GB
+
+
+/* ********************************* */
+/*          GLOBAL VARIABLES         */
+/* ********************************* */
+
+extern std::string tiledb_ut_errmsg;
 
 
 /* ********************************* */