maj sdbms4

Matthieu Herrmann
1 parent dc22d26d
Showing 1 changed file with 25 additions and 12 deletions Show diff stats
anubis_dev/library/data_base/sdbms4.anubis
@@ -128,7 +128,7 @@ define (DBInfo -&gt; One) create_storer(DBIndex($Key, $Row) my_idx) =
   with converter  = (IDXData($Key, $Row) idxdata)|-> idx_data_save(version(idxdata), to_serialize(data_tree(idxdata))),
   // We also need an asynchronous writer (using default timings), configured for that index (using its name)
   with writing_fun = (IDXDataSave($Key, $Row) idx, String path) |-> safe_save(idx, path),
-  with asaver = make_AData(name(my_idx), writing_fun),
+  with asaver = make_AData("",name(my_idx), writing_fun,0,0),
   // When writing, we set the directory on the fly
   (DBInfo dbi)|->
     set_prefix(directory(dbi), asaver);
@@ -258,7 +258,7 @@ define IDXData($Key, $Row) check_convert_rebuilt(
       *** [3.2.2] Index initialisation
           ==============================================================================================================
-define Result(DBLoadingError, DBIndex($Key, $Row)) init_index(
+public define Result(DBLoadingError, DBIndex($Key, $Row)) init_index(
     DBInfo                            the_data_base,  // The database and the table on which
     DBTable($Row,$HRow)               the_table,      // the index must be installed.
     String                            index_name,     // Name of the index
@@ -295,6 +295,27 @@ define Result(DBLoadingError, DBIndex($Key, $Row)) init_index(
     *** [3.3] Index consultation
         ================================================================================================================
+public define Iterator( ($Key, List(DBRowId($Row))) ) take_key_ids( DBIndex($Key, $Row) my_idx) =
+  take_left(data_tree(*data(my_idx))).
+
+public define Iterator( $Key ) take_key( DBIndex($Key, $Row) my_idx) =
+  take_left_key(data_tree(*data(my_idx))).
+
+public define Iterator( DBRowId($Row) ) take_ids( DBIndex($Key, $Row) my_idx) =
+  fold_left( take_left_value(data_tree(*data(my_idx))), nil,
+    (Iterator(DBRowId($Row)) it, List(DBRowId($Row)) l)|-> append(take_left(l), it)
+  ).
+
+public define Iterator( DBRow($Row) ) take_rows( DBIndex($Key, $Row) my_idx) =
+  with table_data = data_tree(*table(my_idx)),
+  filter(
+    (DBRowId($Row) id) |-> get(id, table_data),
+    fold_left( take_left_value(data_tree(*data(my_idx))), nil,
+      (Iterator(DBRowId($Row)) it, List(DBRowId($Row)) l)|->
+      append(take_left(l), it)
+    )
+  ).
+
 public define Iterator(DBRowId($Row)) get_ids($Key key, DBIndex($Key, $Row) my_idx) =
   if get(key, data_tree(*data(my_idx))) is
   {
@@ -304,15 +325,7 @@ public define Iterator(DBRowId($Row)) get_ids($Key key, DBIndex($Key, $Row) my_i
 public define Iterator(DBRow($Row)) get_rows($Key key, DBIndex($Key, $Row) my_idx) =
   with table_data = data_tree(*table(my_idx)),
-  fold_left(get_ids(key, my_idx), nil, (Iterator(DBRow($Row)) l, DBRowId($Row) id)|->
-    if get(id, table_data) is
-    {
-      failure       then should_not_happen(l)
-      success(item) then item .. l
-    }
-  ).
-
-
+  filter( (DBRowId($Row) id) |-> get(id, table_data), get_ids(key, my_idx) ).
   *** [4] Database initialisation
       ==================================================================================================================
@@ -390,7 +403,7 @@ public define Result(DBLoadingError, DBTable($Row,$HRow)) init_dbtable(
       with tdata_v = var(tdata),  //  ** Dynamic variable created here **
       // 4: Create the saving function (delegate writer + conversion)
       with writing_fun  = (DBTableDataSave($HRow) idx, String path) |-> safe_save(idx, path),
-      with asaver       = make_AData(table_name, writing_fun),
+      with asaver       = make_AData("", table_name, writing_fun, 0, 0),
       with saver        = (DBInfo dbi)|->
         set_prefix(directory(dbi), asaver);
         if *tdata_v is dbtable_data(c_, v_, st_, _) then