Changeset: f955c63e286d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f955c63e286d
Modified Files:
gdk/gdk_join.c
gdk/gdk_orderidx.c
sql/storage/bat/bat_storage.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: candidate-exceptions
Log Message:
Merge with default branch.
diffs (247 lines):
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -77,12 +77,12 @@ BATcheckorderidx(BAT *b)
if (b == NULL)
return false;
+ ACCELDEBUG t = GDKusec();
assert(b->batCacheid > 0);
/* we don't need the lock just to read the value b->torderidx */
if (b->torderidx == (Heap *) 1) {
/* but when we want to change it, we need the lock */
assert(!GDKinmemory());
- ACCELDEBUG t = GDKusec();
MT_lock_set(&GDKhashLock(b->batCacheid));
if (b->torderidx == (Heap *) 1) {
Heap *hp;
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
@@ -2380,8 +2380,6 @@ tr_update_delta( sql_trans *tr, sql_delt
temp_destroy(cbat->bid);
temp_destroy(cbat->ibid);
cbat->bid = cbat->ibid = 0;
- //if (!cur->batTransient)
- //BATmsync(cur);
}
obat->cnt = cbat->cnt = obat->ibase = cbat->ibase =
BATcount(cur);
temp_destroy(obat->ibid);
@@ -2485,8 +2483,6 @@ tr_merge_delta( sql_trans *tr, sql_delta
return LOG_ERR;
}
PROPdestroy(cur);
- //if (!cur->batTransient)
- //BATmsync(cur);
}
obat->cnt = obat->ibase = BATcount(cur);
temp_destroy(obat->ibid);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
---
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5944,6 +5944,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# 16:53:35 >
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
@@ -5107,6 +5107,7 @@ insert into sys.args values (26292, 135,
insert into sys.functions values (136, 'count', 'count', 'aggr', 0, 3, false,
false, false, 2000, true);
insert into sys.args values (26293, 136, 'res', 'bigint', 64, 0, 0, 0);
set schema "sys";
+commit;
# 15:55:37 >
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5944,6 +5944,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# 15:43:25 >
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -5944,6 +5944,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# 18:26:24 >
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -5114,6 +5114,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5114,6 +5114,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5943,6 +5943,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# 11:26:52 >
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -5905,6 +5905,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -5115,6 +5115,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# MonetDB/SQL module loaded
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -5944,6 +5944,7 @@ create function sys.deltas ("schema" str
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table ("id" int, "cleared" boolean, "immutable" bigint, "inserted"
bigint, "updates" bigint, "deletes" bigint, "level" int) external name
"sql"."deltas";
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('deltas') and type = 5;
set schema "sys";
+commit;
# 11:43:08 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
