[svn-r29770] Description:

    Bring 'none' chunk index from revise_chunks branch to trunk.

Tested on:
    MacOSX/64 10.11.4 (amazon) w/serial, parallel & production (w/check-vfd)
    (h5committest forthcoming)

2 files changed, 25 insertions, 7 deletions

diff --git a/test/dsets.c b/test/dsets.c
index 2ff8dda..2bc162c 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -6949,8 +6949,14 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
 
     /* Verify index type */
     if(low == H5F_LIBVER_LATEST) {
+        if(early_alloc) {
+            if(idx_type != H5D_CHUNK_IDX_NONE)
+                FAIL_PUTS_ERROR("should be using Non-Index as index");
+        } /* end if */
+        else {
             if(idx_type != H5D_CHUNK_IDX_FARRAY)
                 FAIL_PUTS_ERROR("should be using Fixed Array as index");
+        } /* end else */
     } else if(idx_type != H5D_CHUNK_IDX_BTREE) 
 	FAIL_PUTS_ERROR("should be using v1 B-tree as index");
 
@@ -7009,7 +7015,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
     /* Verify index type */
     if(low == H5F_LIBVER_LATEST) {
 	if(early_alloc) {
-	    if(idx_type != H5D_CHUNK_IDX_FARRAY)
+	    if(idx_type != H5D_CHUNK_IDX_NONE)
 		FAIL_PUTS_ERROR("should be using implicit indexing");
 	} else if(idx_type != H5D_CHUNK_IDX_BT2)
 	    FAIL_PUTS_ERROR("should be using v2 B-tree as index");
@@ -7111,8 +7117,14 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
 
     /* Verify index type */
     if(low == H5F_LIBVER_LATEST) {
+        if(early_alloc) {
+            if(idx_type != H5D_CHUNK_IDX_NONE)
+                FAIL_PUTS_ERROR("should be using Non-Index as index");
+        } /* end if */
+        else {
             if(idx_type != H5D_CHUNK_IDX_FARRAY)
                 FAIL_PUTS_ERROR("should be using Fixed Array as index");
+        } /* end else */
     } else if(idx_type != H5D_CHUNK_IDX_BTREE) 
 	FAIL_PUTS_ERROR("should be using v1 B-tree as index");
 
@@ -9235,6 +9247,8 @@ test_fixed_array(hid_t fapl)
 			&& !compress
 #endif /* H5_HAVE_FILTER_DEFLATE */
 		    ) {
+		    if(idx_type != H5D_CHUNK_IDX_NONE)
+			FAIL_PUTS_ERROR("should be using Non Index as index");
 		} else if (idx_type != H5D_CHUNK_IDX_FARRAY)
 		    FAIL_PUTS_ERROR("should be using Fixed Array as index");
 	    } /* end if */
@@ -9275,6 +9289,8 @@ test_fixed_array(hid_t fapl)
 			&& !compress
 #endif /* H5_HAVE_FILTER_DEFLATE */
 		    ) {
+		    if(idx_type != H5D_CHUNK_IDX_NONE)
+			FAIL_PUTS_ERROR("should be using Non Index as index");
 		} else if(idx_type != H5D_CHUNK_IDX_FARRAY)
 		    FAIL_PUTS_ERROR("should be using Fixed Array as index");
 	    } else {
@@ -9313,6 +9329,8 @@ test_fixed_array(hid_t fapl)
 			&& !compress
 #endif /* H5_HAVE_FILTER_DEFLATE */
 		    ) {
+		    if(idx_type != H5D_CHUNK_IDX_NONE)
+			FAIL_PUTS_ERROR("should be using Non Index as index");
 		} else if(idx_type != H5D_CHUNK_IDX_FARRAY)
 		    FAIL_PUTS_ERROR("should be using Fixed Array as index");
 	    } /* end if */
diff --git a/test/objcopy.c b/test/objcopy.c
index 229284d..1c95dc7 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -2751,7 +2751,7 @@ test_copy_dataset_chunked(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check if the array index type is correct */
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
 	TEST_ERROR
 
     /* Check if the datasets are equal */
@@ -3166,7 +3166,7 @@ test_copy_dataset_chunked_empty(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check if the array index type is correct */
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
 	TEST_ERROR
 
     /* Check if the datasets are equal */
@@ -3501,7 +3501,7 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED3, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check if the array index type is correct */
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
 	TEST_ERROR
 
     /* Check if the datasets are equal */
@@ -3521,7 +3521,7 @@ test_copy_dataset_chunked_sparse(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_CHUNKED4, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check if the array index type is correct */
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
 	TEST_ERROR
 
     /* Check if the datasets are equal */
@@ -5217,7 +5217,7 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid
     /* open the destination dataset */
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL2, H5P_DEFAULT)) < 0) TEST_ERROR
 
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
         TEST_ERROR
 
     /* Check if the datasets are equal */
@@ -8429,7 +8429,7 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
     /* open the destination dataset */
     if((did2 = H5Dopen2(fid_dst, NAME_DATASET_VL_VL2, H5P_DEFAULT)) < 0) TEST_ERROR
 
-    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_FARRAY, H5D_CHUNK_IDX_BTREE) != TRUE)
+    if(compare_idx_type(src_fapl, did2, H5D_CHUNK_IDX_NONE, H5D_CHUNK_IDX_BTREE) != TRUE)
         TEST_ERROR
 
     /* Check if the datasets are equal */