Changeset 6681

Timestamp:

30/07/10 16:11:07 (6 weeks ago)

Author:

westram

Message:

• added GB_key_2_existing_quark (like GB_key_2_quark, but returns 0 for non-existing quarks)
• use GB_key_2_existing_quark in gb_delete_main_entry (avoid creating GB_SYSTEM_FOLDER after failed client connect). This fixes crash of arb_message when no server was running! (introduced in [6648])
• gb_pre_delete_entry
  • if no remote_hash exists, do not erase anything from there
• rewrote GB_key_2_quark() and gb_key_2_quark() using gb_key_2_existing_quark()

Location:

trunk/ARBDB

Files:

• ad_core.cxx (modified) (2 diffs)
• ad_load.cxx (modified) (1 diff)
• ad_prot.h (modified) (1 diff)
• arbdb.cxx (modified) (2 diffs)
• gb_prot.h (modified) (1 diff)

trunk/ARBDB/ad_core.cxx

@@ -459 +459 @@
      */
     if (!Main->local_mode && gbd->server_id) {
-        GBS_write_numhash(Main->remote_hash, gbd->server_id, 0);
+        if (Main->remote_hash) GBS_write_numhash(Main->remote_hash, gbd->server_id, 0);
     }
 
@@ -521 +521 @@
     gb_assert(GB_TYPE(gb_main) == GB_DB);
 
-    GBQUARK sys_quark = GB_key_2_quark((GBDATA*)gb_main, GB_SYSTEM_FOLDER);
+    GBQUARK sys_quark = gb_key_2_existing_quark(GB_MAIN((GBDATA*)gb_main), GB_SYSTEM_FOLDER);
+
+    // Note: sys_quark may be 0 (happens when destroying client db which never established a connection).
+    // In this case no system folder/quark has been created (and we do no longer try to create it)
+    // Nothing will happen in pass 2 below.
 
     for (int pass = 1; pass <= 2; pass++) {

trunk/ARBDB/ad_load.cxx

@@ -1464 +1464 @@
     ASSERT_RESULT(long, gb_create_key(Main, "main", false), 0);
 
-    Main->dummy_father            = gb_make_container(NULL, 0, -1, 0); // create "main"
+    Main->dummy_father            = gb_make_container(NULL, NULL, -1, 0); // create "main"
     Main->dummy_father->main_idx  = gb_make_main_idx(Main);
     Main->dummy_father->server_id = GBTUM_MAGIC_NUMBER;
-    gbd                           = gb_make_container(Main->dummy_father, 0, -1, 0); // create "main"
+    gbd                           = gb_make_container(Main->dummy_father, NULL, -1, 0); // create "main"
 
     Main->data = gbd;

trunk/ARBDB/ad_prot.h

@@ -296 +296 @@
 char *GB_read_key(GBDATA *gbd);
 GB_CSTR GB_read_key_pntr(GBDATA *gbd);
-GBQUARK GB_key_2_quark(GBDATA *gbd, const char *s);
+GBQUARK GB_key_2_quark(GBDATA *gbd, const char *key);
 GBQUARK GB_get_quark(GBDATA *gbd);
 bool GB_has_key(GBDATA *gbd, const char *key);

trunk/ARBDB/arbdb.cxx

@@ -1244 +1244 @@
 
 
-GBQUARK GB_key_2_quark(GBDATA *gbd, const char *s) {
-    long          index;
-    GB_MAIN_TYPE *Main = GB_MAIN(gbd);
-
-    if (!s) return -1;
-    index = GBS_read_hash(Main->key_2_index_hash, s);
-    if (!index) {   // create new index
-        index = gb_create_key(Main, s, true);
-    }
-    return (GBQUARK)index;
-}
+GBQUARK gb_key_2_existing_quark(GB_MAIN_TYPE *Main, const char *key) {
+    /*! @return existing quark for 'key'
+     *          -1 = key is NULL
+     *           0 = no quark exists
+     *        else = quark
+     */
+
+    GBQUARK quark  = -1;
+    if (key) quark = GBS_read_hash(Main->key_2_index_hash, key);
+    return quark;
+}
+
+GBQUARK GB_key_2_quark(GBDATA *gbd, const char *key) {
+    /*! find or create quark for 'key'
+     * @return -1 if key is NULL, else existing or created quark
+     */
+
+    GB_MAIN_TYPE *Main  = GB_MAIN(gbd);
+    GBQUARK       quark = gb_key_2_existing_quark(Main, key);
+    if (!quark) quark   = gb_create_key(GB_MAIN(gbd), key, true);
+    return quark;
+}
+
+#if defined(DEVEL_RALF)
+#warning add gb_NULLkey_2_quark allowing NULL as key
+#endif // DEVEL_RALF
+
+GBQUARK gb_key_2_quark(GB_MAIN_TYPE *Main, const char *key) {
+    // similar to GB_key_2_quark, 
+    // but if 'key' is NULL, quark 0 will be returned.
+    // 
+    // Use this function with care.
+    //
+    // Known good use:
+    // - create main entry and its dummy father via gb_make_container()
+    //
+    // Other uses (maybe just to pass GB_MAIN_TYPE instead of GBDATA as GB_key_2_quark likes):
+    // - gb_rename_entry
+    // - gb_make_entry
+    // - compress_sequence_tree
+    // - dictionary compression (several calls)
+
+    GBQUARK quark = 0;
+    if (key) {
+        quark             = gb_key_2_existing_quark(Main, key);
+        if (!quark) quark = gb_create_key(Main, key, true);
+        gb_assert(quark>0);
+    }
+    return quark;
+}
+
+// ---------------------------------------------
 
 GBQUARK GB_get_quark(GBDATA *gbd) {
@@ -1265 +1306 @@
 }
 
-GBQUARK gb_key_2_quark(GB_MAIN_TYPE *Main, const char *s) {
-    long index;
-    if (!s) return 0;
-    index = GBS_read_hash(Main->key_2_index_hash, s);
-    if (!index) {   // create new index
-        index = gb_create_key(Main, s, true);
-    }
-    return (GBQUARK)index;
-}
-
-
-
-
-long GB_read_clock(GBDATA *gbd)
-{
+// ---------------------------------------------
+
+long GB_read_clock(GBDATA *gbd) {
     if (GB_ARRAY_FLAGS(gbd).changed) return GB_MAIN(gbd)->clock;
     return GB_GET_EXT_UPDATE_DATE(gbd);
 }
 
-long    GB_read_transaction(GBDATA *gbd)
-{
+long GB_read_transaction(GBDATA *gbd) {
     return GB_MAIN(gbd)->transaction;
 }

trunk/ARBDB/gb_prot.h

@@ -123 +123 @@
 GB_ERROR gb_security_error(GBDATA *gbd) __ATTR__USERESULT;
 GB_CSTR gb_read_key_pntr(GBDATA *gbd);
-GBQUARK gb_key_2_quark(GB_MAIN_TYPE *Main, const char *s);
+GBQUARK gb_key_2_existing_quark(GB_MAIN_TYPE *Main, const char *key);
+GBQUARK gb_key_2_quark(GB_MAIN_TYPE *Main, const char *key);
 GBDATA *gb_create(GBDATA *father, const char *key, GB_TYPES type);
 GBDATA *gb_create_container(GBDATA *father, const char *key);