Merge pull request #145 from ComputationalRadiationPhysics/release-1.2.3

Release 1.2.3

Author: f-schmitt-zih

CHANGELOG.md

@@ -1,6 +1,22 @@
 Change Log for libSplash
 ================================================================
 
+Release 1.2.3
+-------------
+**Date:** 2014-10-14
+
+This release contains a minor fix for listing entries and groups.
+
+**Misc**
+
+ - Remove / from datasets when listing entries #143
+
+
+**Bug Fixes**
+
+ - Fix bug when querying DCGroup entries #142
+
+
 Release 1.2.2
 -------------
 **Date:** 2014-06-21

src/DCGroup.cpp

@@ -176,8 +176,13 @@ namespace splash
                 H5Lget_name_by_idx(base, ".", H5_INDEX_NAME,
                         H5_ITER_INC, i, link_name_c, len_name + 1, H5P_LINK_ACCESS_DEFAULT);
 
-                currentEntryName = std::string(link_name_c) + std::string("/");
+                currentEntryName = std::string(link_name_c);
+                if (obj_info.type == H5O_TYPE_GROUP)
+                {
+                    currentEntryName += std::string("/");
+                }
                 currentBaseName += currentEntryName;
+
                 delete[] link_name_c;
             }
 
@@ -191,7 +196,7 @@ namespace splash
             if (obj_info.type == H5O_TYPE_DATASET)
             {
                 if (param->entries)
-                    param->entries[param->count].name = currentEntryName;
+                    param->entries[param->count].name = currentBaseName;
 
                 param->count++;
             }

src/include/splash/version.hpp

@@ -26,7 +26,7 @@
 /** the splash version reflects the changes in API */
 #define SPLASH_VERSION_MAJOR 1
 #define SPLASH_VERSION_MINOR 2
-#define SPLASH_VERSION_PATCH 2
+#define SPLASH_VERSION_PATCH 3
 
 /** we can always handle files from the same major release
  *  changes in the minor number have to be backwards compatible

tests/Parallel_SimpleDataTest.cpp

@@ -24,6 +24,8 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <set>
+#include <string>
 
 #include "Parallel_SimpleDataTest.h"
 
@@ -107,6 +109,7 @@ bool Parallel_SimpleDataTest::subtestWriteRead(int32_t iteration,
 {
     bool results_correct = true;
     DataCollector::FileCreationAttr fileCAttr;
+    std::set<std::string> datasetNames;
 
 #if defined TESTS_DEBUG
     if (currentMpiRank == 0)
@@ -128,6 +131,13 @@ bool Parallel_SimpleDataTest::subtestWriteRead(int32_t iteration,
 
     parallelDataCollector->write(iteration, ctInt, dimensions, gridSize,
             "deep/folder/data", dataWrite);
+    datasetNames.insert("deep/folder/data");
+    parallelDataCollector->write(iteration, ctInt, dimensions, gridSize,
+            "deep/folder/data2", dataWrite);
+    datasetNames.insert("deep/folder/data2");
+    parallelDataCollector->write(iteration, ctInt, dimensions, gridSize,
+            "another_dataset", dataWrite);
+    datasetNames.insert("another_dataset");
     parallelDataCollector->close();
 
     delete[] dataWrite;
@@ -168,6 +178,36 @@ bool Parallel_SimpleDataTest::subtestWriteRead(int32_t iteration,
             MPI_INFO_NULL, mpiSize, 1);
 
     readCollector->open(HDF5_FILE, fileCAttr);
+    
+    /* test entries listing */
+    {
+        DataCollector::DCEntry *entries = NULL;
+        size_t numEntries = 0;
+
+        int32_t *ids = NULL;
+        size_t numIDs = 0;
+        readCollector->getEntryIDs(NULL, &numIDs);
+        /* there might be old files, but we are at least at the current iteration */
+        CPPUNIT_ASSERT(numIDs >= iteration + 1);
+        ids = new int32_t[numIDs];
+        readCollector->getEntryIDs(ids, NULL);
+
+        readCollector->getEntriesForID(iteration, NULL, &numEntries);
+        CPPUNIT_ASSERT(numEntries == 3);
+        entries = new DataCollector::DCEntry[numEntries];
+        readCollector->getEntriesForID(iteration, entries, NULL);
+
+        CPPUNIT_ASSERT(numEntries == datasetNames.size());
+        for (uint32_t i = 0; i < numEntries; ++i)
+        {
+            /* test that listed datasets match expected dataset names*/
+            CPPUNIT_ASSERT(datasetNames.find(entries[i].name) != datasetNames.end());
+        }
+
+        delete[] entries;
+        delete[] ids;
+    }
+    
     readCollector->read(iteration, "deep/folder/data", size_read, data_read);
     readCollector->close();
 

tests/SimpleDataTest.cpp

@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>
+#include <set>
+#include <string>
 
 #include "SimpleDataTest.h"
 
@@ -56,6 +58,7 @@ SimpleDataTest::~SimpleDataTest()
 bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize, uint32_t dimensions)
 {
     bool resultsCorrect = true;
+    std::set<std::string> datasetNames;
 
     Dimensions smallGridSize(gridSize[0] - 2 * borderSize[0],
             gridSize[1] - 2 * borderSize[1],
@@ -76,9 +79,11 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
         dataWrite[i] = i;
 
     dataCollector->write(10, ctUInt64, dimensions, Selection(gridSize), "deep/folders/data", dataWrite);
+    datasetNames.insert("deep/folders/data");
 
     dataCollector->write(20, ctUInt64, dimensions, Selection(gridSize, smallGridSize,
             borderSize), "deep/folders/data_without_borders", dataWrite);
+    datasetNames.insert("deep/folders/data_without_borders");
 
     dataCollector->close();
 
@@ -109,10 +114,14 @@ bool SimpleDataTest::subtestWriteRead(Dimensions gridSize, Dimensions borderSize
         entries = new DataCollector::DCEntry[numEntries];
         dataCollector->getEntriesForID(ids[j], entries, NULL);
 
-#if defined TESTS_DEBUG
         for (uint32_t i = 0; i < numEntries; ++i)
+        {
+#if defined TESTS_DEBUG
             printf("id=%d name=%s\n", ids[j], entries[i].name.c_str());
 #endif
+            /* test that listed datasets match expected dataset names*/
+            CPPUNIT_ASSERT(datasetNames.find(entries[i].name) != datasetNames.end());
+        }
 
         delete[] entries;
     }

tests/include/Parallel_SimpleDataTest.h

@@ -1,22 +1,22 @@
 /**
  * Copyright 2013 Felix Schmitt
  *
- * This file is part of libSplash. 
- * 
- * libSplash is free software: you can redistribute it and/or modify 
- * it under the terms of of either the GNU General Public License or 
- * the GNU Lesser General Public License as published by 
- * the Free Software Foundation, either version 3 of the License, or 
- * (at your option) any later version. 
- * libSplash is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License and the GNU Lesser General Public License 
- * for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * and the GNU Lesser General Public License along with libSplash. 
- * If not, see <http://www.gnu.org/licenses/>. 
+ * This file is part of libSplash.
+ *
+ * libSplash is free software: you can redistribute it and/or modify
+ * it under the terms of of either the GNU General Public License or
+ * the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * libSplash is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with libSplash.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -50,7 +50,7 @@ class Parallel_SimpleDataTest : public CPPUNIT_NS::TestFixture
      * read data on conformacy.
      */
     void testWriteRead();
-    
+
     void testFill();
 
     bool testData(const Dimensions mpiSize, const Dimensions gridSize,
@@ -62,7 +62,7 @@ class Parallel_SimpleDataTest : public CPPUNIT_NS::TestFixture
     bool subtestWriteRead(int32_t iteration, int currentMpiRank, const Dimensions mpiSize,
             const Dimensions mpiPos, const Dimensions gridSize,
             uint32_t dimensions, MPI_Comm mpiComm);
-    
+
     /**
      * sub function for testWriteRead to allow several numbers of elements.
      */