Changeset: 9e7299af2748 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e7299af2748
Added Files:
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err
sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.sql
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.err
sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.sql
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.err
sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.out
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
sql/test/BugTracker-2016/Tests/All
tools/merovingian/daemon/forkmserver.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 896 to 300 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -57,7 +57,7 @@ void print_lidar_header(FILE *file, LASH
unsigned int nVLR = 0;
int i = 0;
- char minor, major;
+ unsigned char minor, major;
pszSignature = LASHeader_GetFileSignature(header);
pszProjectId = LASHeader_GetProjectId(header);
@@ -82,12 +82,12 @@ void print_lidar_header(FILE *file, LASH
LASError_Print("File signature is not 'LASF'... aborting");
exit(1);
}
- fprintf(file, " Version: %d.%d\n", major, minor);
+ fprintf(file, " Version: %hhu.%hhu\n", major, minor);
- fprintf(file, " Source ID: %d\n",
+ fprintf(file, " Source ID: %hu\n",
LASHeader_GetFileSourceId(header) ) ;
- fprintf(file, " Reserved: %d\n",
+ fprintf(file, " Reserved: %hu\n",
LASHeader_GetReserved(header) );
fprintf(file, " Project ID/GUID: '%s'\n",
@@ -99,29 +99,29 @@ void print_lidar_header(FILE *file, LASH
fprintf(file, " Generating Software: '%s'\n",
pszSoftwareId);
- fprintf(file, " File Creation Day/Year: %d/%d\n",
+ fprintf(file, " File Creation Day/Year: %hu/%hu\n",
LASHeader_GetCreationDOY(header),
LASHeader_GetCreationYear(header));
- fprintf(file, " Header Size %d\n",
+ fprintf(file, " Header Size %hu\n",
LASHeader_GetHeaderSize(header));
- fprintf(file, " Offset to Point Data %d\n",
+ fprintf(file, " Offset to Point Data %u\n",
LASHeader_GetDataOffset(header));
- fprintf(file, " Number Var. Length Records %d\n",
+ fprintf(file, " Number Var. Length Records %u\n",
LASHeader_GetRecordsCount(header));
- fprintf(file, " Point Data Format %d\n",
+ fprintf(file, " Point Data Format %hhu\n",
LASHeader_GetDataFormatId(header));
- fprintf(file, " Point Data Record Length %d\n",
+ fprintf(file, " Point Data Record Length %hu\n",
LASHeader_GetDataRecordLength(header));
- fprintf(file, " Number of Point Records %d\n",
+ fprintf(file, " Number of Point Records %u\n",
LASHeader_GetPointRecordsCount(header));
- fprintf(file, " Number of Points by Return %d %d %d %d %d\n",
+ fprintf(file, " Number of Points by Return %u %u %u %u %u\n",
LASHeader_GetPointRecordsByReturnCount(header, 0),
LASHeader_GetPointRecordsByReturnCount(header, 1),
LASHeader_GetPointRecordsByReturnCount(header, 2),
@@ -176,7 +176,7 @@ void print_lidar_header(FILE *file, LASH
fprintf(file, " User: '%s' - Description: '%s'\n", pszVLRUser,
pszVLRDescription);
- fprintf(file, " ID: %d Length: %d\n\n", nVLRRecordId,
nVLRLength);
+ fprintf(file, " ID: %hu Length: %hu\n\n", nVLRRecordId,
nVLRLength);
MT_lock_set(&mt_lidar_lock);
LASVLR_Destroy(pVLR);
@@ -1008,16 +1008,16 @@ str LIDARloadTable(Client cntxt, MalBlkP
"X (raw) : %f (%ld)\n"
"Z (raw) : %f (%ld)\n"
"Z (raw) : %f (%ld)\n"
- "intensity : %d\n"
- "return number : %d\n"
- "number of returns : %d\n"
- "scan direction : %d\n"
- "flight line edge : %d\n"
- "scan flags : %d\n"
- "classification : %d\n"
+ "intensity : %hu\n"
+ "return number : %hu\n"
+ "number of returns : %hu\n"
+ "scan direction : %hu\n"
+ "flight line edge : %hu\n"
+ "scan flags : %hhu\n"
+ "classification : %hhu\n"
"time : %f\n"
- "scan angle rank : %d\n"
- "point source id : %d\n",
+ "scan angle rank : %hhd\n"
+ "point source id : %hu\n",
i, x, rawx, y, rawy, z, rawz,
intensity, returnno, noofreturns,
scandir, flightline, flags, class,
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -46,3 +46,6 @@ create_merge_table_withdata.Bug-4041
timestamp_with_tz_fromstr.Bug-4019
simpletest
like_in_non_sys_schema.Bug-4062
+CREATE_INDEX_breaks_table_queries.Bug-4053
+concat_2_integers.Bug-4058
+column_not_found.Bug-4064
diff --git
a/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql
@@ -0,0 +1,71 @@
+CREATE TABLE "sys"."farmap_movimento" (
+ "id" SERIAL,
+ "articolo_id" BIGINT NOT NULL,
+ "farmacia_id" INTEGER NOT NULL,
+ "causale_id" INTEGER NOT NULL,
+ "ts" TIMESTAMP NOT NULL,
+ "anno" SMALLINT NOT NULL,
+ "mese" SMALLINT NOT NULL,
+ "data" CHARACTER LARGE OBJECT NOT NULL,
+ "ora" CHARACTER LARGE OBJECT NOT NULL,
+ "tipo_doc" CHARACTER LARGE OBJECT NOT NULL,
+ "num_doc" CHARACTER LARGE OBJECT NOT NULL,
+ "num_riga" INTEGER NOT NULL,
+ "flag_flusso" CHARACTER LARGE OBJECT,
+ "tessera" CHARACTER LARGE OBJECT,
+ "cassa" CHARACTER LARGE OBJECT,
+ "operatore" CHARACTER LARGE OBJECT,
+ "tipo_sconto" CHARACTER LARGE OBJECT,
+ "tipo_vend" CHARACTER LARGE OBJECT,
+ "ricetta_numero" CHARACTER LARGE OBJECT,
+ "barcode_reg_asl" CHARACTER LARGE OBJECT,
+ "barcode_ricettario" CHARACTER LARGE OBJECT,
+ "anomalia_dominio" CHARACTER LARGE OBJECT,
+ "anomalia_integrita" CHARACTER LARGE OBJECT,
+ "anomalia_quadratura" CHARACTER LARGE OBJECT,
+ "anomalia_congruenza" CHARACTER LARGE OBJECT,
+ "offerta" CHARACTER LARGE OBJECT,
+ "flag_ricetta" CHARACTER LARGE OBJECT,
+ "flag_costo" CHARACTER LARGE OBJECT,
+ "pagamento" CHARACTER LARGE OBJECT,
+ "pagamento_modalita" CHARACTER LARGE OBJECT,
+ "regola_prezzo" CHARACTER LARGE OBJECT,
+ "regola_costo" CHARACTER LARGE OBJECT,
+ "flag_sconto" CHARACTER LARGE OBJECT,
+ "uscito_qta" DOUBLE,
+ "uscito_val" DOUBLE,
+ "uscito_val_n_iva" DOUBLE,
+ "uscito_listino" DOUBLE,
+ "uscito_listino_n_iva" DOUBLE,
+ "uscito_costo" DOUBLE,
+ "uscito_sconto_riga" DOUBLE,
+ "uscito_sconto_doc" DOUBLE,
+ "uscito_sconto_asl" DOUBLE,
+ "uscito_sconto_listino" DOUBLE,
+ "uscito_ricetta" DOUBLE,
+ "uscito_ticket" DOUBLE,
+ "uscito_ricetta_quota" DOUBLE,
+ "periodo" INTEGER NOT NULL DEFAULT 0,
+ "flag_promo" BOOLEAN NOT NULL DEFAULT FALSE,
+ "scontrino" BIGINT DEFAULT 0,
+ "class_interna" INTEGER NOT NULL DEFAULT 0,
+ "anno_mese" INTEGER,
+ "anno_periodo" INTEGER
+);
+
+CREATE INDEX "annomese_idx" ON "sys"."farmap_movimento" ("anno_mese");
+CREATE INDEX "articolo_idx" ON "sys"."farmap_movimento" ("articolo_id");
+CREATE INDEX "farmacia_idx" ON "sys"."farmap_movimento" ("farmacia_id");
+
+-- TODO: 3. load data from csv with \copy
+
+SELECT * FROM "sys"."farmap_movimento" ORDER BY "id";
+
+SELECT count(distinct "anno_mese") FROM "sys"."farmap_movimento";
+
+SELECT count(distinct "articolo_id") FROM "sys"."farmap_movimento";
+
+SELECT count(distinct "farmacia_id") FROM "sys"."farmap_movimento";
+
+DROP TABLE "sys"."farmap_movimento";
+
diff --git
a/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'CREATE_INDEX_breaks_table_queries.Bug-4053` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 12:33:20 >
+# 12:33:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37698" "--set"
"mapi_usock=/var/tmp/mtest-15961/.s.monetdb.37698" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 12:33:20 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/dinther/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 37698
+# cmdline opt mapi_usock = /var/tmp/mtest-15961/.s.monetdb.37698
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 12:33:20 >
+# 12:33:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15961" "--port=37698"
+# 12:33:20 >
+
+
+# 12:33:21 >
+# 12:33:21 > "Done."
+# 12:33:21 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out
@@ -0,0 +1,110 @@
+stdout of test 'CREATE_INDEX_breaks_table_queries.Bug-4053` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 12:33:20 >
+# 12:33:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37698" "--set"
"mapi_usock=/var/tmp/mtest-15961/.s.monetdb.37698" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 12:33:20 >
+
+# MonetDB 5 server v11.23.8
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:37698/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-15961/.s.monetdb.37698
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 12:33:20 >
+# 12:33:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-15961" "--port=37698"
+# 12:33:20 >
+
+#CREATE TABLE "sys"."farmap_movimento" (
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
