Implement new transaction model, transactions are now hidden from the

API, H5TR functions have no effect.  Added support for H5Fflush.  Added H5VLdaosm_snap_create and
H5Pset_daosm_snap_open to save and load snapshots.  Added enforcement of
file access flags.  Updated examples.  Other minor fixes/cleanup.

1 files changed, 18 insertions, 23 deletions

diff --git a/examples/h5dsm_group_open.c b/examples/h5dsm_group_open.c
index 9ec9af7..3d5ad02 100644
--- a/examples/h5dsm_group_open.c
+++ b/examples/h5dsm_group_open.c
@@ -2,10 +2,10 @@
 
 int main(int argc, char *argv[]) {
     uuid_t pool_uuid;
-    char *pool_grp = "daos_tier0";
-    hid_t file = -1, grp = -1, trans = -1, fapl = -1;
+    char *pool_grp = NULL;
+    hid_t file = -1, grp = -1, fapl = -1;
     hsize_t dims[1] = {1};
-    uint64_t trans_num;
+    H5VL_daosm_snap_id_t snap_id;
 
     (void)MPI_Init(&argc, &argv);
     (void)daos_init();
@@ -23,32 +23,28 @@ int main(int argc, char *argv[]) {
     if(H5Pset_fapl_daosm(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, pool_uuid, pool_grp) < 0)
         ERROR;
 
-    /* Open file */
-    if((file = H5Fopen_ff(argv[2], H5F_ACC_RDONLY, fapl, argc == 4 ? &trans : NULL)) < 0)
-        ERROR;
-
-    /* Create transaction if specified */
+    /* Open snapshot if specified */
     if(argc == 5) {
-        trans_num = (uint64_t)atoi(argv[4]);
-        if((trans = H5TRcreate(file, trans_num)) < 0)
-            ERROR;
-    }
-    else
-        if(H5TRget_trans_num(trans, &trans_num) < 0)
+        snap_id = (H5VL_daosm_snap_id_t)atoi(argv[4]);
+        printf("Opening snapshot %llu\n", (long long unsigned)snap_id);
+        if(H5Pset_daosm_snap_open(fapl, snap_id) < 0)
             ERROR;
+    } /* end if */
 
-    printf("Opening group - transaction number = %llu\n", (long long unsigned)trans_num);
+    /* Open file */
+    if((file = H5Fopen(argv[2], H5F_ACC_RDONLY, fapl)) < 0)
+        ERROR;
+
+    printf("Opening group\n");
 
     /* Open group */
-    if((grp = H5Gopen_ff(file, argv[3], H5P_DEFAULT, trans)) < 0)
+    if((grp = H5Gopen2(file, argv[3], H5P_DEFAULT)) < 0)
         ERROR;
 
     /* Close */
-    if(H5Gclose_ff(grp, -1) < 0)
-        ERROR;
-    if(H5TRclose(trans) < 0)
+    if(H5Gclose(grp) < 0)
         ERROR;
-    if(H5Fclose_ff(file, -1) < 0)
+    if(H5Fclose(file) < 0)
         ERROR;
     if(H5Pclose(fapl) < 0)
         ERROR;
@@ -61,9 +57,8 @@ int main(int argc, char *argv[]) {
 
 error:
     H5E_BEGIN_TRY {
-        H5Gclose_ff(grp, -1);
-        H5TRclose(trans);
-        H5Fclose_ff(file, -1);
+        H5Gclose(grp);
+        H5Fclose(file);
         H5Pclose(fapl);
     } H5E_END_TRY;