Changeset: 71ae85872c34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71ae85872c34
Modified Files:
MonetDB5/src/modules/kernel/bat5.mx
MonetDB5/src/modules/mal/bbp.mx
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 416 to 300 lines):
diff -r 2c62ab173dac -r 71ae85872c34 MonetDB/src/gdk/gdk_atoms.mx
--- a/MonetDB/src/gdk/gdk_atoms.mx Sat Oct 09 10:34:36 2010 +0200
+++ b/MonetDB/src/gdk/gdk_atoms.mx Sat Oct 09 14:48:56 2010 +0200
@@ -1877,7 +1877,7 @@
d->hashash = 1; /* new string heaps get the hash value (and
length) stored */
#ifndef NDEBUG
/* fill should solve initialisation problems within valgrind */
- memset(d->base + d->free, 0, size - d->free);
+ memset(d->base + d->free, 0, d->size - d->free);
#endif
}
}
diff -r 2c62ab173dac -r 71ae85872c34 MonetDB5/src/modules/kernel/bat5.mx
--- a/MonetDB5/src/modules/kernel/bat5.mx Sat Oct 09 10:34:36 2010 +0200
+++ b/MonetDB5/src/modules/kernel/bat5.mx Sat Oct 09 14:48:56 2010 +0200
@@ -658,7 +658,7 @@
bat5_export str BKCgetRole(str *res, int *bid);
bat5_export str BKCsetkey(int *res, int *bid, bit *param);
bat5_export str BKCsetSet(int *res, int *bid, bit *param);
-bat5_export str BKCisaSet(int *res, int *bid);
+bat5_export str BKCisaSet(bit *res, int *bid);
bat5_export str BKCsetSorted(bit *res, int *bid);
bat5_export str BKCisSorted(bit *res, int *bid);
bat5_export str BKCisSortedReverse(bit *res, int *bid);
@@ -684,7 +684,7 @@
bat5_export str BKCsetName(int *r, int *bid, str *s);
bat5_export str BKCgetBBPname(str *ret, int *bid);
bat5_export str BKCunload(bit *res, str *input);
-bat5_export str BKCisCached(int *res, int *bid);
+bat5_export str BKCisCached(bit *res, int *bid);
bat5_export str BKCload(int *res, str *input);
bat5_export str BKChot(int *res, str *input);
bat5_export str BKCcold(int *res, str *input);
@@ -693,10 +693,10 @@
bat5_export str BKChotBAT(int *res, int *bid);
bat5_export str BKCsave(bit *res, str *input);
bat5_export str BKCsave2(int *r, int *bid);
-bat5_export str BKCmmap(int *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
-bat5_export str BKCmmap2(int *res, int *bid, int *bns);
-bat5_export str BKCmadvise(int *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
-bat5_export str BKCmadvise2(int *res, int *bid, int *mode);
+bat5_export str BKCmmap(bit *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
+bat5_export str BKCmmap2(bit *res, int *bid, int *bns);
+bat5_export str BKCmadvise(bit *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
+bat5_export str BKCmadvise2(bit *res, int *bid, int *mode);
bat5_export str BKCaccbuild(int *ret, int *bid, str *acc, ptr *param);
bat5_export str BKCaccbuild_std(int *ret, int *bid, int *acc);
bat5_export str BKCsetHash(bit *ret, int *bid, bit *prop);
@@ -3111,7 +3111,7 @@
}
str
-BKCisaSet(int *res, int *bid)
+BKCisaSet(bit *res, int *bid)
{
BAT *b;
@@ -3587,7 +3587,7 @@
}
str
-BKCisCached(int *res, int *bid)
+BKCisCached(bit *res, int *bid)
{
BAT *b;
@@ -3694,7 +3694,7 @@
@c
str
-BKCmmap(int *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
+BKCmmap(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
{
BAT *b, *bn = NULL;
@@ -3713,13 +3713,13 @@
}
str
-BKCmmap2(int *res, int *bid, int *mode)
+BKCmmap2(bit *res, int *bid, int *mode)
{
return BKCmmap(res, bid, mode, mode, mode, mode);
}
str
-BKCmadvise(int *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
+BKCmadvise(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
{
BAT *b;
@@ -3734,7 +3734,7 @@
}
str
-BKCmadvise2(int *res, int *bid, int *mode)
+BKCmadvise2(bit *res, int *bid, int *mode)
{
return BKCmadvise(res, bid, mode, mode, mode, mode);
}
@@ -3821,8 +3821,8 @@
@1 *r = (@1*)Tloc(bn, BUNfirst(bn));
for (;p<q; oidx++, p++) {
- if ( *o == oidx ){
- o += (o < ol);
+ if ( o < ol && *o == oidx ){
+ o++;
} else {
cnt++;
*r++ = *p;
@@ -3950,8 +3950,8 @@
BATaccessBegin(d, USE_TAIL, MMAP_SEQUENTIAL);
for (;oidx<lim; oidx++) {
- if ( *o == oidx ){
- o += (o < ol);
+ if ( o < ol && *o == oidx ){
+ o++;
} else {
*r++ = oidx;
}
@@ -4105,9 +4105,8 @@
BATaccessBegin(d, USE_TAIL, MMAP_SEQUENTIAL);
for (;oidx<bidx; oidx++) {
if ( *o == oidx ){
- while ( *ol == bidx && ol>o) {
+ while ( ol > o && *--ol == bidx) {
bidx--;
- ol--;
}
*r++ = bidx;
o += (o < ol);
diff -r 2c62ab173dac -r 71ae85872c34 MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx Sat Oct 09 10:34:36 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx Sat Oct 09 14:48:56 2010 +0200
@@ -699,8 +699,8 @@
The accumulator variants may re-use the storage of an argument only when it is
not shared,
nor being a persistent BAT
*/
-batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int
*lflag, int *rflag);
-str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int *lflag, int *rflag)
+batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit
*lflag, bit *rflag);
+str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit *lflag, bit *rflag)
{
BAT *bn, *b, *right;
char *res = MAL_SUCCEED;
@@ -738,8 +738,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
int *lflag, int *rflag);
-str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
char *res = MAL_SUCCEED;
@@ -789,8 +789,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
int *lflag, int *rflag);
-str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
char *res = MAL_SUCCEED;
@@ -987,8 +987,8 @@
return msg;
}
-batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int
*lflag, int *rflag);
-str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int *lflag, int *rflag)
+batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit
*lflag, bit *rflag);
+str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit *lflag, bit *rflag)
{
BAT *bn, *b, *right;
str msg;
@@ -1046,8 +1046,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
int *lflag, int *rflag);
-str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
@@ -1099,8 +1099,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
int *lflag, int *rflag);
-str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
diff -r 2c62ab173dac -r 71ae85872c34 MonetDB5/src/modules/mal/bbp.mx
--- a/MonetDB5/src/modules/mal/bbp.mx Sat Oct 09 10:34:36 2010 +0200
+++ b/MonetDB5/src/modules/mal/bbp.mx Sat Oct 09 14:48:56 2010 +0200
@@ -675,8 +675,6 @@
bn->H->shift = b->H->shift;
bn->T->width = b->T->width;
bn->T->shift = b->T->shift;
- BATsetcapacity(bn, BATcount(b));
- BATsetcount(bn, BATcount(b));
if (b->H->type)
decomp +=
CMDdecompressheap(&b->H->heap,&bn->H->heap,*fnme);
@@ -697,6 +695,8 @@
BBPkeepref(*ret = b->batCacheid);
return MAL_SUCCEED;
}
+ BATsetcapacity(bn, BATcount(b));
+ BATsetcount(bn, BATcount(b));
BATsetaccess(bn, b->P->restricted);
BBPreleaseref(b->batCacheid);
BBPkeepref(*ret = bn->batCacheid);
diff -r 2c62ab173dac -r 71ae85872c34 MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Sat Oct 09 10:34:36 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Sat Oct 09 14:48:56 2010 +0200
@@ -370,7 +370,7 @@
replication_export str SLAVEclose(int *ret, oid *tag, timestamp *stamp);
replication_export str SLAVEdrop(int *ret, str *tag);
replication_export str SLAVEprotect(int *ret, str *schema, str *table);
-replication_export str SLAVEisprotected(int *ret, str *schema, str *table);
+replication_export str SLAVEisprotected(bit *ret, str *schema, str *table);
replication_export int SLAVEisprotectedInternal(str schema, str table);
replication_export str SLAVEprelude(int *ret);
replication_export str SLAVEsynchronizing(int *ret);
@@ -1443,7 +1443,7 @@
}
str
-SLAVEisprotected(int *ret, str *schema, str *table)
+SLAVEisprotected(bit *ret, str *schema, str *table)
{
*ret = SLAVEisprotectedInternal(*schema, *table);
return MAL_SUCCEED;
diff -r 2c62ab173dac -r 71ae85872c34
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Sat Oct 09 10:34:36
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Sat Oct 09 14:48:56
2010 +0200
@@ -807,12 +807,6 @@
}
"Entry"
{
- "MsmKey" = "8:_75BEF6F1CDE841F296965844F7DDAF91"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_76ACE18448C84B76BD06F7A20D958888"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -4259,26 +4253,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_75BEF6F1CDE841F296965844F7DDAF91"
- {
- "SourcePath" = "8:Lib\\MonetDB5\\rdf.sql"
- "TargetName" = "8:rdf.sql"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_76ACE18448C84B76BD06F7A20D958888"
{
"SourcePath" = "8:lib\\libMapi.dll"
diff -r 2c62ab173dac -r 71ae85872c34 sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Sat Oct 09 10:34:36 2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Sat Oct 09 14:48:56 2010 +0200
@@ -27,12 +27,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3685E6A3741B4E708A2487C40627FF8A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
