Changeset: 387ddf26745e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=387ddf26745e
Modified Files:
monetdb5/extras/crackers/crackers_selectholpl_ops.mx
monetdb5/extras/crackers/crackers_selectpl_ops.mx
Branch: holindex
Log Message:
Comment lock lines (CRKIndexLock) until we decide the final locking strategy.
diffs (123 lines):
diff --git a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
--- a/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selectholpl_ops.mx
@@ -1639,7 +1639,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
//mod_bid=ABS(*bid)%LOCKS;
//MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
m = existsCrackerIndex(*bid);
@@ -1722,7 +1722,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
idxFirst = BUNfirst(c);
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
vh = BUNlast(b)-(oid)1;
@@ -1806,7 +1806,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
if (createIndex==1)
{
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
diff --git a/monetdb5/extras/crackers/crackers_selectpl_ops.mx
b/monetdb5/extras/crackers/crackers_selectpl_ops.mx
--- a/monetdb5/extras/crackers/crackers_selectpl_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selectpl_ops.mx
@@ -273,7 +273,7 @@ createView:
if (createIndex==1)
{
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -327,7 +327,7 @@ createView:
//mod_bid=ABS(*bid)%LOCKS;
//MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
//gettimeofday(&tv1,0); wt+=dt(tv0,tv1); tv0=tv1;
@@ -503,7 +503,7 @@ createView:
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
//gettimeofday(&tv1,0); ct+=dt(tv0,tv1); tv0=tv1;
retry:;
@@ -679,7 +679,7 @@ createView:
if (createIndex==1)
{
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -1113,7 +1113,7 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
//mod_bid=ABS(*bid)%LOCKS;
//MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
if (*inclusiveHgh == TRUE) HBound = FALSE;
else HBound = TRUE;
@@ -1187,7 +1187,7 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
idxFirst = BUNfirst(c);
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
vl = BUNfirst(b);
@@ -1240,7 +1240,7 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
if (createIndex==1)
{
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -1266,7 +1266,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
//mod_bid=ABS(*bid)%LOCKS;
//MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
m = existsCrackerIndex(*bid);
@@ -1337,7 +1337,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
idxFirst = BUNfirst(c);
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
vh = BUNlast(b)-(oid)1;
@@ -1398,7 +1398,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
if (createIndex==1)
{
//MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
- MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
+ //MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
