Merge pull request #20 from stavrospapadopoulos/dev

Fixing minor bug when clearing/deleting an array/metadata
Intel-HLS · May 12, 2016 · 2cc1832 · 2cc1832
2 parents ba6dcdb + 919c54f
commit 2cc1832
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/src/storage_manager/storage_manager.cc b/core/src/storage_manager/storage_manager.cc
@@ -1126,7 +1126,8 @@ int StorageManager::array_clear(
   while((next_file = readdir(dir))) {
     if(!strcmp(next_file->d_name, ".") ||
        !strcmp(next_file->d_name, "..") ||
-       !strcmp(next_file->d_name, TILEDB_ARRAY_SCHEMA_FILENAME))
+       !strcmp(next_file->d_name, TILEDB_ARRAY_SCHEMA_FILENAME) ||
+       !strcmp(next_file->d_name, TILEDB_SM_CONSOLIDATION_FILELOCK_NAME))
       continue;
     filename = array_real + "/" + next_file->d_name;
     if(is_metadata(filename)) {         // Metadata
@@ -1742,7 +1743,8 @@ int StorageManager::metadata_clear(
   while((next_file = readdir(dir))) {
     if(!strcmp(next_file->d_name, ".") ||
        !strcmp(next_file->d_name, "..") ||
-       !strcmp(next_file->d_name, TILEDB_METADATA_SCHEMA_FILENAME))
+       !strcmp(next_file->d_name, TILEDB_METADATA_SCHEMA_FILENAME) ||
+       !strcmp(next_file->d_name, TILEDB_SM_CONSOLIDATION_FILELOCK_NAME))
       continue;
     filename = metadata_real + "/" + next_file->d_name;
     if(is_fragment(filename)) {  // Fragment