Changeset: bcf354cd5679 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcf354cd5679
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 1237 to 300 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1591,6 +1591,14 @@ tr_update_delta( sql_trans *tr, sql_delt
temp_dup(cbat->bid);
}
+ if (obat->cached) {
+ bat_destroy(obat->cached);
+ obat->cached = NULL;
+ }
+ if (cbat->cached) {
+ bat_destroy(cbat->cached);
+ cbat->cached = NULL;
+ }
if (obat->bid)
cur = temp_descriptor(obat->bid);
ins = temp_descriptor(cbat->ibid);
diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -73,8 +73,8 @@ delta_full_bat_( sql_column *c, sql_delt
r = BATkdiff(b,BATmirror(d)); bat_destroy(b); b = r;
}
(void)c;
- //if (!bat->cached && !c->base.wtime && !c->base.allocated && !s)
- //bat->cached = temp_descriptor(b->batCacheid);
+ if (!bat->cached && !s)
+ bat->cached = temp_descriptor(b->batCacheid);
return b;
}
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -36,11 +36,11 @@ Ready.
[ "oid", "bit", 40 ]
[ "oid", "bit", 40 ]
[ "oid", "bit", 283 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bte", 3545 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bte", 3549 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -94,15 +94,15 @@ Ready.
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -183,11 +183,11 @@ Ready.
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 3545 ]
-[ "oid", "str", 3545 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 3549 ]
+[ "oid", "str", 3549 ]
[ "oid", "timestamp", 0 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
diff --git a/sql/test/leaks/Tests/check1_gsl.stable.out
b/sql/test/leaks/Tests/check1_gsl.stable.out
--- a/sql/test/leaks/Tests/check1_gsl.stable.out
+++ b/sql/test/leaks/Tests/check1_gsl.stable.out
@@ -41,11 +41,11 @@ Ready.
[ "oid", "bit", 40 ]
[ "oid", "bit", 40 ]
[ "oid", "bit", 283 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bte", 3548 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bte", 3552 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -99,15 +99,15 @@ Ready.
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
-[ "oid", "int", 1274 ]
-[ "oid", "int", 1274 ]
-[ "oid", "int", 1274 ]
-[ "oid", "int", 1274 ]
-[ "oid", "int", 3548 ]
-[ "oid", "int", 3548 ]
-[ "oid", "int", 3548 ]
-[ "oid", "int", 3548 ]
-[ "oid", "int", 3548 ]
+[ "oid", "int", 1276 ]
+[ "oid", "int", 1276 ]
+[ "oid", "int", 1276 ]
+[ "oid", "int", 1276 ]
+[ "oid", "int", 3552 ]
+[ "oid", "int", 3552 ]
+[ "oid", "int", 3552 ]
+[ "oid", "int", 3552 ]
+[ "oid", "int", 3552 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -188,11 +188,11 @@ Ready.
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
-[ "oid", "str", 1274 ]
-[ "oid", "str", 1274 ]
-[ "oid", "str", 1274 ]
-[ "oid", "str", 3548 ]
-[ "oid", "str", 3548 ]
+[ "oid", "str", 1276 ]
+[ "oid", "str", 1276 ]
+[ "oid", "str", 1276 ]
+[ "oid", "str", 3552 ]
+[ "oid", "str", 3552 ]
[ "oid", "timestamp", 0 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out
b/sql/test/leaks/Tests/check1_nogeom.stable.out
--- a/sql/test/leaks/Tests/check1_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check1_nogeom.stable.out
@@ -36,11 +36,11 @@ Ready.
[ "oid", "bit", 40 ]
[ "oid", "bit", 40 ]
[ "oid", "bit", 283 ]
-[ "oid", "bit", 1233 ]
-[ "oid", "bit", 1233 ]
-[ "oid", "bit", 1233 ]
-[ "oid", "bit", 1233 ]
-[ "oid", "bte", 3438 ]
+[ "oid", "bit", 1235 ]
+[ "oid", "bit", 1235 ]
+[ "oid", "bit", 1235 ]
+[ "oid", "bit", 1235 ]
+[ "oid", "bte", 3442 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -94,15 +94,15 @@ Ready.
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
-[ "oid", "int", 1233 ]
-[ "oid", "int", 1233 ]
-[ "oid", "int", 1233 ]
-[ "oid", "int", 1233 ]
-[ "oid", "int", 3438 ]
-[ "oid", "int", 3438 ]
-[ "oid", "int", 3438 ]
-[ "oid", "int", 3438 ]
-[ "oid", "int", 3438 ]
+[ "oid", "int", 1235 ]
+[ "oid", "int", 1235 ]
+[ "oid", "int", 1235 ]
+[ "oid", "int", 1235 ]
+[ "oid", "int", 3442 ]
+[ "oid", "int", 3442 ]
+[ "oid", "int", 3442 ]
+[ "oid", "int", 3442 ]
+[ "oid", "int", 3442 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -183,11 +183,11 @@ Ready.
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
-[ "oid", "str", 1233 ]
-[ "oid", "str", 1233 ]
-[ "oid", "str", 1233 ]
-[ "oid", "str", 3438 ]
-[ "oid", "str", 3438 ]
+[ "oid", "str", 1235 ]
+[ "oid", "str", 1235 ]
+[ "oid", "str", 1235 ]
+[ "oid", "str", 3442 ]
+[ "oid", "str", 3442 ]
[ "oid", "timestamp", 0 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -36,11 +36,11 @@ Ready.
[ "oid", "bit", 40 ]
[ "oid", "bit", 40 ]
[ "oid", "bit", 283 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bit", 1273 ]
-[ "oid", "bte", 3545 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bit", 1275 ]
+[ "oid", "bte", 3549 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -94,15 +94,15 @@ Ready.
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
[ "oid", "int", 283 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 1273 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
-[ "oid", "int", 3545 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 1275 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
+[ "oid", "int", 3549 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -183,11 +183,11 @@ Ready.
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
[ "oid", "str", 283 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 1273 ]
-[ "oid", "str", 3545 ]
-[ "oid", "str", 3545 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 1275 ]
+[ "oid", "str", 3549 ]
+[ "oid", "str", 3549 ]
[ "oid", "timestamp", 0 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
diff --git a/sql/test/leaks/Tests/check2_gsl.stable.out
b/sql/test/leaks/Tests/check2_gsl.stable.out
--- a/sql/test/leaks/Tests/check2_gsl.stable.out
+++ b/sql/test/leaks/Tests/check2_gsl.stable.out
@@ -41,11 +41,11 @@ Ready.
[ "oid", "bit", 40 ]
[ "oid", "bit", 40 ]
[ "oid", "bit", 283 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bit", 1274 ]
-[ "oid", "bte", 3548 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bit", 1276 ]
+[ "oid", "bte", 3552 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
