MonetDB: Feb2013 - some code cleanup

[Stefan Manegold]

Changeset: fe84c75dbe52 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe84c75dbe52
Modified Files:
        gdk/gdk_group.c
Branch: Feb2013
Log Message:

some code cleanup


diffs (58 lines):

diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -115,6 +115,8 @@
                                                break;                  \
                                        }                               \
                                }                                       \
+                               if (grps[hb - r] != grps[p - r])        \
+                                       hb = BUN_NONE;                  \
                        } else if (grps) {                              \
                                BUN hv = hash_##TYPE(hs, &w[p]);        \
                                BUN hg = hash_oid(hs, &grps[p-r]);      \
@@ -143,8 +145,7 @@
                                        }                               \
                                }                                       \
                        }                                               \
-                       if (hb == BUN_NONE ||                           \
-                           (gc && grps[hb - r] != grps[p - r])) {      \
+                       if (hb == BUN_NONE) {                           \
                                GRPnotfound();                          \
                                /* enter new group into hash table */   \
                                hs->link[p] = hs->hash[prb];            \
@@ -479,6 +480,8 @@ BATgroup_internal(BAT **groups, BAT **ex
                                                break;
                                        }
                                }
+                               if (grps[hb - r] != grps[p - r])
+                                       hb = BUN_NONE;
                        } else if (grps) {
                                for (;
                                     hb != BUN_NONE;
@@ -503,7 +506,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                                        }
                                }
                        }
-                       if (hb == BUN_NONE || (gc && grps[hb - r] != grps[p - 
r])) {
+                       if (hb == BUN_NONE) {
                                GRPnotfound();
                        }
                }
@@ -598,6 +601,8 @@ BATgroup_internal(BAT **groups, BAT **ex
                                                        break;
                                                }
                                        }
+                                       if (grps[hb - r] != grps[p - r])
+                                               hb = BUN_NONE;
                                } else if (grps) {
                                        BUN hv = hash_any(hs, v);
                                        BUN hg = hash_oid(hs, &grps[p-r]);
@@ -626,7 +631,7 @@ BATgroup_internal(BAT **groups, BAT **ex
                                                }
                                        }
                                }
-                               if (hb == BUN_NONE || (gc && grps[hb - r] != 
grps[p - r])) {
+                               if (hb == BUN_NONE) {
                                        GRPnotfound();
                                        /* enter new group into hash table */
                                        hs->link[p] = hs->hash[prb];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list