[svn-r29081] - merge in the phdf5_metadata_opt/ branch with the collective metadata optimizations.

- rename H5AC_dxpl_id to H5AC_ind_read_dxpl_id and update all usage in the library

tested on bb-8 with parallel and serial.

1 files changed, 95 insertions, 95 deletions

diff --git a/test/earray.c b/test/earray.c
index 0dfdb7a..46f2712 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -596,7 +596,7 @@ finish(hid_t file, hid_t fapl, H5F_t *f, H5EA_t *ea, haddr_t ea_addr)
     h5_stat_size_t file_size;           /* File size, after deleting array */
 
     /* Close the extensible array */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
 
 #ifdef QAK
@@ -606,7 +606,7 @@ HDsystem("cp earray.h5 earray.h5.save");
 #endif /* QAK */
 
     /* Delete array */
-    if(H5EA_delete(f, H5AC_dxpl_id, ea_addr, NULL) < 0)
+    if(H5EA_delete(f, H5AC_ind_read_dxpl_id, ea_addr, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Close the file */
@@ -909,11 +909,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.raw_elmt_size = 0;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -924,11 +924,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.max_nelmts_bits = 0;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -938,11 +938,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.max_nelmts_bits = 65;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -953,11 +953,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.sup_blk_min_data_ptrs = 0;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -966,11 +966,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.sup_blk_min_data_ptrs = 1;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -979,11 +979,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.sup_blk_min_data_ptrs = 6;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -994,11 +994,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.data_blk_min_elmts = 0;
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -1010,11 +1010,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
         HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
         test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1);
         H5E_BEGIN_TRY {
-            ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+            ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
         } H5E_END_TRY;
         if(ea) {
             /* Close opened extensible array */
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
             ea = NULL;
 
             /* Indicate error */
@@ -1024,11 +1024,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.max_dblk_page_nelmts_bits = 4;  /* corresponds to 16 elements in data block page, which is less than the 64 elements for the default settings */
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -1037,11 +1037,11 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     HDmemcpy(&test_cparam, cparam, sizeof(test_cparam));
     test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(test_cparam.max_nelmts_bits + 1);
     H5E_BEGIN_TRY {
-        ea = H5EA_create(f, H5AC_dxpl_id, &test_cparam, NULL);
+        ea = H5EA_create(f, H5AC_ind_read_dxpl_id, &test_cparam, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened extensible array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
         ea = NULL;
 
         /* Indicate error */
@@ -1061,7 +1061,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
     TESTING("extensible array creation");
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     PASSED()
@@ -1085,7 +1085,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;
 
@@ -1124,19 +1124,19 @@ test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
     TESTING("create, close & reopen extensible array");
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Close the extensible array */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, NULL, HADDR_UNDEF, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, NULL, HADDR_UNDEF, tparam) < 0)
         TEST_ERROR
 
     /* Re-open the array */
-    if(NULL == (ea = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1155,7 +1155,7 @@ test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;
 
@@ -1197,11 +1197,11 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
     TESTING("open extensible array twice");
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Open the array again, through the first file handle */
-    if(NULL == (ea2 = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea2 = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1211,12 +1211,12 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* Close the second extensible array wrapper */
-    if(H5EA_close(ea2, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea2, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea2 = NULL;
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, &ea, ea_addr, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, &ea, ea_addr, tparam) < 0)
         TEST_ERROR
 
     /* Re-open the file */
@@ -1228,7 +1228,7 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         FAIL_STACK_ERROR
 
     /* Open the extensible array through the second file handle */
-    if(NULL == (ea2 = H5EA_open(f2, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea2 = H5EA_open(f2, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1236,7 +1236,7 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* Close the first extensible array wrapper */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea = NULL;
 
@@ -1259,9 +1259,9 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
         if(ea2)
-            H5EA_close(ea2, H5AC_dxpl_id);
+            H5EA_close(ea2, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
 	H5Fclose(file2);
     } H5E_END_TRY;
@@ -1309,11 +1309,11 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
     TESTING("open extensible array twice, through different file handles");
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Open the array again, through the first file handle */
-    if(NULL == (ea2 = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea2 = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1323,7 +1323,7 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
         TEST_ERROR
 
     /* Close the second extensible array wrapper */
-    if(H5EA_close(ea2, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea2, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea2 = NULL;
 
@@ -1335,7 +1335,7 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
         FAIL_STACK_ERROR
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, &ea, ea_addr, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, &ea, ea_addr, tparam) < 0)
         TEST_ERROR
 
     /* Verify the creation parameters */
@@ -1343,7 +1343,7 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
         TEST_ERROR
 
     /* Close the first extensible array wrapper */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea = NULL;
 
@@ -1374,7 +1374,7 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
         FAIL_STACK_ERROR
 
     /* Open the extensible array through the second file handle */
-    if(NULL == (ea2 = H5EA_open(f2, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea2 = H5EA_open(f2, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1399,9 +1399,9 @@ test_open_twice_diff(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tpa
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
         if(ea2)
-            H5EA_close(ea2, H5AC_dxpl_id);
+            H5EA_close(ea2, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
 	H5Fclose(file2);
 	H5Fclose(file0);
@@ -1445,15 +1445,15 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
     TESTING("deleting open extensible array");
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Open the array again */
-    if(NULL == (ea2 = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL)))
+    if(NULL == (ea2 = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL)))
         FAIL_STACK_ERROR
 
     /* Request that the array be deleted */
-    if(H5EA_delete(f, H5AC_dxpl_id, ea_addr, NULL) < 0)
+    if(H5EA_delete(f, H5AC_ind_read_dxpl_id, ea_addr, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Verify the creation parameters */
@@ -1463,38 +1463,38 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
         TEST_ERROR
 
     /* Close the second extensible array wrapper */
-    if(H5EA_close(ea2, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea2, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea2 = NULL;
 
     /* Try re-opening the array again (should fail, as array will be deleted) */
     H5E_BEGIN_TRY {
-        ea2 = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL);
+        ea2 = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL);
     } H5E_END_TRY;
     if(ea2) {
         /* Close opened array */
-        H5EA_close(ea2, H5AC_dxpl_id);
+        H5EA_close(ea2, H5AC_ind_read_dxpl_id);
 
         /* Indicate error */
         TEST_ERROR
     } /* end if */
 
     /* Close the first extensible array wrapper */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea = NULL;
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, NULL, HADDR_UNDEF, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, NULL, HADDR_UNDEF, tparam) < 0)
         TEST_ERROR
 
     /* Try re-opening the array again (should fail, as array is now deleted) */
     H5E_BEGIN_TRY {
-        ea = H5EA_open(f, H5AC_dxpl_id, ea_addr, NULL);
+        ea = H5EA_open(f, H5AC_ind_read_dxpl_id, ea_addr, NULL);
     } H5E_END_TRY;
     if(ea) {
         /* Close opened array */
-        H5EA_close(ea, H5AC_dxpl_id);
+        H5EA_close(ea, H5AC_ind_read_dxpl_id);
 
         /* Indicate error */
         TEST_ERROR
@@ -1520,9 +1520,9 @@ test_delete_open(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
         if(ea2)
-            H5EA_close(ea2, H5AC_dxpl_id);
+            H5EA_close(ea2, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;
 
@@ -1637,7 +1637,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
     cb.encode = test_flush_depend_cb;
     HDmemset(&fd_info, 0, sizeof(earray_flush_depend_ctx_t));
     cb.udata = &fd_info;
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, &cb) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, &cb) < 0)
         TEST_ERROR
 
     /* Verify the creation parameters */
@@ -1653,7 +1653,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
 
     /* Insert test entry into cache */
     base_addr = HADDR_MAX;
-    if(H5AC_insert_entry(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, base_addr, base_entry, H5AC__PIN_ENTRY_FLAG) < 0)
+    if(H5AC_insert_entry(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, base_addr, base_entry, H5AC__PIN_ENTRY_FLAG) < 0)
         TEST_ERROR
 
     /* Set the base entry as a flush dependency for the array */
@@ -1668,17 +1668,17 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
 
     /* Insert test entry into cache */
     addr1 = HADDR_MAX - 1;
-    if(H5AC_insert_entry(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr1, entry1, H5AC__PIN_ENTRY_FLAG) < 0)
+    if(H5AC_insert_entry(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr1, entry1, H5AC__PIN_ENTRY_FLAG) < 0)
         TEST_ERROR
 
     /* Set the test entry as a flush dependency for 0th index in the array */
-    if(H5EA_support(ea, H5AC_dxpl_id, (hsize_t)0, (H5AC_info_t *)entry1) < 0)
+    if(H5EA_support(ea, H5AC_ind_read_dxpl_id, (hsize_t)0, (H5AC_info_t *)entry1) < 0)
         TEST_ERROR
 
     /* Set element of array */
     welmt = (uint64_t)0;
     idx = 0;
-    if(H5EA_set(ea, H5AC_dxpl_id, idx, &welmt) < 0)
+    if(H5EA_set(ea, H5AC_ind_read_dxpl_id, idx, &welmt) < 0)
         FAIL_STACK_ERROR
 
     /* Create entry #2 to insert */
@@ -1690,17 +1690,17 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
 
     /* Insert test entry into cache */
     addr2 = HADDR_MAX - 2;
-    if(H5AC_insert_entry(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr2, entry2, H5AC__PIN_ENTRY_FLAG) < 0)
+    if(H5AC_insert_entry(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr2, entry2, H5AC__PIN_ENTRY_FLAG) < 0)
         TEST_ERROR
 
     /* Set the test entry as a flush dependency for 1st index in the array */
-    if(H5EA_support(ea, H5AC_dxpl_id, (hsize_t)1, (H5AC_info_t *)entry2) < 0)
+    if(H5EA_support(ea, H5AC_ind_read_dxpl_id, (hsize_t)1, (H5AC_info_t *)entry2) < 0)
         TEST_ERROR
 
     /* Set element of array */
     welmt = (uint64_t)1;
     idx = 1;
-    if(H5EA_set(ea, H5AC_dxpl_id, idx, &welmt) < 0)
+    if(H5EA_set(ea, H5AC_ind_read_dxpl_id, idx, &welmt) < 0)
         FAIL_STACK_ERROR
 
     /* Create entry #3 to insert */
@@ -1712,17 +1712,17 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
 
     /* Insert test entry into cache */
     addr3 = HADDR_MAX - 3;
-    if(H5AC_insert_entry(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr3, entry3, H5AC__PIN_ENTRY_FLAG) < 0)
+    if(H5AC_insert_entry(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr3, entry3, H5AC__PIN_ENTRY_FLAG) < 0)
         TEST_ERROR
 
     /* Set the test entry as a flush dependency for 10,000th index in the array */
-    if(H5EA_support(ea, H5AC_dxpl_id, (hsize_t)10000, (H5AC_info_t *)entry3) < 0)
+    if(H5EA_support(ea, H5AC_ind_read_dxpl_id, (hsize_t)10000, (H5AC_info_t *)entry3) < 0)
         TEST_ERROR
 
     /* Set element of array */
     welmt = (uint64_t)10000;
     idx = 10000;
-    if(H5EA_set(ea, H5AC_dxpl_id, idx, &welmt) < 0)
+    if(H5EA_set(ea, H5AC_ind_read_dxpl_id, idx, &welmt) < 0)
         FAIL_STACK_ERROR
 
 
@@ -1752,51 +1752,51 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
         TEST_ERROR
 
     /* Protect the base entry */
-    if(NULL == (base_entry = (earray_test_t *)H5AC_protect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, base_addr, NULL, H5AC__NO_FLAGS_SET)))
+    if(NULL == (base_entry = (earray_test_t *)H5AC_protect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, base_addr, NULL, H5AC__NO_FLAGS_SET)))
         TEST_ERROR
 
     /* Unprotect & unpin the base entry */
-    if(H5AC_unprotect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, base_addr, base_entry, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
+    if(H5AC_unprotect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, base_addr, base_entry, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
         TEST_ERROR
 
     /* Remove the test entry as a flush dependency for 0th index in the array */
-    if(H5EA_unsupport(ea, H5AC_dxpl_id, (hsize_t)0, (H5AC_info_t *)entry1) < 0)
+    if(H5EA_unsupport(ea, H5AC_ind_read_dxpl_id, (hsize_t)0, (H5AC_info_t *)entry1) < 0)
         TEST_ERROR
 
     /* Protect the test entry */
-    if(NULL == (entry1 = (earray_test_t *)H5AC_protect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr1, NULL, H5AC__NO_FLAGS_SET)))
+    if(NULL == (entry1 = (earray_test_t *)H5AC_protect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr1, NULL, H5AC__NO_FLAGS_SET)))
         TEST_ERROR
 
     /* Unprotect & unpin the test entry */
-    if(H5AC_unprotect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr1, entry1, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
+    if(H5AC_unprotect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr1, entry1, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
         TEST_ERROR
 
     /* Remove the test entry as a flush dependency for 1st index in the array */
-    if(H5EA_unsupport(ea, H5AC_dxpl_id, (hsize_t)1, (H5AC_info_t *)entry2) < 0)
+    if(H5EA_unsupport(ea, H5AC_ind_read_dxpl_id, (hsize_t)1, (H5AC_info_t *)entry2) < 0)
         TEST_ERROR
 
     /* Protect the test entry */
-    if(NULL == (entry2 = (earray_test_t *)H5AC_protect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr2, NULL, H5AC__NO_FLAGS_SET)))
+    if(NULL == (entry2 = (earray_test_t *)H5AC_protect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr2, NULL, H5AC__NO_FLAGS_SET)))
         TEST_ERROR
 
     /* Unprotect & unpin the test entry */
-    if(H5AC_unprotect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr2, entry2, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
+    if(H5AC_unprotect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr2, entry2, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
         TEST_ERROR
 
     /* Remove the test entry as a flush dependency for 10,000th index in the array */
-    if(H5EA_unsupport(ea, H5AC_dxpl_id, (hsize_t)10000, (H5AC_info_t *)entry3) < 0)
+    if(H5EA_unsupport(ea, H5AC_ind_read_dxpl_id, (hsize_t)10000, (H5AC_info_t *)entry3) < 0)
         TEST_ERROR
 
     /* Protect the test entry */
-    if(NULL == (entry3 = (earray_test_t *)H5AC_protect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr3, NULL, H5AC__NO_FLAGS_SET)))
+    if(NULL == (entry3 = (earray_test_t *)H5AC_protect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr3, NULL, H5AC__NO_FLAGS_SET)))
         TEST_ERROR
 
     /* Unprotect & unpin the test entry */
-    if(H5AC_unprotect(f, H5AC_dxpl_id, H5AC_EARRAY_TEST, addr3, entry3, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
+    if(H5AC_unprotect(f, H5AC_ind_read_dxpl_id, H5AC_EARRAY_TEST, addr3, entry3, (H5AC__UNPIN_ENTRY_FLAG | H5AC__DELETED_FLAG)) < 0)
         TEST_ERROR
 
     /* Close the extensible array */
-    if(H5EA_close(ea, H5AC_dxpl_id) < 0)
+    if(H5EA_close(ea, H5AC_ind_read_dxpl_id) < 0)
         FAIL_STACK_ERROR
     ea = NULL;
 
@@ -1812,7 +1812,7 @@ test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;
 
@@ -2683,7 +2683,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Verify the creation parameters */
@@ -2691,7 +2691,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, &ea, ea_addr, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, &ea, ea_addr, tparam) < 0)
         TEST_ERROR
 
     /* Verify high-water # of elements written */
@@ -2722,7 +2722,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
         /* Retrieve element of array (not set yet) */
         relmt = (uint64_t)0;
-        if(H5EA_get(ea, H5AC_dxpl_id, idx, &relmt) < 0)
+        if(H5EA_get(ea, H5AC_ind_read_dxpl_id, idx, &relmt) < 0)
             FAIL_STACK_ERROR
 
         /* Verify element is fill value for array */
@@ -2750,7 +2750,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
         /* Retrieve element of array (not set yet) */
         relmt = (uint64_t)0;
-        if(H5EA_get(ea, H5AC_dxpl_id, idx, &relmt) < 0)
+        if(H5EA_get(ea, H5AC_ind_read_dxpl_id, idx, &relmt) < 0)
             FAIL_STACK_ERROR
 
         /* Verify element is fill value for array */
@@ -2759,7 +2759,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
         /* Set element of array */
         welmt = (uint64_t)7 + idx;
-        if(H5EA_set(ea, H5AC_dxpl_id, idx, &welmt) < 0)
+        if(H5EA_set(ea, H5AC_ind_read_dxpl_id, idx, &welmt) < 0)
             FAIL_STACK_ERROR
 
         /* Get the max. array index */
@@ -2787,7 +2787,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
         /* Retrieve element of array (set now) */
         relmt = (uint64_t)0;
-        if(H5EA_get(ea, H5AC_dxpl_id, idx, &relmt) < 0)
+        if(H5EA_get(ea, H5AC_ind_read_dxpl_id, idx, &relmt) < 0)
             FAIL_STACK_ERROR
 
         /* Verify element is value written */
@@ -2811,7 +2811,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;
 
@@ -2857,7 +2857,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* Create array */
-    if(create_array(f, H5AC_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
+    if(create_array(f, H5AC_ind_read_dxpl_id, cparam, &ea, &ea_addr, NULL) < 0)
         TEST_ERROR
 
     /* Verify the creation parameters */
@@ -2865,7 +2865,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
         TEST_ERROR
 
     /* Check for closing & re-opening the file */
-    if(reopen_file(&file, &f, fapl, H5AC_dxpl_id, &ea, ea_addr, tparam) < 0)
+    if(reopen_file(&file, &f, fapl, H5AC_ind_read_dxpl_id, &ea, ea_addr, tparam) < 0)
         TEST_ERROR
 
     /* Verify high-water # of elements written */
@@ -2886,7 +2886,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
     /* Retrieve element of array (not set yet) */
     relmt = (uint64_t)0;
-    if(H5EA_get(ea, H5AC_dxpl_id, idx, &relmt) < 0)
+    if(H5EA_get(ea, H5AC_ind_read_dxpl_id, idx, &relmt) < 0)
         FAIL_STACK_ERROR
 
     /* Verify element is fill value for array */
@@ -2895,7 +2895,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
     /* Set element of array */
     welmt = (uint64_t)7 + idx;
-    if(H5EA_set(ea, H5AC_dxpl_id, idx, &welmt) < 0)
+    if(H5EA_set(ea, H5AC_ind_read_dxpl_id, idx, &welmt) < 0)
         FAIL_STACK_ERROR
 
     /* Verify high-water # of elements written */
@@ -2937,7 +2937,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 
     /* Retrieve element of array (set now) */
     relmt = (uint64_t)0;
-    if(H5EA_get(ea, H5AC_dxpl_id, idx, &relmt) < 0)
+    if(H5EA_get(ea, H5AC_ind_read_dxpl_id, idx, &relmt) < 0)
         FAIL_STACK_ERROR
 
     /* Verify element is value written */
@@ -2948,7 +2948,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
     for(cnt = 0; cnt < skip_elmts; cnt++) {
         /* Retrieve element of array (not set yet) */
         relmt = (uint64_t)0;
-        if(H5EA_get(ea, H5AC_dxpl_id, cnt, &relmt) < 0)
+        if(H5EA_get(ea, H5AC_ind_read_dxpl_id, cnt, &relmt) < 0)
             FAIL_STACK_ERROR
 
         /* Verify element is fill value for array */
@@ -2968,7 +2968,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam,
 error:
     H5E_BEGIN_TRY {
         if(ea)
-            H5EA_close(ea, H5AC_dxpl_id);
+            H5EA_close(ea, H5AC_ind_read_dxpl_id);
 	H5Fclose(file);
     } H5E_END_TRY;