Changeset: 2999bf7a48cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2999bf7a48cb
Modified Files:
clients/mapiclient/mclient.c
sql/test/VOC/Tests/VOC.stable.out
Branch: Aug2011
Log Message:
mclient: Remove upper limit to files that are read line-by-line for --echo.
If you want --echo, you get it, even if it is more expensive to do
line-by-line processing.
diffs (truncated from 313484 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2874,19 +2874,14 @@ main(int argc, char **argv)
if (optind < argc) {
/* execute from file(s) */
while (optind < argc) {
- if (echoquery &&
- strcmp(argv[optind], "-") != 0 &&
- stat(argv[optind], &statb) == 0 &&
- S_ISREG(statb.st_mode) &&
- statb.st_size < 1024*1024) {
+ if (echoquery && strcmp(argv[optind], "-") != 0) {
/* a bit of a hack: process file
- line-by-line if using -e (--echo)
- and the input file isn't "too
- large" so that the queries that are
- echoed have something to do with
- the output that follows (otherwise
- we just echo the start of the file
- for each query) */
+ * line-by-line if using -e (--echo)
+ * so that the queries that are echoed
+ * have something to do with the
+ * output that follows (otherwise we
+ * just echo the start of the file for
+ * each query) */
FILE *fp;
if ((fp = fopen(argv[optind], "r")) == NULL) {
fprintf(stderr, "%s: cannot open\n",
argv[optind]);
diff --git a/sql/test/VOC/Tests/VOC.stable.out
b/sql/test/VOC/Tests/VOC.stable.out
--- a/sql/test/VOC/Tests/VOC.stable.out
+++ b/sql/test/VOC/Tests/VOC.stable.out
@@ -55786,157938 +55786,155518 @@ Ready.
#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
#INSERT INTO "in
[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
-[ 1 ]
-#
-#INSERT INTO "invoices" VALUES (6313, '', 2, '', 409993, 'A');
-#INSERT INTO "invoices" VALUES (6314, '', 4, '', 310441, 'H');
-#INSERT INTO "invoices" VALUES (6315, '', 1, '', 372113, 'A');
-#INSERT INTO "invoices" VALUES (6316, '', 2, '', 235114, 'E');
-#INSERT INTO "invoices" VALUES (6317, '', 8, '', 366581, 'A');
-#INSERT INTO "invoices" VALUES (6318, '', 5, '', 223228, 'H');
-#INSERT INTO "invoices" VALUES (6319, '', 1, '', 272850, 'R');
-#INSERT INTO "invoices" VALUES (6320, '', 2, '', 297773, 'A');
-#INSERT INTO "in
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
