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

Don't use hb as index if it is BUN_NONE.


diffs (33 lines):

diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -119,7 +119,8 @@
                                                break;                  \
                                        }                               \
                                }                                       \
-                               if (grps[hb - r] != grps[p - r])        \
+                               if (hb != BUN_NONE &&                   \
+                                   grps[hb - r] != grps[p - r])        \
                                        hb = BUN_NONE;                  \
                        } else if (grps) {                              \
                                BUN hv = hash_##TYPE(hs, &w[p]);        \
@@ -498,7 +499,8 @@ BATgroup_internal(BAT **groups, BAT **ex
                                                break;
                                        }
                                }
-                               if (grps[hb - r] != grps[p - r])
+                               if (hb != BUN_NONE &&
+                                   grps[hb - r] != grps[p - r])
                                        hb = BUN_NONE;
                        } else if (grps) {
                                for (;
@@ -631,7 +633,8 @@ BATgroup_internal(BAT **groups, BAT **ex
                                                        break;
                                                }
                                        }
-                                       if (grps[hb - r] != grps[p - r])
+                                       if (hb != BUN_NONE &&
+                                           grps[hb - r] != grps[p - r])
                                                hb = BUN_NONE;
                                } else if (grps) {
                                        BUN hv = hash_any(hs, v);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to