isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_q_wildcard.c

@@ -86,8 +86,7 @@ static FrtQuery *wcq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     if (NULL == first_star && NULL == first_ques) {
         q = frt_tq_new(WCQ(self)->field, pattern);
         q->boost = self->boost;
-    }
-    else {
+    } else {
         const int field_num = frt_fis_get_field_num(ir->fis, WCQ(self)->field);
         q = frt_multi_tq_new_conf(WCQ(self)->field, FrtMTQMaxTerms(self), 0.0);
 

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -32,37 +32,54 @@ void rf_close(void *p) {
     }
 }
 
-static void ram_touch(FrtStore *store, const char *filename) {
-    if (frt_h_get(store->dir.ht, filename) == NULL) {
-        frt_h_set(store->dir.ht, filename, rf_new(filename));
+static void ram_create_folder(FrtStore *store, const char *folder_name) {
+    if (frt_h_get(store->dir.ht, folder_name) == NULL) {
+        frt_h_set(store->dir.ht, frt_estrdup(folder_name), frt_h_new_str(NULL, rf_close));
     }
 }
 
-static int ram_exists(FrtStore *store, const char *filename) {
-    if (frt_h_get(store->dir.ht, filename) != NULL) {
-        return true;
-    } else {
-        return false;
+static void ram_remove_folder(FrtStore *store, const char *folder_name) {
+    frt_h_rem(store->dir.ht, folder_name, true);
+}
+
+static void ram_touch(FrtStore *store, const char *folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (folder && frt_h_get(folder, filename) == NULL) {
+        frt_h_set(folder, filename, rf_new(filename));
     }
 }
 
-static int ram_remove(FrtStore *store, const char *filename) {
-    FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(store->dir.ht, filename, false);
-    if (rf != NULL) {
-        rf_close(rf);
+static int ram_exists(FrtStore *store, const char *folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (folder && frt_h_get(folder, filename) != NULL) {
         return true;
-    } else {
-        return false;
     }
+    return false;
 }
 
-static void ram_rename(FrtStore *store, const char *from, const char *to) {
-    FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(store->dir.ht, from, false);
+static int ram_remove(FrtStore *store, const char *folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (folder) {
+        FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(folder, filename, false);
+        if (rf != NULL) {
+            rf_close(rf);
+            return true;
+        }
+    }
+    return false;
+}
+
+static void ram_rename(FrtStore *store, const char *folder_name, const char *from, const char *to) {
     FrtRAMFile *tmp;
+    FrtRAMFile *rf = NULL;
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
 
+    if (folder) {
+        rf = (FrtRAMFile *)frt_h_rem(folder, from, false);
+    }
+    
     if (rf == NULL) {
-        FRT_RAISE(FRT_IO_ERROR, "couldn't rename \"%s\" to \"%s\". \"%s\""
-              " doesn't exist", from, to, from);
+        FRT_RAISE(FRT_IO_ERROR, "couldn't rename \"%s\" to \"%s\". \"%s\" doesn't exist", from, to, from);
     }
 
     free(rf->name);
@@ -70,23 +87,26 @@ static void ram_rename(FrtStore *store, const char *from, const char *to) {
     rf->name = frt_estrdup(to);
 
     /* clean up the file we are overwriting */
-    tmp = (FrtRAMFile *)frt_h_get(store->dir.ht, to);
+    tmp = (FrtRAMFile *)frt_h_get(folder, to);
     if (tmp != NULL) {
-        frt_h_del(store->dir.ht, to);
+        frt_h_del(folder, to);
     }
 
-    frt_h_set(store->dir.ht, rf->name, rf);
+    frt_h_set(folder, rf->name, rf);
 }
 
-static int ram_count(FrtStore *store) {
-    return store->dir.ht->size;
+static int ram_count(FrtStore *store, const char *folder_name) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (!folder) { return 0; }
+    return folder->size;
 }
 
-static void ram_each(FrtStore *store, void (*func)(const char *fname, void *arg), void *arg) {
-    FrtHash *ht = store->dir.ht;
+static void ram_each(FrtStore *store, const char *folder_name, void (*func)(const char *fname, void *arg), void *arg) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (!folder) { return; }
     int i;
-    for (i = 0; i <= ht->mask; i++) {
-        FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
+    for (i = 0; i <= folder->mask; i++) {
+        FrtRAMFile *rf = (FrtRAMFile *)folder->table[i].value;
         if (rf) {
             if (strncmp(rf->name, FRT_LOCK_PREFIX, strlen(FRT_LOCK_PREFIX)) == 0) {
                 continue;
@@ -103,46 +123,51 @@ static void ram_close_i(FrtStore *store) {
 /*
  * Be sure to keep the locks
  */
-static void ram_clear(FrtStore *store) {
+static void ram_clear(FrtStore *store, const char *folder_name) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
     int i;
-    FrtHash *ht = store->dir.ht;
-    for (i = 0; i <= ht->mask; i++) {
-        FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
+    if (!folder) { return; }
+    for (i = 0; i <= folder->mask; i++) {
+        FrtRAMFile *rf = (FrtRAMFile *)folder->table[i].value;
         if (rf && !frt_file_is_lock(rf->name)) {
-            frt_h_del(ht, rf->name);
+            frt_h_del(folder, rf->name);
         }
     }
 }
 
-static void ram_clear_locks(FrtStore *store) {
+static void ram_clear_locks(FrtStore *store, const char *folder_name) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
     int i;
-    FrtHash *ht = store->dir.ht;
-    for (i = 0; i <= ht->mask; i++) {
-        FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
+    if (!folder) { return; }
+    for (i = 0; i <= folder->mask; i++) {
+        FrtRAMFile *rf = (FrtRAMFile *)folder->table[i].value;
         if (rf && frt_file_is_lock(rf->name)) {
-            frt_h_del(ht, rf->name);
+            frt_h_del(folder, rf->name);
         }
     }
 }
 
-static void ram_clear_all(FrtStore *store) {
+static void ram_clear_all(FrtStore *store, const char *folder_name) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
     int i;
-    FrtHash *ht = store->dir.ht;
-    for (i = 0; i <= ht->mask; i++) {
-        FrtRAMFile *rf = (FrtRAMFile *)ht->table[i].value;
+    if (!folder) { return; }
+    for (i = 0; i <= folder->mask; i++) {
+        FrtRAMFile *rf = (FrtRAMFile *)folder->table[i].value;
         if (rf) {
-            frt_h_del(ht, rf->name);
+            frt_h_del(folder, rf->name);
         }
     }
 }
 
-static frt_off_t ram_length(FrtStore *store, const char *filename) {
-    FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
-    if (rf != NULL) {
-        return rf->len;
-    } else {
-        return 0;
+static frt_off_t ram_length(FrtStore *store, const char *folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+    if (folder) {
+        FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(folder, filename);
+        if (rf) {
+            return rf->len;
+        }
     }
+    return 0;
 }
 
 void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
@@ -227,15 +252,23 @@ void frt_ram_destroy_buffer(FrtOutStream *os) {
     free(os);
 }
 
-static FrtOutStream *ram_new_output(FrtStore *store, const char *filename) {
-    FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
+static FrtOutStream *ram_new_output(FrtStore *store, const char *folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+
+    if (!folder) {
+        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\" in folder \"%s\", but folder it doesn't exist", filename, folder_name);
+    }
+
+    FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(folder, filename);
     FrtOutStream *os = frt_os_new();
 
     if (rf == NULL) {
         rf = rf_new(filename);
-        frt_h_set(store->dir.ht, rf->name, rf);
+        frt_h_set(folder, rf->name, rf);
     }
     FRT_REF(rf);
+
+    os->folder_name = frt_estrdup(folder_name);
     os->pointer = 0;
     os->file.rf = rf;
     os->m = &RAM_OUT_STREAM_METHODS;
@@ -291,15 +324,23 @@ static const struct FrtInStreamMethods RAM_IN_STREAM_METHODS = {
     rami_close_i
 };
 
-static FrtInStream *ram_open_input(FrtStore *store, const char *filename) {
-    FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
+static FrtInStream *ram_open_input(FrtStore *store, const char* folder_name, const char *filename) {
+    FrtHash *folder = frt_h_get(store->dir.ht, folder_name);
+
+    if (!folder) {
+        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\" in folder \"%s\", but folder it doesn't exist", filename, folder_name);
+    }
+
+    FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(folder, filename);
     FrtInStream *is = NULL;
 
     if (rf == NULL) {
-        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\" but it doesn't exist", filename);
+        FRT_RAISE(FRT_FILE_NOT_FOUND_ERROR, "tried to open \"%s\", but it doesn't exist", filename);
     }
+
     FRT_REF(rf);
     is = frt_is_new();
+    is->folder_name = frt_estrdup(folder_name);
     is->f->file.rf = rf;
     is->f->ref_cnt = 1;
     is->d.pointer = 0;
@@ -312,25 +353,26 @@ static FrtInStream *ram_open_input(FrtStore *store, const char *filename) {
 
 static int ram_lock_obtain(FrtLock *lock) {
     int ret = true;
-    if (ram_exists(lock->store, lock->name)) {
+    if (ram_exists(lock->store, lock->folder_name, lock->name)) {
         ret = false;
     }
-    ram_touch(lock->store, lock->name);
+    ram_touch(lock->store, lock->folder_name, lock->name);
     return ret;
 }
 
 static int ram_lock_is_locked(FrtLock *lock) {
-    return ram_exists(lock->store, lock->name);
+    return ram_exists(lock->store, lock->folder_name, lock->name);
 }
 
 static void ram_lock_release(FrtLock *lock) {
-    ram_remove(lock->store, lock->name);
+    ram_remove(lock->store, lock->folder_name, lock->name);
 }
 
-static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname) {
+static FrtLock *ram_open_lock_i(FrtStore *store, const char *folder_name, const char *lockname) {
     FrtLock *lock = FRT_ALLOC(FrtLock);
     char lname[100];
     snprintf(lname, 100, "%s%s.lck", FRT_LOCK_PREFIX, lockname);
+    lock->folder_name = frt_estrdup(folder_name);
     lock->name = frt_estrdup(lname);
     lock->store = store;
     FRT_REF(store);
@@ -343,7 +385,8 @@ static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname) {
 
 static void ram_close_lock_i(FrtLock *lock) {
     FRT_DEREF(lock->store);
-    free(lock->name);
+    free((void *)lock->folder_name);
+    free((void *)lock->name);
     free(lock);
 }
 
@@ -352,33 +395,37 @@ FrtStore *frt_open_ram_store(FrtStore *new_store) {
         new_store = frt_store_alloc();
     frt_store_init(new_store);
 
-    new_store->dir.ht       = frt_h_new_str(NULL, rf_close);
-    new_store->touch        = &ram_touch;
-    new_store->exists       = &ram_exists;
-    new_store->remove       = &ram_remove;
-    new_store->rename       = &ram_rename;
-    new_store->count        = &ram_count;
-    new_store->clear        = &ram_clear;
-    new_store->clear_all    = &ram_clear_all;
-    new_store->clear_locks  = &ram_clear_locks;
-    new_store->length       = &ram_length;
-    new_store->each         = &ram_each;
-    new_store->new_output   = &ram_new_output;
-    new_store->open_input   = &ram_open_input;
-    new_store->open_lock_i  = &ram_open_lock_i;
-    new_store->close_lock_i = &ram_close_lock_i;
-    new_store->close_i      = &ram_close_i;
+    new_store->dir.ht        = frt_h_new_str(free, (void (*)(void *))frt_h_destroy);
+    new_store->create_folder = &ram_create_folder;
+    new_store->remove_folder = &ram_remove_folder;
+    new_store->touch         = &ram_touch;
+    new_store->exists        = &ram_exists;
+    new_store->remove        = &ram_remove;
+    new_store->rename        = &ram_rename;
+    new_store->count         = &ram_count;
+    new_store->clear         = &ram_clear;
+    new_store->clear_all     = &ram_clear_all;
+    new_store->clear_locks   = &ram_clear_locks;
+    new_store->length        = &ram_length;
+    new_store->each          = &ram_each;
+    new_store->new_output    = &ram_new_output;
+    new_store->open_input    = &ram_open_input;
+    new_store->open_lock_i   = &ram_open_lock_i;
+    new_store->close_lock_i  = &ram_close_lock_i;
+    new_store->close_i       = &ram_close_i;
     return new_store;
 }
 
 struct CopyFileArg {
-    FrtStore *to_store, *from_store;
+    const char *folder_name;
+    FrtStore *to_store;
+    FrtStore *from_store;
 };
 
 static void copy_files(const char *fname, void *arg) {
     struct CopyFileArg *cfa = (struct CopyFileArg *)arg;
-    FrtOutStream *os = cfa->to_store->new_output(cfa->to_store, fname);
-    FrtInStream *is = cfa->from_store->open_input(cfa->from_store, fname);
+    FrtOutStream *os = cfa->to_store->new_output(cfa->to_store, cfa->folder_name, fname);
+    FrtInStream *is = cfa->from_store->open_input(cfa->from_store, cfa->folder_name, fname);
     int len = (int)frt_is_length(is);
     frt_uchar *buffer = FRT_ALLOC_N(frt_uchar, len + 1);
 
@@ -390,17 +437,19 @@ static void copy_files(const char *fname, void *arg) {
     free(buffer);
 }
 
-FrtStore *frt_open_ram_store_and_copy(FrtStore *store, FrtStore *from_store, bool close_dir) {
-    store = frt_open_ram_store(store);
+FrtStore *frt_open_ram_store_and_copy(FrtStore *to_store, FrtStore *from_store, const char *folder_name, bool close_store) {
+    to_store = frt_open_ram_store(to_store);
     struct CopyFileArg cfa;
-    cfa.to_store = store;
+    cfa.folder_name = folder_name;
+    cfa.to_store = to_store;
     cfa.from_store = from_store;
 
-    from_store->each(from_store, &copy_files, &cfa);
+    to_store->create_folder(to_store, folder_name);
+    from_store->each(from_store, folder_name, &copy_files, &cfa);
 
-    if (close_dir) {
+    if (close_store) {
         frt_store_close(from_store);
     }
 
-    return store;
+    return to_store;
 }