Changeset: fae18bfb152a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fae18bfb152a
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
Branch: leftmart
Log Message:
temp solution of conflicts in stable.out tests
diffs (truncated from 8438 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -143,7 +143,6 @@ SYSTEM FUNCTION sys.concat
SYSTEM FUNCTION sys.contains
SYSTEM FUNCTION sys.copyfrom
SYSTEM FUNCTION sys.corr
-SYSTEM FUNCTION sys.createorderindex
SYSTEM FUNCTION sys.cos
SYSTEM FUNCTION sys.cosh
SYSTEM FUNCTION sys.cot
@@ -154,7 +153,6 @@ SYSTEM FUNCTION sys.current_date
SYSTEM FUNCTION sys.current_time
SYSTEM FUNCTION sys.current_timestamp
SYSTEM FUNCTION sys.curtime
->>>>>>> other
SYSTEM FUNCTION sys.date_to_str
SYSTEM FUNCTION sys.day
SYSTEM FUNCTION sys.dayofmonth
@@ -181,7 +179,6 @@ SYSTEM FUNCTION sys.dependencies_tables
SYSTEM FUNCTION sys.dependencies_tables_on_views
SYSTEM FUNCTION sys.dependencies_views_on_functions
SYSTEM FUNCTION sys.dependencies_views_on_triggers
-SYSTEM FUNCTION sys.droporderindex
SYSTEM FUNCTION sys.diff
SYSTEM FUNCTION sys.difference
SYSTEM FUNCTION sys.editdistance
@@ -624,8 +621,7 @@ CREATE TABLE "sys"."storagemodelinput" (
"distinct" BIGINT,
"atomwidth" INTEGER,
"reference" BOOLEAN,
- "sorted" BOOLEAN,
- "orderidx" BIGINT
+ "sorted" BOOLEAN
);
CREATE TABLE "sys"."systemfunctions" (
"function_id" INTEGER
@@ -1242,8 +1238,7 @@ returns table (
hashes bigint,
phash boolean,
imprints bigint,
- sorted boolean,
- orderidx bigint
+ sorted boolean
)
external name sql."storage";
create function sys."storage"( sname string)
@@ -1261,8 +1256,7 @@ returns table (
hashes bigint,
phash boolean,
imprints bigint,
- sorted boolean,
- orderidx bigint
+ sorted boolean
)
external name sql."storage";
create function sys."storage"( sname string, tname string)
@@ -1280,8 +1274,7 @@ returns table (
hashes bigint,
phash boolean,
imprints bigint,
- sorted boolean,
- orderidx bigint
+ sorted boolean
)
external name sql."storage";
create function sys."storage"( sname string, tname string, cname string)
@@ -1299,8 +1292,7 @@ returns table (
hashes bigint,
phash boolean,
imprints bigint,
- sorted boolean,
- orderidx bigint
+ sorted boolean
)
external name sql."storage";
create function sys.storagemodel()
@@ -1314,15 +1306,14 @@ returns table (
heapsize bigint,
hashes bigint,
imprints bigint,
- sorted boolean,
- orderidx bigint)
+ sorted boolean)
begin
return select i."schema", i."table", i."column", i."type", i."count",
columnsize(i."type", i.count, i."distinct"),
heapsize(i."type", i."distinct", i."atomwidth"),
hashsize(i."reference", i."count"),
imprintsize(i."count",i."type"),
- i.sorted, i.orderidx
+ i.sorted
from sys.storagemodelinput i;
end;
create procedure sys.storagemodelinit()
@@ -1330,7 +1321,7 @@ begin
delete from sys.storagemodelinput;
insert into sys.storagemodelinput
- select x."schema", x."table", x."column", x."type", x.typewidth,
x.count, 0, x.typewidth, false, x.sorted, x.orderidx from sys."storage"() x;
+ select x."schema", x."table", x."column", x."type", x.typewidth,
x.count, 0, x.typewidth, false, x.sorted from sys."storage"() x;
update sys.storagemodelinput
set reference = true
@@ -1444,7 +1435,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 376 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 373 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
@@ -1578,251 +1569,6 @@ 2149 "statement" "varchar" 2048 0
2139 N
2151 "id" "int" 32 0 2150 NULL true 0 NULL
2152 "name" "varchar" 1024 0 2150 NULL true 1
NULL
2153 "nr" "int" 32 0 2150 NULL true 2 NULL
-<<<<<<< local
-5682 "id" "int" 32 0 5681 NULL true 0 NULL
-5683 "name" "varchar" 1024 0 5681 NULL true 1
NULL
-5684 "schema_id" "int" 32 0 5681 NULL true 2
NULL
-5685 "query" "varchar" 2048 0 5681 NULL true 3
NULL
-5686 "type" "smallint" 16 0 5681 NULL true 4
NULL
-5687 "system" "boolean" 1 0 5681 NULL true
5 NULL
-5688 "commit_action" "smallint" 16 0 5681 NULL true
6 NULL
-5689 "access" "smallint" 16 0 5681 NULL true
7 NULL
-5690 "temporary" "smallint" 16 0 5681 NULL true
8 NULL
-5692 "id" "int" 32 0 5691 NULL true 0 NULL
-5693 "name" "varchar" 1024 0 5691 NULL true 1
NULL
-5694 "type" "varchar" 1024 0 5691 NULL true 2
NULL
-5695 "type_digits" "int" 32 0 5691 NULL true 3
NULL
-5696 "type_scale" "int" 32 0 5691 NULL true 4
NULL
-5697 "table_id" "int" 32 0 5691 NULL true 5
NULL
-5698 "default" "varchar" 2048 0 5691 NULL true
6 NULL
-5699 "null" "boolean" 1 0 5691 NULL true 7
NULL
-5700 "number" "int" 32 0 5691 NULL true 8
NULL
-5701 "storage" "varchar" 2048 0 5691 NULL true
9 NULL
-5708 "name" "varchar" 1024 0 5707 NULL true 0
NULL
-5709 "fullname" "varchar" 2048 0 5707 NULL true
1 NULL
-5710 "default_schema" "int" 9 0 5707 NULL true
2 NULL
-5714 "name" "varchar" 1024 0 5713 NULL true 0
NULL
-5715 "fullname" "varchar" 2024 0 5713 NULL true
1 NULL
-5716 "default_schema" "int" 9 0 5713 NULL true
2 NULL
-5718 "login_id" "int" 32 0 5717 NULL true 0
NULL
-5719 "role_id" "int" 32 0 5717 NULL true 1
NULL
-5721 "id" "int" 32 0 5720 NULL true 0 NULL
-5722 "name" "varchar" 1024 0 5720 NULL true 1
NULL
-5723 "grantor" "int" 32 0 5720 NULL true 2
NULL
-5725 "obj_id" "int" 32 0 5724 NULL true 0
NULL
-5726 "auth_id" "int" 32 0 5724 NULL true 1
NULL
-5727 "privileges" "int" 32 0 5724 NULL true 2
NULL
-5728 "grantor" "int" 32 0 5724 NULL true 3
NULL
-5729 "grantable" "int" 32 0 5724 NULL true 4
NULL
-5938 "id" "oid" 63 0 5946 NULL true 0 NULL
-5939 "owner" "clob" 0 0 5946 NULL true 1 NULL
-5940 "defined" "timestamp" 7 0 5946 NULL true
2 NULL
-5941 "query" "clob" 0 0 5946 NULL true 3 NULL
-5942 "pipe" "clob" 0 0 5946 NULL true 4 NULL
-5943 "plan" "clob" 0 0 5946 NULL true 5 NULL
-5944 "mal" "int" 32 0 5946 NULL true 6 NULL
-5945 "optimize" "bigint" 64 0 5946 NULL true
7 NULL
-5948 "id" "oid" 63 0 5957 NULL true 0 NULL
-5949 "start" "timestamp" 7 0 5957 NULL true 1
NULL
-5950 "stop" "timestamp" 7 0 5957 NULL true 2
NULL
-5951 "arguments" "clob" 0 0 5957 NULL true 3
NULL
-5952 "tuples" "wrd" 64 0 5957 NULL true 4
NULL
-5953 "run" "bigint" 64 0 5957 NULL true 5
NULL
-5954 "ship" "bigint" 64 0 5957 NULL true 6
NULL
-5955 "cpu" "int" 32 0 5957 NULL true 7 NULL
-5956 "io" "int" 32 0 5957 NULL true 8 NULL
-5959 "id" "oid" 63 0 5975 NULL true 0 NULL
-5960 "owner" "clob" 0 0 5975 NULL true 1 NULL
-5961 "defined" "timestamp" 7 0 5975 NULL true
2 NULL
-5962 "query" "clob" 0 0 5975 NULL true 3 NULL
-5963 "pipe" "clob" 0 0 5975 NULL true 4 NULL
-5964 "plan" "clob" 0 0 5975 NULL true 5 NULL
-5965 "mal" "int" 32 0 5975 NULL true 6 NULL
-5966 "optimize" "bigint" 64 0 5975 NULL true
7 NULL
-5967 "start" "timestamp" 7 0 5975 NULL true 8
NULL
-5968 "stop" "timestamp" 7 0 5975 NULL true 9
NULL
-5969 "arguments" "clob" 0 0 5975 NULL true 10
NULL
-5970 "tuples" "wrd" 64 0 5975 NULL true 11
NULL
-5971 "run" "bigint" 64 0 5975 NULL true 12
NULL
-5972 "ship" "bigint" 64 0 5975 NULL true 13
NULL
-5973 "cpu" "int" 32 0 5975 NULL true 14 NULL
-5974 "io" "int" 32 0 5975 NULL true 15 NULL
-6001 "event" "int" 32 0 6014 NULL true 0 NULL
-6002 "clk" "varchar" 20 0 6014 NULL true 1
NULL
-6003 "pc" "varchar" 50 0 6014 NULL true 2
NULL
-6004 "thread" "int" 32 0 6014 NULL true 3
NULL
-6005 "ticks" "bigint" 64 0 6014 NULL true 4
NULL
-6006 "rrsmb" "bigint" 64 0 6014 NULL true 5
NULL
-6007 "vmmb" "bigint" 64 0 6014 NULL true 6
NULL
-6008 "reads" "bigint" 64 0 6014 NULL true 7
NULL
-6009 "writes" "bigint" 64 0 6014 NULL true
8 NULL
-6010 "minflt" "bigint" 64 0 6014 NULL true
9 NULL
-6011 "majflt" "bigint" 64 0 6014 NULL true
10 NULL
-6012 "nvcsw" "bigint" 64 0 6014 NULL true 11
NULL
-6013 "stmt" "clob" 0 0 6014 NULL true 12 NULL
-6151 "user" "clob" 0 0 6157 NULL true 0 NULL
-6152 "login" "timestamp" 7 0 6157 NULL true 1
NULL
-6153 "sessiontimeout" "bigint" 64 0 6157 NULL
true 2 NULL
-6154 "lastcommand" "timestamp" 7 0 6157 NULL true
3 NULL
-6155 "querytimeout" "bigint" 64 0 6157 NULL true
4 NULL
-6156 "active" "boolean" 1 0 6157 NULL true
5 NULL
-6234 "name" "clob" 0 0 6237 NULL true 0 NULL
-6235 "def" "clob" 0 0 6237 NULL true 1 NULL
-6236 "status" "clob" 0 0 6237 NULL true 2
NULL
-6243 "name" "clob" 0 0 6245 NULL true 0 NULL
-6244 "value" "clob" 0 0 6245 NULL true 1 NULL
-6285 "qtag" "bigint" 64 0 6293 NULL true 0
NULL
-6286 "user" "clob" 0 0 6293 NULL true 1 NULL
-6287 "started" "timestamp" 7 0 6293 NULL true
2 NULL
-6288 "estimate" "timestamp" 7 0 6293 NULL true
3 NULL
-6289 "progress" "int" 32 0 6293 NULL true 4
NULL
-6290 "status" "clob" 0 0 6293 NULL true 5
NULL
-6291 "tag" "oid" 63 0 6293 NULL true 6 NULL
-6292 "query" "clob" 0 0 6293 NULL true 7 NULL
-6319 "rowid" "bigint" 64 0 6323 NULL true 0
NULL
-6320 "fldid" "int" 32 0 6323 NULL true 1 NULL
-6321 "message" "clob" 0 0 6323 NULL true 2
NULL
-6322 "input" "clob" 0 0 6323 NULL true 3 NULL
-6634 "srid" "int" 32 0 6641 NULL false 0 NULL
-6637 "auth_name" "varchar" 256 0 6641 NULL true
1 NULL
-6638 "auth_srid" "int" 32 0 6641 NULL true 2
NULL
-6639 "srtext" "varchar" 2048 0 6641 NULL true
3 NULL
-6640 "proj4text" "varchar" 2048 0 6641 NULL true
4 NULL
-6643 "f_table_catalog" "clob" 0 0 6650 NULL true
0 NULL
-6644 "f_table_schema" "varchar" 1024 0 6650 NULL
true 1 NULL
-6645 "f_table_name" "varchar" 1024 0 6650 NULL true
2 NULL
-6646 "f_geometry_column" "varchar" 1024 0 6650 NULL
true 3 NULL
-6647 "coord_dimension" "bigint" 64 0 6650 NULL
true 4 NULL
-6648 "srid" "int" 32 0 6650 NULL true 5 NULL
-6649 "type" "clob" 0 0 6650 NULL true 6 NULL
-7348 "keyword" "varchar" 40 0 7351 NULL false
0 NULL
-7353 "table_type_id" "smallint" 16 0 7359 NULL false
0 NULL
-7356 "table_type_name" "varchar" 25 0 7359 NULL
false 1 NULL
-7361 "dependency_type_id" "smallint" 16 0 7367 NULL
false 0 NULL
-7364 "dependency_type_name" "varchar" 15 0 7367 NULL
false 1 NULL
-7382 "file_id" "int" 32 0 7384 NULL true 0
NULL
-7383 "location" "char" 256 0 7384 NULL true 1
NULL
-7386 "dim_id" "int" 32 0 7390 NULL true 0
NULL
-7387 "file_id" "int" 32 0 7390 NULL true 1
NULL
-7388 "name" "varchar" 64 0 7390 NULL true 2
NULL
-7389 "length" "int" 32 0 7390 NULL true 3
NULL
-7392 "var_id" "int" 32 0 7398 NULL true 0
NULL
-7393 "file_id" "int" 32 0 7398 NULL true 1
NULL
-7394 "name" "varchar" 64 0 7398 NULL true 2
NULL
-7395 "vartype" "varchar" 64 0 7398 NULL true
3 NULL
-7396 "ndim" "int" 32 0 7398 NULL true 4 NULL
-7397 "coord_dim_id" "int" 32 0 7398 NULL true 5
NULL
-7400 "var_id" "int" 32 0 7404 NULL true 0
NULL
-7401 "dim_id" "int" 32 0 7404 NULL true 1
NULL
-7402 "file_id" "int" 32 0 7404 NULL true 2
NULL
-7403 "dimpos" "int" 32 0 7404 NULL true 3
NULL
-7406 "obj_name" "varchar" 256 0 7412 NULL true
0 NULL
-7407 "att_name" "varchar" 256 0 7412 NULL true
1 NULL
-7408 "att_type" "varchar" 64 0 7412 NULL true
2 NULL
-7409 "value" "clob" 0 0 7412 NULL true 3 NULL
-7410 "file_id" "int" 32 0 7412 NULL true 4
NULL
-7411 "gr_name" "varchar" 256 0 7412 NULL true
5 NULL
-7438 "schema" "clob" 0 0 7453 NULL true 0
NULL
-7439 "table" "clob" 0 0 7453 NULL true 1 NULL
-7440 "column" "clob" 0 0 7453 NULL true 2
NULL
-7441 "type" "clob" 0 0 7453 NULL true 3 NULL
-7442 "mode" "clob" 0 0 7453 NULL true 4 NULL
-7443 "location" "clob" 0 0 7453 NULL true 5
NULL
-7444 "count" "bigint" 64 0 7453 NULL true 6
NULL
-7445 "typewidth" "int" 32 0 7453 NULL true 7
NULL
-7446 "columnsize" "bigint" 64 0 7453 NULL true
8 NULL
-7447 "heapsize" "bigint" 64 0 7453 NULL true
9 NULL
-7448 "hashes" "bigint" 64 0 7453 NULL true
10 NULL
-7449 "phash" "boolean" 1 0 7453 NULL true 11
NULL
-7450 "imprints" "bigint" 64 0 7453 NULL true
12 NULL
-7451 "sorted" "boolean" 1 0 7453 NULL true
13 NULL
-7452 "orderidx" "bigint" 64 0 7453 NULL true
14 NULL
-7512 "schema" "clob" 0 0 7523 NULL true 0
NULL
-7513 "table" "clob" 0 0 7523 NULL true 1 NULL
-7514 "column" "clob" 0 0 7523 NULL true 2
NULL
-7515 "type" "clob" 0 0 7523 NULL true 3 NULL
-7516 "typewidth" "int" 32 0 7523 NULL true 4
NULL
-7517 "count" "bigint" 64 0 7523 NULL true 5
NULL
-7518 "distinct" "bigint" 64 0 7523 NULL true
6 NULL
-7519 "atomwidth" "int" 32 0 7523 NULL true 7
NULL
-7520 "reference" "boolean" 1 0 7523 NULL true
8 NULL
-7521 "sorted" "boolean" 1 0 7523 NULL true
9 NULL
-7522 "orderidx" "bigint" 64 0 7523 NULL true
10 NULL
-7562 "schema" "clob" 0 0 7573 NULL true 0
NULL
-7563 "table" "clob" 0 0 7573 NULL true 1 NULL
-7564 "column" "clob" 0 0 7573 NULL true 2
NULL
-7565 "type" "clob" 0 0 7573 NULL true 3 NULL
-7566 "count" "bigint" 64 0 7573 NULL true 4
NULL
-7567 "columnsize" "bigint" 64 0 7573 NULL true
5 NULL
-7568 "heapsize" "bigint" 64 0 7573 NULL true
6 NULL
-7569 "hashes" "bigint" 64 0 7573 NULL true
7 NULL
-7570 "imprints" "bigint" 64 0 7573 NULL true
8 NULL
-7571 "sorted" "boolean" 1 0 7573 NULL true
9 NULL
-7572 "orderidx" "bigint" 64 0 7573 NULL true
10 NULL
-7575 "schema" "clob" 0 0 7583 NULL true 0
NULL
-7576 "table" "clob" 0 0 7583 NULL true 1 NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
