Changeset: 73d547b2801e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73d547b2801e
Modified Files:
gdk/gdk_mosaic.c
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
Branch: mosaic
Log Message:
Fix file references
diffs (truncated from 462 to 300 lines):
diff --git a/gdk/gdk_mosaic.c b/gdk/gdk_mosaic.c
--- a/gdk/gdk_mosaic.c
+++ b/gdk/gdk_mosaic.c
@@ -59,6 +59,7 @@ BATmosaic(BAT *bn, BUN cap)
{
const char *nme;
Heap *m;
+ char *fname = 0;
MT_lock_set(&GDKmosaicLock(bn->batCacheid));
if( bn->tmosaic){
@@ -69,13 +70,14 @@ BATmosaic(BAT *bn, BUN cap)
nme = BBP_physical(bn->batCacheid);
if ( (m = (Heap*)GDKzalloc(sizeof(Heap))) == NULL ||
(m->farmid = BBPselectfarm(bn->batRole, bn->ttype, varheap)) <
0 ||
- (m->filename = GDKfilepath(NOFARM, NULL, nme, "mosaic")) == NULL){
- if( m)
- GDKfree(m->filename);
+ (fname = GDKfilepath(NOFARM, NULL, nme, "mosaic")) == NULL){
+ if( fname)
+ GDKfree(fname);
GDKfree(m);
MT_lock_unset(&GDKmosaicLock(bn->batCacheid));
return GDK_FAIL;
}
+ strncpy(m->filename, fname, sizeof(m->filename));
if( HEAPalloc(m, cap, Tsize(bn)) != GDK_SUCCEED){
MT_lock_unset(&GDKmosaicLock(bn->batCacheid));
@@ -141,8 +143,7 @@ BATcheckmosaic(BAT *b)
b->tmosaic = NULL;
if ((hp = GDKzalloc(sizeof(*hp))) != NULL &&
- (hp->farmid = BBPselectfarm(b->batRole, b->ttype,
mosaicheap)) >= 0 &&
- (hp->filename = GDKmalloc(strlen(nme) + 10)) != NULL) {
+ (hp->farmid = BBPselectfarm(b->batRole, b->ttype,
mosaicheap)) >= 0 ){
sprintf(hp->filename, "%s.%s", nme, ext);
diff --git a/sql/test/mosaic/Tests/xqueries.stable.out
b/sql/test/mosaic/Tests/xqueries.stable.out
--- a/sql/test/mosaic/Tests/xqueries.stable.out
+++ b/sql/test/mosaic/Tests/xqueries.stable.out
@@ -60,15 +60,15 @@ Ready.
% clob # type
% 116 # length
function user.s14_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s14_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -104,15 +104,15 @@ end user.s14_1;
% clob # type
% 117 # length
function user.s16_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_70:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_70:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_72:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s16_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=3 usec
@@ -174,15 +174,15 @@ end user.s16_1;
% clob # type
% 116 # length
function user.s32_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s32_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
@@ -217,15 +217,15 @@ end user.s32_1;
% clob # type
% 117 # length
function user.s34_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_70:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_70:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_72:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s34_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=3 usec
@@ -275,15 +275,15 @@ end user.s34_1;
% clob # type
% 116 # length
function user.s46_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s46_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
@@ -318,15 +318,15 @@ end user.s46_1;
% clob # type
% 117 # length
function user.s48_1():void;
- X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from tmp3 where i =
7;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "tmp3":str, "i":str, 0:int);
- C_70:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_70:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_72:bat[:oid] := sql.tid(X_5:int, "sys":str, "tmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s48_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
diff --git a/sql/test/mosaic/Tests/xqueries_delta.stable.out
b/sql/test/mosaic/Tests/xqueries_delta.stable.out
--- a/sql/test/mosaic/Tests/xqueries_delta.stable.out
+++ b/sql/test/mosaic/Tests/xqueries_delta.stable.out
@@ -48,15 +48,15 @@ Ready.
% clob # type
% 117 # length
function user.s10_1():void;
- X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "dtmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s10_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
@@ -92,15 +92,15 @@ end user.s10_1;
% clob # type
% 118 # length
function user.s12_1():void;
- X_2:void := querylog.define("explain select count(*) from dtmp3 where i =
7;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from dtmp3 where i =
7;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "dtmp3":str, "i":str, 0:int);
- C_70:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_70:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_72:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s12_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -180,15 +180,15 @@ end user.s12_1;
% clob # type
% 117 # length
function user.s34_1():void;
- X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "dtmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s34_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=1 usec
@@ -223,15 +223,15 @@ end user.s34_1;
% clob # type
% 118 # length
function user.s36_1():void;
- X_2:void := querylog.define("explain select count(*) from dtmp3 where i =
7;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from dtmp3 where i =
7;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "dtmp3":str, "i":str, 0:int);
- C_70:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_70:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_72:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_72:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 7:int,
"==":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s36_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=2 usec
@@ -293,15 +293,15 @@ end user.s36_1;
% clob # type
% 117 # length
function user.s52_1():void;
- X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 12:int);
+ X_2:void := querylog.define("explain select count(*) from dtmp3 where i
<4;":str, "sequential_pipe":str, 13:int);
X_5:int := sql.mvc();
X_9:bat[:int] := sql.bind(X_5:int, "sys":str, "dtmp3":str, "i":str, 0:int);
- C_71:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
- X_6:bat[:oid] := mosaic.decompress(C_71:bat[:oid]);
- X_14:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
- X_16:bat[:int] := mosaic.projection(X_14:bat[:oid], X_9:bat[:int]);
- X_17:lng := aggr.count(X_16:bat[:int]);
- sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_17:lng);
+ C_73:bat[:oid] := sql.tid(X_5:int, "sys":str, "dtmp3":str);
+ X_6:bat[:oid] := mosaic.decompress(C_73:bat[:oid]);
+ X_15:bat[:oid] := mosaic.thetaselect(X_9:bat[:int], X_6:bat[:oid], 4:int,
"<":str);
+ X_17:bat[:int] := mosaic.projection(X_15:bat[:oid], X_9:bat[:int]);
+ X_18:lng := aggr.count(X_17:bat[:int]);
+ sql.resultSet("sys.L4":str, "L3":str, "bigint":str, 64:int, 0:int, 7:int,
X_18:lng);
end user.s52_1;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
@@ -336,15 +336,15 @@ end user.s52_1;
% clob # type
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
