Changeset: c08e3bc3e764 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c08e3bc3e764
Modified Files:
gdk/gdk_select.c
Branch: Jul2015
Log Message:
Fix changeset fff94a9041d2 differently.
This way, the various versions of the code look more similar.
diffs (71 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -782,13 +782,14 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
const unsigned char *ptr = (const unsigned char *) Tloc(b, 0);
pos -= GDK_VAROFFSET;
while (p < q) {
- if (ptr[p++] == pos) {
+ if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
(BUN) ((dbl) cnt / (dbl) (p-r)
* (dbl) (q-p) * 1.1 + 1024),
- BATcapacity(bn) + q - p + 1,
BUN_NONE);
+ BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
}
+ p++;
o++;
}
break;
@@ -797,13 +798,14 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
const unsigned short *ptr = (const unsigned short *) Tloc(b, 0);
pos -= GDK_VAROFFSET;
while (p < q) {
- if (ptr[p++] == pos) {
+ if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
(BUN) ((dbl) cnt / (dbl) (p-r)
* (dbl) (q-p) * 1.1 + 1024),
- BATcapacity(bn) + q - p + 1,
BUN_NONE);
+ BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
}
+ p++;
o++;
}
break;
@@ -812,13 +814,14 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
case 4: {
const unsigned int *ptr = (const unsigned int *) Tloc(b, 0);
while (p < q) {
- if (ptr[p++] == pos) {
+ if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
(BUN) ((dbl) cnt / (dbl) (p-r)
* (dbl) (q-p) * 1.1 + 1024),
- BATcapacity(bn) + q - p + 1,
BUN_NONE);
+ BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
}
+ p++;
o++;
}
break;
@@ -827,13 +830,14 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
default: {
const var_t *ptr = (const var_t *) Tloc(b, 0);
while (p < q) {
- if (ptr[p++] == pos) {
+ if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
(BUN) ((dbl) cnt / (dbl) (p-r)
* (dbl) (q-p) * 1.1 + 1024),
- BATcapacity(bn) + q - p + 1,
BUN_NONE);
+ BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
}
+ p++;
o++;
}
break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
