Final merge of page buffering branch to develop

7 files changed, 20 insertions, 71 deletions

diff --git a/tools/testfiles/file_space.ddl b/tools/testfiles/file_space.ddl
index bed5349..6b8aa47 100644
--- a/tools/testfiles/file_space.ddl
+++ b/tools/testfiles/file_space.ddl
@@ -9,8 +9,10 @@ SUPER_BLOCK {
    BTREE_RANK 16
    BTREE_LEAF 4
    ISTORE_K 32
-   FILE_SPACE_STRATEGY H5F_FILE_SPACE_AGGR_VFD
-   FREE_SPACE_THRESHOLD 10
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_NONE
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 8192
    USER_BLOCK {
       USERBLOCK_SIZE 0
    }
diff --git a/tools/testfiles/file_space.h5 b/tools/testfiles/file_space.h5
index 425d0c2..d9e2890 100644
--- a/tools/testfiles/file_space.h5
+++ b/tools/testfiles/file_space.h5
diff --git a/tools/testfiles/tboot1.ddl b/tools/testfiles/tboot1.ddl
index 4758948..73ae4e5 100644
--- a/tools/testfiles/tboot1.ddl
+++ b/tools/testfiles/tboot1.ddl
@@ -9,8 +9,10 @@ SUPER_BLOCK {
    BTREE_RANK 16
    BTREE_LEAF 4
    ISTORE_K 32
-   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
-   FREE_SPACE_THRESHOLD 1
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
    USER_BLOCK {
       USERBLOCK_SIZE 0
    }
diff --git a/tools/testfiles/tboot2.ddl b/tools/testfiles/tboot2.ddl
index d83b92b..504a634 100644
--- a/tools/testfiles/tboot2.ddl
+++ b/tools/testfiles/tboot2.ddl
@@ -9,8 +9,10 @@ SUPER_BLOCK {
    BTREE_RANK 16
    BTREE_LEAF 4
    ISTORE_K 32
-   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
-   FREE_SPACE_THRESHOLD 1
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
    USER_BLOCK {
       USERBLOCK_SIZE 0
    }
diff --git a/tools/testfiles/tboot2A.ddl b/tools/testfiles/tboot2A.ddl
index d83b92b..504a634 100644
--- a/tools/testfiles/tboot2A.ddl
+++ b/tools/testfiles/tboot2A.ddl
@@ -9,8 +9,10 @@ SUPER_BLOCK {
    BTREE_RANK 16
    BTREE_LEAF 4
    ISTORE_K 32
-   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
-   FREE_SPACE_THRESHOLD 1
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
    USER_BLOCK {
       USERBLOCK_SIZE 0
    }
diff --git a/tools/testfiles/tboot2B.ddl b/tools/testfiles/tboot2B.ddl
index d83b92b..504a634 100644
--- a/tools/testfiles/tboot2B.ddl
+++ b/tools/testfiles/tboot2B.ddl
@@ -9,8 +9,10 @@ SUPER_BLOCK {
    BTREE_RANK 16
    BTREE_LEAF 4
    ISTORE_K 32
-   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
-   FREE_SPACE_THRESHOLD 1
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
    USER_BLOCK {
       USERBLOCK_SIZE 0
    }
diff --git a/tools/testfiles/tdset_idx.ddl b/tools/testfiles/tdset_idx.ddl
deleted file mode 100644
index 65d9f44..0000000
--- a/tools/testfiles/tdset_idx.ddl
+++ /dev/null
@@ -1,61 +0,0 @@
-#############################
-Expected output for 'h5dump -p -H tdset_idx.h5'
-#############################
-HDF5 "tdset_idx.h5" {
-GROUP "/" {
-   DATASET "dset_btree" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 20, 10 ) / ( 200, 100 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 5, 5 )
-         SIZE 800
-       }
-      FILTERS {
-         NONE
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0      
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
-   }
-   DATASET "dset_filter" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 5, 5 )
-         SIZE 200 (4.000:1 COMPRESSION)
-       }
-      FILTERS {
-         COMPRESSION DEFLATE { LEVEL 9 }
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0      
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
-   }
-   DATASET "dset_fixed" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
-      STORAGE_LAYOUT {
-         CHUNKED ( 5, 5 )
-         SIZE 800
-       }
-      FILTERS {
-         NONE
-      }
-      FILLVALUE {
-         FILL_TIME H5D_FILL_TIME_IFSET
-         VALUE  0      
-      }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
-   }
-}
-}