Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/crackers
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29697
Modified Files:
crackers_AVL_index.mx crackers_core_ordered.mx
crackers_validation.mx
Log Message:
keep fixing mainly windows warnings for oid lng casting
Index: crackers_core_ordered.mx
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_core_ordered.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- crackers_core_ordered.mx 15 Jan 2008 11:05:05 -0000 1.5
+++ crackers_core_ordered.mx 15 Jan 2008 12:33:41 -0000 1.6
@@ -569,7 +569,8 @@
(or opposite depending how we move) */
if (ct @6 tmpt ){
if (ct == tmpt || ct == tmpt @2 1) {
- for (i=hil; i >=0 ; i--){
+ i=hil;
+ while(1){
if (*tmpt @4 mid){
*hh = *tmph;
*ht = *tmpt;
@@ -578,20 +579,54 @@
}
tmpt @5= 1;
tmph @5= 1;
+
+ i--;
+ if (i==0){
+ if (*tmpt @4 mid){
+ *hh = *tmph;
+ *ht = *tmpt;
+ hh @5= 1;
+ ht @5= 1;
+ }
+ tmpt @5= 1;
+ tmph @5= 1;
+
+ break;
+ }
}
- for (i=hil-1; i >=0 ; i--){
+ i=hil-1;
+ while(1){
*hh = scr_h[i];
*ht = scr_t[i];
ht @5= 1;
hh @5= 1;
+
+ i--;
+ if (i==0){
+ *hh = scr_h[i];
+ *ht = scr_t[i];
+ ht @5= 1;
+ hh @5= 1;
+ break;
+ }
}
}
else{
- for (i=hil-1; i >=0 ; i--){
+ i=hil-1;
+ while(1){
*hh = scr_h[i];
*ht = scr_t[i];
ht @5= 1;
hh @5= 1;
+
+ i--;
+ if (i==0){
+ *hh = scr_h[i];
+ *ht = scr_t[i];
+ ht @5= 1;
+ hh @5= 1;
+ break;
+ }
}
}
return MAL_SUCCEED;
@@ -605,7 +640,8 @@
ht @5= 1;
}
}
- for (i=hil-1; i >=0 ; i--){
+ i=hil-1;
+ while(1){
if (*tmpt @4 mid){
*hh = *tmph;
*ht = *tmpt;
@@ -616,6 +652,22 @@
*tmpt = scr_t[i];
tmpt @5= 1;
tmph @5= 1;
+
+ i--;
+ if(i==0){
+ if (*tmpt @4 mid){
+ *hh = *tmph;
+ *ht = *tmpt;
+ hh @5= 1;
+ ht @5= 1;
+ }
+ *tmph = scr_h[i];
+ *tmpt = scr_t[i];
+ tmpt @5= 1;
+ tmph @5= 1;
+
+ break;
+ }
}
@
@@ -628,7 +680,7 @@
@1 *scr_t;
oid hghShrinked = 0, lowShrinked = 0;
oid j=0, hil=0, scr_size, probe = 25;
- lng i;
+ oid i;
BUN first;
first = BUNfirst(b);
Index: crackers_AVL_index.mx
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_AVL_index.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- crackers_AVL_index.mx 15 Jan 2008 11:05:05 -0000 1.5
+++ crackers_AVL_index.mx 15 Jan 2008 12:33:40 -0000 1.6
@@ -135,7 +135,7 @@
[EMAIL PROTECTED](int *k, int *bid, int *uid){
BUN last, cur;
int indexPos;
- lng curPos;
+ oid curPos;
BAT *b, *u;
(void) k;
@@ -180,7 +180,7 @@
if ((b = BATdescriptor(*bid)) == NULL)
throw(MAL, "crackers.insert AVL index", "Cannot access
descriptor");
- result = BATnew(TYPE_oid, [EMAIL PROTECTED], (*(@1*)hgh-*(@1*)low)*2);
+ result = BATnew(TYPE_oid, [EMAIL PROTECTED],
(size_t)(*(@1*)hgh-*(@1*)low)*2);
/* find the node that we should start searching from */
cur = AVLIndex[indexPos].Tree;
@@ -271,7 +271,7 @@
@= AVLIndexOperations
static struct Node *
[EMAIL PROTECTED](int m, int indexPosition, @1 value, struct Node * current,
BAT * b, BUN base){
[EMAIL PROTECTED](int m, oid indexPosition, @1 value, struct Node * current,
BAT * b, BUN base){
BUN cur, Lchild, Rchild;
int lh, rh;
struct Node *temp;
Index: crackers_validation.mx
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/crackers/crackers_validation.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- crackers_validation.mx 15 Jan 2008 11:05:06 -0000 1.5
+++ crackers_validation.mx 15 Jan 2008 12:33:41 -0000 1.6
@@ -322,8 +322,8 @@
count[0] = BATcount(b);
if (bn < lst_bn) {
@3;
- c = BATslice(b, (lng)fst_bn, (lng)bn);
- w = BATslice(b, (lng)bn, (lng)lst_bn);
+ c = BATslice(b, fst_bn, bn);
+ w = BATslice(b, bn, lst_bn);
printf("correct:\n");
BATprint(c);
printf("wrong:\n");
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
