monetdb-java: src/main/java/org/monetdb/mcl/net/MapiSocket.java annotate

annotate src/main/java/org/monetdb/mcl/net/MapiSocket.java @ 836:aad275e042b2 monetdbs

Heed followRedirect

author	Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date	Fri, 15 Dec 2023 11:05:16 +0100 (16 months ago)
parents	071be9a628e8
children	3a477cf520f6

rev	line source
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1 /*
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	2 * This Source Code Form is subject to the terms of the Mozilla Public
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	3 * License, v. 2.0. If a copy of the MPL was not distributed with this
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	4 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	5 *
716 aeb268156580 Updated Copyright year. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 709 diff changeset	6 * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	7 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	8
391 f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	9 package org.monetdb.mcl.net;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	10
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	11 import java.io.BufferedInputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	12 import java.io.BufferedOutputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	13 import java.io.FileWriter;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	14 import java.io.FilterInputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	15 import java.io.FilterOutputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	16 import java.io.IOException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	17 import java.io.InputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	18 import java.io.OutputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	19 import java.io.Writer;
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	20 import java.net.*;
555 90c346571eb4 Use StandardCharsets.UTF_8 where possible Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 554 diff changeset	21 import java.nio.charset.StandardCharsets;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	22 import java.security.MessageDigest;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	23 import java.security.NoSuchAlgorithmException;
811 ede3a59ff4f2 Add MapiSocket.connect(url, properties) method Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 803 diff changeset	24 import java.util.*;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	25
391 f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	26 import org.monetdb.mcl.MCLException;
f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	27 import org.monetdb.mcl.io.BufferedMCLReader;
f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	28 import org.monetdb.mcl.io.BufferedMCLWriter;
497 aed7f32e029a Refactor LineType to be an enum Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 495 diff changeset	29 import org.monetdb.mcl.io.LineType;
391 f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	30 import org.monetdb.mcl.parser.MCLParseException;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	31
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	32 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	33 * A Socket for communicating with the MonetDB database in MAPI block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	34 * mode.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	35 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	36 * The MapiSocket implements the protocol specifics of the MAPI block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	37 * mode protocol, and interfaces it as a socket that delivers a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	38 * BufferedReader and a BufferedWriter. Because logging in is an
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	39 * integral part of the MAPI protocol, the MapiSocket performs the login
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	40 * procedure. Like the Socket class, various options can be set before
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	41 * calling the connect() method to influence the login process. Only
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	42 * after a successful call to connect() the BufferedReader and
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	43 * BufferedWriter can be retrieved.
194 1296dbcc4958 Resolved javadoc many errors and warnings, such as: Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 180 diff changeset	44 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	45 * For each line read, it is determined what type of line it is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	46 * according to the MonetDB MAPI protocol. This results in a line to be
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	47 * PROMPT, HEADER, RESULT, ERROR or UNKNOWN. Use the getLineType()
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	48 * method on the BufferedMCLReader to retrieve the type of the last
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	49 * line read.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	50 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	51 * For debugging purposes a socket level debugging is implemented where
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	52 * each and every interaction to and from the MonetDB server is logged
194 1296dbcc4958 Resolved javadoc many errors and warnings, such as: Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 180 diff changeset	53 * to a file on disk.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	54 * Incoming messages are prefixed by "RX" (received by the driver),
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	55 * outgoing messages by "TX" (transmitted by the driver). Special
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	56 * decoded non-human readable messages are prefixed with "RD" and "TD"
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	57 * instead. Following this two char prefix, a timestamp follows as the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	58 * number of milliseconds since the UNIX epoch. The rest of the line is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	59 * a String representation of the data sent or received.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	60 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	61 * The general use of this Socket must be seen only in the full context
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	62 * of a MAPI connection to a server. It has the same ingredients as a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	63 * normal Socket, allowing for seamless plugging.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	64 * <pre>
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	65 * Socket \ / InputStream ----> (BufferedMCL)Reader
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	66 * > o <
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	67 * MapiSocket / \ OutputStream ----> (BufferedMCL)Writer
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	68 * </pre>
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	69 * The MapiSocket allows to retrieve Streams for communicating. They
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	70 * are interfaced, so they can be chained in any way. While the Socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	71 * transparently deals with how data is sent over the wire, the actual
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	72 * data read needs to be interpreted, for which a Reader/Writer
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	73 * interface is most sufficient. In particular the BufferedMCL*
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	74 * implementations of those interfaces supply some extra functionality
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	75 * geared towards the format of the data.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	76 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	77 * @author Fabian Groffen
768 a80c21fe7bb2 Removed deprecated nl.cwi.monetdb.. classes and package. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 756 diff changeset	78 * @version 4.3
391 f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	79 * @see org.monetdb.mcl.io.BufferedMCLReader
f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 368 diff changeset	80 * @see org.monetdb.mcl.io.BufferedMCLWriter
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	81 */
768 a80c21fe7bb2 Removed deprecated nl.cwi.monetdb.. classes and package. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 756 diff changeset	82 public final class MapiSocket {
834 5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	83 /* an even number of NUL bytes used during the handshake */
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	84 private static final byte[] NUL_BYTES = new byte[]{ 0, 0, 0, 0, 0, 0, 0, 0, };
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	85
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	86 /* A mapping between hash algorithm names as used in the MAPI
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	87 * protocol, and the names by which the Java runtime knows them.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	88 */
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	89 private static final String[][] KNOWN_ALGORITHMS = new String[][] {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	90 {"SHA512", "SHA-512"},
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	91 {"SHA384", "SHA-384"},
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	92 {"SHA256", "SHA-256"},
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	93 // should we deprecate this by now?
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	94 {"SHA1", "SHA-1"},
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	95 };
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	96
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	97 // MUST be lowercase!
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	98 private static final char[] HEXDIGITS = "0123456789abcdef".toCharArray();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	99
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	100 /** Connection parameters */
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	101 private Target target;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	102 /** The TCP Socket to mserver */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	103 private Socket con;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	104 /** Stream from the Socket for reading */
501 eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	105 private BlockInputStream fromMonet;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	106 /** Stream from the Socket for writing */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	107 private OutputStream toMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	108 /** MCLReader on the InputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	109 private BufferedMCLReader reader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	110 /** MCLWriter on the OutputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	111 private BufferedMCLWriter writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	112 /** protocol version of the connection */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	113 private int version;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	114
836 aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	115 /** Whether we should follow redirects.
aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	116 * Not sure why this needs to be separate
aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	117 * from 'ttl' but someone someday explicitly documented setTtl
aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	118 * with 'to disable completely, use followRedirects' so
aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	119 * apparently there is a use case.
aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	120 */
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	121 private boolean followRedirects = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	122 /** How many redirections do we follow until we're fed up with it? */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	123 private int ttl = 10;
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	124
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	125 /** The Writer for the debug log-file */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	126 private Writer log;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	127
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	128 /** The blocksize (hardcoded in compliance with MonetDB common/stream/stream.h) */
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	129 public final static int BLOCK = 8190;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	130
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	131 /** A short in two bytes for holding the block size in bytes */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	132 private final byte[] blklen = new byte[2];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	133
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	134 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	135 * Constructs a new MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	136 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	137 public MapiSocket() {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	138 target = new Target();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	139 con = null;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	140 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	141
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	142 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	143 * Sets the database to connect to. If database is null, a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	144 * connection is made to the default database of the server. This
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	145 * is also the default.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	146 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	147 * @param db the database
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	148 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	149 public void setDatabase(final String db) {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	150 target.setDatabase(db);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	151 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	152
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	153 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	154 * Sets the language to use for this connection.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	155 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	156 * @param lang the language
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	157 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	158 public void setLanguage(final String lang) {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	159 target.setLanguage(lang);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	160 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	161
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	162 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	163 * Sets the hash method to use. Note that this method is intended
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	164 * for debugging purposes. Setting a hash method can yield in
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	165 * connection failures. Multiple hash methods can be given by
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	166 * separating the hashes by commas.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	167 * DON'T USE THIS METHOD if you don't know what you're doing.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	168 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	169 * @param hash the hash method to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	170 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	171 public void setHash(final String hash) {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	172 target.setHash(hash);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	173 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	174
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	175 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	176 * Sets whether MCL redirections should be followed or not. If set
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	177 * to false, an MCLException will be thrown when a redirect is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	178 * encountered during connect. The default bahaviour is to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	179 * automatically follow redirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	180 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	181 * @param r whether to follow redirects (true) or not (false)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	182 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	183 public void setFollowRedirects(final boolean r) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	184 this.followRedirects = r;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	185 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	186
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	187 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	188 * Sets the number of redirects that are followed when
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	189 * followRedirects is true. In order to avoid going into an endless
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	190 * loop due to some evil server, or another error, a maximum number
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	191 * of redirects that may be followed can be set here. Note that to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	192 * disable the following of redirects you should use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	193 * setFollowRedirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	194 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	195 * @see #setFollowRedirects(boolean r)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	196 * @param t the number of redirects before an exception is thrown
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	197 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	198 public void setTTL(final int t) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	199 this.ttl = t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	200 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	201
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	202 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	203 * Set the SO_TIMEOUT on the underlying Socket. When for some
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	204 * reason the connection to the database hangs, this setting can be
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	205 * useful to break out of this indefinite wait.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	206 * This option must be enabled prior to entering the blocking
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	207 * operation to have effect.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	208 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	209 * @param s The specified timeout, in milliseconds. A timeout
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	210 * of zero will disable timeout (i.e., timeout of infinity).
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	211 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	212 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	213 public void setSoTimeout(final int s) throws SocketException {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	214 if (s < 0) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	215 throw new IllegalArgumentException("timeout can't be negative");
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	216 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	217 target.setSoTimeout(s);
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	218 // limit time to wait on blocking operations
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	219 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	220 con.setSoTimeout(s);
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	221 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	222 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	223
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	224 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	225 * Gets the SO_TIMEOUT from the underlying Socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	226 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	227 * @return the currently in use timeout in milliseconds
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	228 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	229 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	230 public int getSoTimeout() throws SocketException {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	231 return target.getSoTimeout();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	232 }
75 db46b4ab2b9f Correct the condition for when the log can be closed: only when log instanceof FileWriter Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 53 diff changeset	233
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	234 /**
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	235 * Enables/disables debug mode with logging to file
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	236 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	237 * @param debug Value to set
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	238 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	239 public void setDebug(final boolean debug) {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	240 target.setDebug(debug);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	241 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	242
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	243 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	244 * Connects to the given host and port, logging in as the given
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	245 * user. If followRedirect is false, a RedirectionException is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	246 * thrown when a redirect is encountered.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	247 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	248 * @param host the hostname, or null for the loopback address
225 5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props). Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 200 diff changeset	249 * @param port the port number (must be between 0 and 65535, inclusive)
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	250 * @param user the username
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	251 * @param pass the password
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	252 * @return A List with informational (warning) messages. If this
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	253 * list is empty; then there are no warnings.
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	254 * @throws IOException if an I/O error occurs when creating the socket
225 5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props). Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 200 diff changeset	255 * @throws SocketException - if there is an error in the underlying protocol, such as a TCP error.
5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props). Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 200 diff changeset	256 * @throws UnknownHostException if the IP address of the host could not be determined
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	257 * @throws MCLParseException if bogus data is received
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	258 * @throws MCLException if an MCL related error occurs
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	259 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	260 public List<String> connect(final String host, final int port, final String user, final String pass)
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	261 throws IOException, SocketException, UnknownHostException, MCLParseException, MCLException
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	262 {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	263 target.setHost(host);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	264 target.setPort(port);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	265 target.setUser(user);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	266 target.setPassword(pass);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	267 return connect(target, null);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	268 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	269
811 ede3a59ff4f2 Add MapiSocket.connect(url, properties) method Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 803 diff changeset	270 public List<String> connect(String url, Properties props) throws URISyntaxException, ValidationError, MCLException, MCLParseException, IOException {
ede3a59ff4f2 Add MapiSocket.connect(url, properties) method Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 803 diff changeset	271 return connect(new Target(url, props), null);
ede3a59ff4f2 Add MapiSocket.connect(url, properties) method Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 803 diff changeset	272 }
ede3a59ff4f2 Add MapiSocket.connect(url, properties) method Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 803 diff changeset	273
834 5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	274 /**
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	275 * Connect according to the settings in the 'target' parameter.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	276 * If followRedirect is false, a RedirectionException is
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	277 * thrown when a redirect is encountered.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	278 *
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	279 * Some settings, such as the initial reply size, can already be configured
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	280 * during the handshake, saving a command round-trip later on.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	281 * To do so, create and pass a subclass of {@link MapiSocket.OptionsCallback}.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	282 *
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	283 * @param target the connection settings
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	284 * @param callback will be called if the server allows options to be set during the
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	285 * initial handshake
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	286 * @return A List with informational (warning) messages. If this
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	287 * list is empty; then there are no warnings.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	288 * @throws IOException if an I/O error occurs when creating the socket
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	289 * @throws SocketException - if there is an error in the underlying protocol, such as a TCP error.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	290 * @throws UnknownHostException if the IP address of the host could not be determined
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	291 * @throws MCLParseException if bogus data is received
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	292 * @throws MCLException if an MCL related error occurs
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	293 */
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	294 public List<String> connect(Target target, OptionsCallback callback) throws MCLException, MCLParseException, IOException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	295 // get rid of any earlier connection state, including the existing target
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	296 close();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	297 this.target = target;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	298
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	299 Target.Validated validated;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	300 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	301 validated = target.validate();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	302 } catch (ValidationError e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	303 throw new MCLException(e.getMessage());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	304 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	305
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	306 if (validated.connectScan()) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	307 return scanUnixSockets(callback);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	308 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	309
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	310 ArrayList<String> warnings = new ArrayList<>();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	311 int attempts = 0;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	312 do {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	313 boolean ok = false;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	314 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	315 boolean done = tryConnect(callback, warnings);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	316 ok = true;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	317 if (done) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	318 return warnings;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	319 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	320 } finally {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	321 if (!ok)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	322 close();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	323 }
836 aad275e042b2 Heed followRedirect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 835 diff changeset	324 } while (followRedirects && attempts++ < this.ttl);
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	325 throw new MCLException("max redirect count exceeded");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	326 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	327
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	328 private List<String> scanUnixSockets(OptionsCallback callback) throws MCLException, MCLParseException, IOException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	329 // Because we do not support Unix Domain sockets, we just go back to connect().
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	330 // target.connectScan() will now return false;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	331 target.setHost("localhost");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	332 return connect(target, callback);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	333 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	334
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	335 private boolean tryConnect(OptionsCallback callback, ArrayList<String> warningBuffer) throws MCLException, IOException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	336 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	337 // We need a valid target
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	338 Target.Validated validated = target.validate();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	339 // con will be non-null if the previous attempt ended in a redirect to mapi:monetdb://proxy
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	340 if (con == null)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	341 connectSocket(validated);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	342 return handshake(validated, callback, warningBuffer);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	343 } catch (IOException \| MCLException e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	344 close();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	345 throw e;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	346 } catch (ValidationError e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	347 close();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	348 throw new MCLException(e.getMessage());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	349 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	350 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	351
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	352 private void connectSocket(Target.Validated validated) throws MCLException, IOException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	353 // This method performs steps 2-6 of the procedure outlined in the URL spec
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	354 String tcpHost = validated.connectTcp();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	355 if (tcpHost.isEmpty()) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	356 throw new MCLException("Unix domain sockets are not supported, only TCP");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	357 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	358 int port = validated.connectPort();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	359 Socket sock = new Socket(tcpHost, port);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	360 sock.setSoTimeout(validated.getSoTimeout());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	361 sock.setTcpNoDelay(true);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	362 sock.setKeepAlive(true);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	363
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	364 sock = wrapTLS(sock, validated);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	365
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	366 fromMonet = new BlockInputStream(sock.getInputStream());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	367 toMonet = new BlockOutputStream(sock.getOutputStream());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	368 reader = new BufferedMCLReader(fromMonet, StandardCharsets.UTF_8);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	369 writer = new BufferedMCLWriter(toMonet, StandardCharsets.UTF_8);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	370 writer.registerReader(reader);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	371 reader.advance();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	372
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	373 // Only assign to sock when everything went ok so far
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	374 con = sock;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	375 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	376
800 09f463444dde TLS support in its most basic form Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 799 diff changeset	377 private Socket wrapTLS(Socket sock, Target.Validated validated) throws IOException {
801 88b3e8e89126 TLS seems to work Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 800 diff changeset	378 if (validated.getTls())
88b3e8e89126 TLS seems to work Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 800 diff changeset	379 return SecureSocket.wrap(validated, sock);
803 1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	380 else {
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	381 // Send an even number of NUL bytes.
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	382 // We expect the server to speak MAPI and in that case, it's a NOP.
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	383 // If we're accidentally connecting to a TLS server, the bytes are
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	384 // invalid as a Client Hello message and most TLS implementations
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	385 // drop the connection.
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	386 // This is nice because otherwise we would hang, as the TLS server
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	387 // is waiting for us to send a TLS CLient Hello, and we are waiting
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	388 // for a MAPI server to send a server challenge.
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	389 sock.getOutputStream().write(NUL_BYTES);
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	390 }
1671f2eb130b Send NUL bytes on non-TLS connect Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 801 diff changeset	391 return sock;
801 88b3e8e89126 TLS seems to work Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 800 diff changeset	392 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	393
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	394 private boolean handshake(Target.Validated validated, OptionsCallback callback, ArrayList<String> warnings) throws IOException, MCLException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	395 String challenge = reader.getLine();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	396 reader.advance();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	397 if (reader.getLineType() != LineType.PROMPT)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	398 throw new MCLException("Garbage after server challenge: " + reader.getLine());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	399 String response = challengeResponse(validated, challenge, callback);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	400 writer.writeLine(response);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	401 reader.advance();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	402
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	403 // Process the response lines.
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	404 String redirect = null;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	405 StringBuilder errors = new StringBuilder();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	406 while (reader.getLineType() != LineType.PROMPT) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	407 switch (reader.getLineType()) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	408 case REDIRECT:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	409 if (redirect == null)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	410 redirect = reader.getLine(1);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	411 break;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	412 case ERROR:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	413 if (errors.length() > 0)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	414 errors.append("\n");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	415 errors.append(reader.getLine(7)); // 7 not 1!
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	416 break;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	417 case INFO:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	418 warnings.add(reader.getLine(1));
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	419 break;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	420 default:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	421 // ignore??!!
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	422 break;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	423 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	424 reader.advance();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	425 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	426 if (errors.length() > 0)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	427 throw new MCLException(errors.toString());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	428
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	429 if (redirect == null)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	430 return true; // we're happy
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	431
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	432 // process redirect
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	433 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	434 MonetUrlParser.parse(target, redirect);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	435 } catch (URISyntaxException \| ValidationError e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	436 throw new MCLException("While processing redirect " + redirect + ": " + e.getMessage(), e);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	437 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	438 if (redirect.startsWith("mapi:merovingian://proxy")) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	439 // The reader is stuck at LineType.PROMPT but actually the
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	440 // next challenge is already there.
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	441 reader.resetLineType();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	442 reader.advance();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	443 } else {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	444 close();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	445 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	446
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	447 return false; // we need another go
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	448 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	449
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	450 private String challengeResponse(
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	451 Target.Validated validated, final String challengeLine,
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	452 OptionsCallback callback
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	453 ) throws MCLException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	454 // The challengeLine looks like this:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	455 //
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	456 // 45IYyVyRnbgEnK92ad:merovingian:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1:LIT:SHA512:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	457 // WgHIibSyH:mserver:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1:LIT:SHA512:sql=6:BINARY=1:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	458 // 0 1 2 3 4 5 6 7
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	459
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	460 String parts[] = challengeLine.split(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	461 if (parts.length < 3)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	462 throw new MCLException("Invalid challenge: expect at least 3 fields");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	463 String challengePart = parts[0];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	464 String serverTypePart = parts[1];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	465 String versionPart = parts[2];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	466 int version;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	467 if (versionPart.equals("9"))
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	468 version = 9;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	469 else
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	470 throw new MCLException("Protocol versions other than 9 are note supported: " + versionPart);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	471 if (parts.length < 6)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	472 throw new MCLException("Protocol version " + version + " requires at least 6 fields, found " + parts.length + ": " + challengeLine);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	473 String serverHashesPart = parts[3];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	474 // String endianPart = parts[4];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	475 String passwordHashPart = parts[5];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	476 String optionsPart = parts.length > 6 ? parts[6] : null;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	477 // String binaryPart = parts.length > 7 ? parts[7] : null;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	478
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	479 String userResponse;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	480 String password = target.getPassword();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	481 if (serverTypePart.equals("merovingian") && !target.getLanguage().equals("control")) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	482 userResponse = "merovingian";
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	483 password = "merovingian";
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	484 } else {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	485 userResponse = target.getUser();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	486 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	487 String passwordResponse = hashPassword(challengePart, password, passwordHashPart, validated.getHash(), serverHashesPart);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	488
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	489 String optionsResponse = handleOptions(callback, optionsPart);
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	490
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	491 // Response looks like this:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	492 //
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	493 // LIT:monetdb:{RIPEMD160}f2236256e5a9b20a5ecab4396e36c14f66c3e3c5:sql:demo
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	494 // :FILETRANS:auto_commit=1,reply_size=1000,size_header=0,columnar_protocol=0,time_zone=3600:
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	495 StringBuilder response = new StringBuilder(80);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	496 response.append("BIG:");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	497 response.append(userResponse).append(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	498 response.append(passwordResponse).append(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	499 response.append(validated.getLanguage()).append(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	500 response.append(validated.getDatabase()).append(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	501 response.append("FILETRANS:");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	502 response.append(optionsResponse).append(":");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	503
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	504 return response.toString();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	505 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	506
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	507 // challengePart, passwordHashPart, supportedHashesPart, target.getPassword()
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	508 private String hashPassword(String challenge, String password, String passwordAlgo, String configuredHashes, String serverSupportedAlgos) throws MCLException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	509 int maxHashLength = 512;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	510
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	511 StringBuilder output = new StringBuilder(10 + maxHashLength / 4);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	512 MessageDigest passwordDigest = pickBestAlgorithm(Collections.singleton(passwordAlgo), output);
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	513
835 071be9a628e8 Suppress warning about unchecked conversion Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 834 diff changeset	514 Set<String> algoSet = new HashSet<>(Arrays.asList(serverSupportedAlgos.split(",")));
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	515 if (!configuredHashes.isEmpty()) {
835 071be9a628e8 Suppress warning about unchecked conversion Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 834 diff changeset	516 Set<String> keep = new HashSet<>(Arrays.asList(configuredHashes.toUpperCase().split("[, ]")));
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	517 algoSet.retainAll(keep);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	518 if (algoSet.isEmpty()) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	519 throw new MCLException("None of the hash algorithms <" + configuredHashes + "> are supported, server only supports <" + serverSupportedAlgos + ">");
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	520 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	521 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	522 MessageDigest challengeDigest = pickBestAlgorithm(algoSet, null);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	523
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	524 // First we use the password algo to hash the password.
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	525 // Then we use the challenge algo to hash the combination of the resulting hash digits and the challenge.
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	526 StringBuilder intermediate = new StringBuilder(maxHashLength / 4 + challenge.length());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	527 hexhash(intermediate, passwordDigest, password);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	528 intermediate.append(challenge);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	529 hexhash(output, challengeDigest, intermediate.toString());
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	530 return output.toString();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	531 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	532
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	533 private MessageDigest pickBestAlgorithm(Set<String> algos, StringBuilder appendPrefixHere) throws MCLException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	534 for (String[] choice: KNOWN_ALGORITHMS) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	535 String mapiName = choice[0];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	536 String algoName = choice[1];
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	537 MessageDigest digest;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	538 if (!algos.contains(mapiName))
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	539 continue;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	540 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	541 digest = MessageDigest.getInstance(algoName);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	542 } catch (NoSuchAlgorithmException e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	543 continue;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	544 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	545 // we found a match
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	546 if (appendPrefixHere != null) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	547 appendPrefixHere.append('{');
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	548 appendPrefixHere.append(mapiName);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	549 appendPrefixHere.append('}');
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	550 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	551 return digest;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	552 }
834 5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	553 String algoNames = String.join(",", algos);
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	554 throw new MCLException("No supported hash algorithm: " + algoNames);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	555 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	556
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	557 private void hexhash(StringBuilder buffer, MessageDigest digest, String text) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	558 byte[] bytes = text.getBytes(StandardCharsets.UTF_8);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	559 digest.update(bytes);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	560 byte[] output = digest.digest();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	561 for (byte b: output) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	562 int hi = (b & 0xF0) >> 4;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	563 int lo = b & 0x0F;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	564 buffer.append(HEXDIGITS[hi]);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	565 buffer.append(HEXDIGITS[lo]);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	566 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	567 }
75 db46b4ab2b9f Correct the condition for when the log can be closed: only when log instanceof FileWriter Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 53 diff changeset	568
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	569 private String handleOptions(OptionsCallback callback, String optionsPart) throws MCLException {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	570 if (callback == null \|\| optionsPart == null \|\| optionsPart.isEmpty())
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	571 return "";
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	572
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	573 StringBuilder buffer = new StringBuilder();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	574 callback.setBuffer(buffer);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	575 for (String optlevel: optionsPart.split(",")) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	576 int eqindex = optlevel.indexOf('=');
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	577 if (eqindex < 0)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	578 throw new MCLException("Invalid options part in server challenge: " + optionsPart);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	579 String lang = optlevel.substring(0, eqindex);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	580 int level;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	581 try {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	582 level = Integer.parseInt(optlevel.substring(eqindex + 1));
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	583 } catch (NumberFormatException e) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	584 throw new MCLException("Invalid option level in server challenge: " + optlevel);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	585 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	586 callback.addOptions(lang, level);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	587 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	588
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	589 return buffer.toString();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	590 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	591
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	592 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	593 * Returns an InputStream that reads from this open connection on
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	594 * the MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	595 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	596 * @return an input stream that reads from this open connection
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	597 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	598 public InputStream getInputStream() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	599 return fromMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	600 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	601
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	602 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	603 * Returns an output stream for this MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	604 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	605 * @return an output stream for writing bytes to this MapiSocket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	606 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	607 public OutputStream getOutputStream() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	608 return toMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	609 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	610
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	611 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	612 * Returns a Reader for this MapiSocket. The Reader is a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	613 * BufferedMCLReader which does protocol interpretation of the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	614 * BlockInputStream produced by this MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	615 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	616 * @return a BufferedMCLReader connected to this MapiSocket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	617 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	618 public BufferedMCLReader getReader() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	619 return reader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	620 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	621
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	622 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	623 * Returns a Writer for this MapiSocket. The Writer is a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	624 * BufferedMCLWriter which produces protocol compatible data blocks
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	625 * that the BlockOutputStream can properly translate into blocks.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	626 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	627 * @return a BufferedMCLWriter connected to this MapiSocket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	628 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	629 public BufferedMCLWriter getWriter() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	630 return writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	631 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	632
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	633 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	634 * Returns the mapi protocol version used by this socket. The
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	635 * protocol version depends on the server being used. Users of the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	636 * MapiSocket should check this version to act appropriately.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	637 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	638 * @return the mapi protocol version
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	639 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	640 public int getProtocolVersion() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	641 return version;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	642 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	643
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	644 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	645 * Enables logging to a file what is read and written from and to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	646 * the server. Logging can be enabled at any time. However, it is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	647 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	648 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	649 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	650 * @param filename the name of the file to write to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	651 * @throws IOException if the file could not be opened for writing
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	652 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	653 public void debug(final String filename) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	654 debug(new FileWriter(filename));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	655 }
75 db46b4ab2b9f Correct the condition for when the log can be closed: only when log instanceof FileWriter Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 53 diff changeset	656
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	657 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	658 * Enables logging to a stream what is read and written from and to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	659 * the server. Logging can be enabled at any time. However, it is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	660 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	661 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	662 *
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	663 * @param out to write the log to a print stream
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	664 * @throws IOException if the file could not be opened for writing
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	665 */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	666 // disabled as it is not used by JDBC driver code
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	667 // public void debug(PrintStream out) throws IOException {
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	668 // debug(new PrintWriter(out));
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	669 // }
75 db46b4ab2b9f Correct the condition for when the log can be closed: only when log instanceof FileWriter Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 53 diff changeset	670
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	671 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	672 * Enables logging to a stream what is read and written from and to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	673 * the server. Logging can be enabled at any time. However, it is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	674 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	675 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	676 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	677 * @param out to write the log to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	678 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	679 public void debug(final Writer out) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	680 log = out;
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	681 setDebug(true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	682 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	683
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	684 /**
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	685 * Get the log Writer.
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	686 *
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	687 * @return the log writer
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	688 */
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	689 public Writer getLogWriter() {
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	690 return log;
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	691 }
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	692
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	693 /**
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	694 * Writes a logline tagged with a timestamp using the given type and message
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	695 * and optionally flushes afterwards.
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	696 *
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	697 * Used for debugging purposes only and represents a message data that is
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	698 * connected to reading (RD or RX) or writing (TD or TX) to the socket.
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	699 * R=Receive, T=Transmit, D=Data, X=??
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	700 *
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	701 * @param type message type: either RD, RX, TD or TX
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	702 * @param message the message to log
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	703 * @param flush whether we need to flush buffered data to the logfile.
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	704 * @throws IOException if an IO error occurs while writing to the logfile
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	705 */
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	706 private final void log(final String type, final String message, final boolean flush) throws IOException {
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	707 log.write(type + System.currentTimeMillis() + ": " + message + "\n");
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	708 if (flush)
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	709 log.flush();
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	710 }
bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	711
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	712 /**
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	713 * For internal use
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	714 *
06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	715 * @param b to enable/disable insert 'fake' newline and prompt
06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	716 * @return previous setting
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	717 */
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	718 public boolean setInsertFakePrompts(boolean b) {
bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	719 return fromMonet.setInsertFakePrompts(b);
501 eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	720 }
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	721
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	722 public boolean isDebug() {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	723 return target.isDebug();
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	724 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	725
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	726 /**
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	727 * Inner class that is used to write data on a normal stream as a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	728 * blocked stream. A call to the flush() method will write a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	729 * "final" block to the underlying stream. Non-final blocks are
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	730 * written as soon as one or more bytes would not fit in the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	731 * current block any more. This allows to write to a block to it's
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	732 * full size, and then flush it explicitly to have a final block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	733 * being written to the stream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	734 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	735 final class BlockOutputStream extends FilterOutputStream {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	736 private int writePos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	737 private int blocksize = 0;
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	738 private final byte[] block = new byte[BLOCK];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	739
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	740 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	741 * Constructs this BlockOutputStream, backed by the given
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	742 * OutputStream. A BufferedOutputStream is internally used.
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	743 * @param out an OutputStream
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	744 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	745 public BlockOutputStream(final OutputStream out) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	746 // always use a buffered stream, even though we know how
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	747 // much bytes to write/read, since this is just faster for
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	748 // some reason
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	749 super(new BufferedOutputStream(out));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	750 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	751
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	752 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	753 public void flush() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	754 // write the block (as final) then flush.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	755 writeBlock(true);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	756 out.flush();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	757
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	758 // it's a bit nasty if an exception is thrown from the log,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	759 // but ignoring it can be nasty as well, so it is decided to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	760 // let it go so there is feedback about something going wrong
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	761 // it's a bit nasty if an exception is thrown from the log,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	762 // but ignoring it can be nasty as well, so it is decided to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	763 // let it go so there is feedback about something going wrong
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	764 if (isDebug()) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	765 log.flush();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	766 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	767 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	768
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	769 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	770 * writeBlock puts the data in the block on the stream. The
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	771 * boolean last controls whether the block is sent with an
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	772 * indicator to note it is the last block of a sequence or not.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	773 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	774 * @param last whether this is the last block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	775 * @throws IOException if writing to the stream failed
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	776 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	777 public void writeBlock(final boolean last) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	778 if (last) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	779 // always fits, because of BLOCK's size
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	780 blocksize = (short)writePos;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	781 // this is the last block, so encode least
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	782 // significant bit in the first byte (little-endian)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	783 blklen[0] = (byte)(blocksize << 1 & 0xFF \| 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	784 blklen[1] = (byte)(blocksize >> 7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	785 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	786 // always fits, because of BLOCK's size
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	787 blocksize = (short)BLOCK;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	788 // another block will follow, encode least
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	789 // significant bit in the first byte (little-endian)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	790 blklen[0] = (byte)(blocksize << 1 & 0xFF);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	791 blklen[1] = (byte)(blocksize >> 7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	792 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	793
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	794 out.write(blklen);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	795 // write the actual block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	796 out.write(block, 0, writePos);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	797
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	798 if (isDebug()) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	799 if (last) {
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	800 log("TD ", "write final block: " + writePos + " bytes", false);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	801 } else {
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	802 log("TD ", "write block: " + writePos + " bytes", false);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	803 }
555 90c346571eb4 Use StandardCharsets.UTF_8 where possible Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 554 diff changeset	804 log("TX ", new String(block, 0, writePos, StandardCharsets.UTF_8), true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	805 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	806
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	807 writePos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	808 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	809
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	810 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	811 public void write(final int b) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	812 if (writePos == BLOCK) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	813 writeBlock(false);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	814 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	815 block[writePos++] = (byte)b;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	816 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	817
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	818 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	819 public void write(final byte[] b) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	820 write(b, 0, b.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	821 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	822
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	823 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	824 public void write(final byte[] b, int off, int len) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	825 while (len > 0) {
556 87feb93330a6 Misc. changes suggested by analysis tool Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 555 diff changeset	826 int t = BLOCK - writePos;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	827 if (len > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	828 System.arraycopy(b, off, block, writePos, t);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	829 off += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	830 len -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	831 writePos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	832 writeBlock(false);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	833 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	834 System.arraycopy(b, off, block, writePos, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	835 writePos += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	836 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	837 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	838 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	839 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	840
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	841 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	842 public void close() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	843 // we don't want the flush() method to be called (default of
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	844 // the FilterOutputStream), so we close manually here
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	845 out.close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	846 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	847 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	848
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	849
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	850 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	851 * Inner class that is used to make the data on the blocked stream
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	852 * available as a normal stream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	853 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	854 final class BlockInputStream extends FilterInputStream {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	855 private int readPos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	856 private int blockLen = 0;
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	857 private boolean wasEndBlock = false;
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	858 private final byte[] block = new byte[BLOCK + 3]; // \n.\n
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	859 private boolean insertFakePrompts = true;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	860
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	861 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	862 * Constructs this BlockInputStream, backed by the given
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	863 * InputStream. A BufferedInputStream is internally used.
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	864 * @param in an InputStream
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	865 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	866 public BlockInputStream(final InputStream in) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	867 // always use a buffered stream, even though we know how
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	868 // much bytes to write/read, since this is just faster for
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	869 // some reason
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	870 super(new BufferedInputStream(in));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	871 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	872
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	873 public boolean setInsertFakePrompts(boolean doFake) {
bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	874 boolean old = insertFakePrompts;
bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	875 insertFakePrompts = doFake;
501 eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	876 return old;
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	877 }
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	878
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	879 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	880 public int available() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	881 return blockLen - readPos;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	882 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	883
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	884 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	885 public boolean markSupported() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	886 return false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	887 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	888
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	889 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	890 public void mark(final int readlimit) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	891 throw new AssertionError("Not implemented!");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	892 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	893
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	894 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	895 public void reset() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	896 throw new AssertionError("Not implemented!");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	897 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	898
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	899 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	900 * Small wrapper to get a blocking variant of the read() method
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	901 * on the BufferedInputStream. We want to benefit from the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	902 * Buffered pre-fetching, but not dealing with half blocks.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	903 * Changing this class to be able to use the partially received
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	904 * data will greatly complicate matters, while a performance
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	905 * improvement is debatable given the relatively small size of
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	906 * our blocks. Maybe it does speed up on slower links, then
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	907 * consider this method a quick bug fix/workaround.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	908 *
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	909 * @param b a byte array to store read bytes
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	910 * @param len number of bytes to read
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	911 * @return false if reading the block failed due to EOF
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	912 * @throws IOException if an IO error occurs while reading
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	913 */
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	914 private boolean _read(final byte[] b, int len) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	915 int s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	916 int off = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	917 while (len > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	918 s = in.read(b, off, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	919 if (s == -1) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	920 // if we have read something before, we should have been
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	921 // able to read the whole, so make this fatal
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	922 if (off > 0) {
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	923 if (isDebug()) {
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	924 log("RD ", "the following incomplete block was received:", false);
555 90c346571eb4 Use StandardCharsets.UTF_8 where possible Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 554 diff changeset	925 log("RX ", new String(b, 0, off, StandardCharsets.UTF_8), true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	926 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	927 throw new IOException("Read from " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	928 con.getInetAddress().getHostName() + ":" +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	929 con.getPort() + ": Incomplete block read from stream");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	930 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	931 if (isDebug())
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	932 log("RD ", "server closed the connection (EOF)", true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	933 return false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	934 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	935 len -= s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	936 off += s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	937 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	938
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	939 return true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	940 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	941
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	942 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	943 * Reads the next block on the stream into the internal buffer,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	944 * or writes the prompt in the buffer.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	945 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	946 * The blocked stream protocol consists of first a two byte
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	947 * integer indicating the length of the block, then the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	948 * block, followed by another length + block. The end of
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	949 * such sequence is put in the last bit of the length, and
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	950 * hence this length should be shifted to the right to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	951 * obtain the real length value first. We simply fetch
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	952 * blocks here as soon as they are needed for the stream's
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	953 * read methods.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	954 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	955 * The user-flush, which is an implicit effect of the end of
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	956 * a block sequence, is communicated beyond the stream by
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	957 * inserting a prompt sequence on the stream after the last
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	958 * block. This method makes sure that a final block ends with a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	959 * newline, if it doesn't already, in order to facilitate a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	960 * Reader that is possibly chained to this InputStream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	961 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	962 * If the stream is not positioned correctly, hell will break
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	963 * loose.
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	964 *
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	965 * @return blockLen
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	966 * @throws IOException if an IO error occurs while reading
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	967 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	968 private int readBlock() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	969 // read next two bytes (short)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	970 if (!_read(blklen, 2))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	971 return(-1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	972
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	973 // Get the short-value and store its value in blockLen.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	974 blockLen = (short)(
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	975 (blklen[0] & 0xFF) >> 1 \|
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	976 (blklen[1] & 0xFF) << 7
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	977 );
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	978 wasEndBlock = (blklen[0] & 0x1) == 1;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	979
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	980 readPos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	981
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	982 if (isDebug()) {
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	983 if (wasEndBlock) {
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	984 log("RD ", "read final block: " + blockLen + " bytes", false);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	985 } else {
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	986 log("RD ", "read new block: " + blockLen + " bytes", false);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	987 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	988 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	989
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	990 // sanity check to avoid bad servers make us do an ugly
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	991 // stack trace
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	992 if (blockLen > block.length)
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	993 throw new IOException("Server sent a block larger than BLOCKsize: " +
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	994 blockLen + " > " + block.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	995 if (!_read(block, blockLen))
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	996 return -1;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	997
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	998 if (isDebug())
555 90c346571eb4 Use StandardCharsets.UTF_8 where possible Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 554 diff changeset	999 log("RX ", new String(block, 0, blockLen, StandardCharsets.UTF_8), true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1000
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1001 // if this is the last block, make it end with a newline and prompt
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1002 if (wasEndBlock) {
537 242debd7e866 Fix mistake in comment Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 535 diff changeset	1003 // insert 'fake' newline and prompt
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	1004 if (insertFakePrompts) {
507 1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 502 diff changeset	1005 if (blockLen > 0 && block[blockLen - 1] != '\n') {
1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 502 diff changeset	1006 // to terminate the block in a Reader
1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 502 diff changeset	1007 block[blockLen++] = '\n';
1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 502 diff changeset	1008 }
501 eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	1009 for (byte b : LineType.PROMPT.bytes()) {
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	1010 block[blockLen++] = b;
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	1011 }
eaad79c3235f Make the fake prompts at block ends optional Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 498 diff changeset	1012 block[blockLen++] = '\n';
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1013 if (isDebug()) {
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	1014 log("RD ", "inserting prompt", true);
bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	1015 }
498 4cfe4991ee63 Use the prompt characters from mapi_prompt.h Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 497 diff changeset	1016 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1017 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1018
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1019 return blockLen;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1020 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1021
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1022 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1023 public int read() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1024 if (available() == 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1025 if (readBlock() == -1)
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1026 return -1;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1027 }
75 db46b4ab2b9f Correct the condition for when the log can be closed: only when log instanceof FileWriter Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 53 diff changeset	1028
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1029 if (isDebug())
555 90c346571eb4 Use StandardCharsets.UTF_8 where possible Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 554 diff changeset	1030 log("RX ", new String(block, readPos, 1, StandardCharsets.UTF_8), true);
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1031
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1032 return (int)block[readPos++];
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1033 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1034
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1035 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1036 public int read(final byte[] b) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1037 return read(b, 0, b.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1038 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1039
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1040 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1041 public int read(final byte[] b, int off, int len) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1042 int t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1043 int size = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1044 while (size < len) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1045 t = available();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1046 if (t == 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1047 if (size != 0)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1048 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1049 if (readBlock() == -1) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1050 if (size == 0)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1051 size = -1;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1052 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1053 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1054 t = available();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1055 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1056 if (len > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1057 System.arraycopy(block, readPos, b, off, t);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1058 off += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1059 len -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1060 readPos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1061 size += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1062 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1063 System.arraycopy(block, readPos, b, off, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1064 readPos += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1065 size += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1066 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1067 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1068 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1069 return size;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1070 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1071
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1072 @Override
297 bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 281 diff changeset	1073 public long skip(final long n) throws IOException {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1074 long skip = n;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1075 while (skip > 0) {
556 87feb93330a6 Misc. changes suggested by analysis tool Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 555 diff changeset	1076 int t = available();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1077 if (skip > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1078 skip -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1079 readPos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1080 readBlock();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1081 } else {
756 a39d3a45da56 Resolve warning: [lossy-conversions] implicit cast from long to int in compound assignment is possibly lossy Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 750 diff changeset	1082 readPos += (int)skip;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1083 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1084 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1085 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1086 return n;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1087 }
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1088
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1089 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1090 * For internal use
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	1091 * @return new Raw object
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1092 */
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1093 Raw getRaw() {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1094 return new Raw();
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1095 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1096
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1097 /** An alternative I/O interface that exposes the block based nature of the MAPI protocol */
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1098 final class Raw {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1099 byte[] getBytes() {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1100 return block;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1101 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1102
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1103 int getLength() {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1104 return blockLen;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1105 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1106
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1107 int getPosition() {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1108 return readPos;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1109 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1110
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1111 int consume(int delta) {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1112 int pos = readPos;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1113 readPos += delta;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1114 return pos;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1115 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1116
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1117 int readBlock() throws IOException {
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	1118 boolean wasFaking = setInsertFakePrompts(false);
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1119 try {
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1120 return BlockInputStream.this.readBlock();
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1121 } finally {
511 bd860e850fe1 rename insertFakeFlushes to insertFakePrompts Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 509 diff changeset	1122 setInsertFakePrompts(wasFaking);
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1123 }
508 7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1124 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1125
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1126 boolean wasEndBlock() {
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1127 return wasEndBlock;
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1128 }
7730d65dfd55 Add MapiSocket.BlockInputStream.Raw Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 507 diff changeset	1129 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1130 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1131
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1132 /**
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1133 * Closes the streams and socket connected to the server if possible.
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1134 * If an error occurs at closing a resource, it is ignored so as many
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1135 * resources as possible are closed.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1136 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1137 public synchronized void close() {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1138 if (writer != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1139 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1140 writer.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1141 writer = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1142 } catch (IOException e) { /* ignore it */ }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1143 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1144 if (reader != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1145 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1146 reader.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1147 reader = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1148 } catch (IOException e) { /* ignore it */ }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1149 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1150 if (toMonet != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1151 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1152 toMonet.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1153 toMonet = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1154 } catch (IOException e) { /* ignore it */ }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1155 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1156 if (fromMonet != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1157 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1158 fromMonet.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1159 fromMonet = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1160 } catch (IOException e) { /* ignore it */ }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1161 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1162 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1163 try {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1164 con.close(); // close the socket
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1165 con = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1166 } catch (IOException e) { /* ignore it */ }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1167 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1168 if (isDebug() && log != null && log instanceof FileWriter) {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1169 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1170 log.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1171 log = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1172 } catch (IOException e) { /* ignore it */ }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1173 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1174 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1175
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1176 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1177 * Return an UploadStream for use with for example COPY FROM filename ON CLIENT.
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1178 *
552 7b320303b579 Doc comment improvements Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 547 diff changeset	1179 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1180 *
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1181 * @param chunkSize chunk size for the upload stream
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1182 * @return UploadStream new upload stream with the given chunk size
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1183 */
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1184 public UploadStream uploadStream(int chunkSize) {
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1185 return new UploadStream(chunkSize);
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1186 }
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1187
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1188 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1189 * Return an UploadStream for use with for example COPY FROM filename ON CLIENT.
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1190 *
552 7b320303b579 Doc comment improvements Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 547 diff changeset	1191 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1192 *
06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1193 * @return UploadStream new upload stream
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1194 */
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1195 public UploadStream uploadStream() {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1196 return new UploadStream();
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1197 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1198
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1199 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1200 * Return a DownloadStream for use with for example COPY INTO filename ON CLIENT
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1201 *
552 7b320303b579 Doc comment improvements Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 547 diff changeset	1202 * Building block for {@link org.monetdb.jdbc.MonetConnection.DownloadHandler}.
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1203 *
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1204 * @param prependCr convert \n to \r\n
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1205 * @return DownloadStream new download stream
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1206 */
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1207 public DownloadStream downloadStream(boolean prependCr) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1208 return new DownloadStream(fromMonet.getRaw(), toMonet, prependCr);
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1209 }
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1210
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1211
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1212 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1213 * Stream of data sent to the server
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1214 *
095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1215 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1216 *
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1217 * An UploadStream has a chunk size. Every chunk size bytes, the server gets
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1218 * the opportunity to abort the upload.
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1219 */
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1220 public class UploadStream extends FilterOutputStream {
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1221 public final static int DEFAULT_CHUNK_SIZE = 1024 * 1024;
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1222 private final int chunkSize;
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1223 private boolean closed = false;
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1224 private boolean serverCancelled = false;
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1225 private int chunkLeft;
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1226 private byte[] promptBuffer;
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1227 private Runnable cancellationCallback = null;
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1228
709 bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	1229 /**
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	1230 * Create an UploadStream with the given chunk size
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	1231 * @param chunkSize chunk size for the upload stream
bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 700 diff changeset	1232 */
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1233 UploadStream(final int chunkSize) {
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1234 super(toMonet);
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1235 if (chunkSize <= 0) {
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1236 throw new IllegalArgumentException("chunk size must be positive");
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1237 }
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1238 this.chunkSize = chunkSize;
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1239 assert LineType.MORE.bytes().length == LineType.FILETRANSFER.bytes().length;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1240 int promptLen = LineType.MORE.bytes().length;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1241 promptBuffer = new byte[promptLen + 1];
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1242 chunkLeft = this.chunkSize;
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1243 }
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1244
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1245 /** Create an UploadStream with the default chunk size */
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1246 UploadStream() {
72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1247 this(DEFAULT_CHUNK_SIZE);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1248 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1249
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1250 /** Set a callback to be invoked if the server cancels the upload
626 06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1251 *
06d69b82d409 Resolve javadoc error and warnings : Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 616 diff changeset	1252 * @param cancellationCallback callback to call
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1253 */
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1254 public void setCancellationCallback(final Runnable cancellationCallback) {
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1255 this.cancellationCallback = cancellationCallback;
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1256 }
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1257
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1258 @Override
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1259 public void write(final int b) throws IOException {
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1260 if (serverCancelled) {
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1261 // We have already thrown an exception and apparently that has been ignored.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1262 // Probably because they're calling print methods instead of write.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1263 // Throw another one, maybe they'll catch this one.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1264 throw new IOException("Server aborted the upload");
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1265 }
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1266 handleChunking();
612 1d44b8a577ca write to out, not to super when implementing FilterOutputStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	1267 out.write(b);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1268 wrote(1);
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1269 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1270
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1271 @Override
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1272 public void write(final byte[] b) throws IOException {
612 1d44b8a577ca write to out, not to super when implementing FilterOutputStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	1273 this.write(b, 0, b.length);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1274 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1275
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1276 @Override
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1277 public void write(final byte[] b, int off, int len) throws IOException {
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1278 if (serverCancelled) {
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1279 // We have already thrown an exception and apparently that has been ignored.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1280 // Probably because they're calling print methods instead of write.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1281 // Throw another one, maybe they'll catch this one.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1282 throw new IOException("Server aborted the upload");
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1283 }
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1284 while (len > 0) {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1285 handleChunking();
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1286 int toWrite = Integer.min(len, chunkLeft);
612 1d44b8a577ca write to out, not to super when implementing FilterOutputStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 610 diff changeset	1287 out.write(b, off, toWrite);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1288 off += toWrite;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1289 len -= toWrite;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1290 wrote(toWrite);
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1291 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1292 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1293
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1294 @Override
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1295 public void flush() throws IOException {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1296 // suppress flushes
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1297 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1298
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1299 @Override
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1300 public void close() throws IOException {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1301 if (closed) {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1302 return;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1303 }
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1304 closed = true;
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1305
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1306 if (serverCancelled)
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1307 closeAfterServerCancelled();
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1308 else
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1309 closeAfterSuccesfulUpload();
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1310 }
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1311
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1312 private void closeAfterSuccesfulUpload() throws IOException {
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1313 if (chunkLeft != chunkSize) {
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1314 // flush pending data
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1315 flushAndReadPrompt();
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1316 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1317 // send empty block
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1318 out.flush();
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1319 final LineType acknowledgement = readPrompt();
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1320 if (acknowledgement != LineType.FILETRANSFER) {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1321 throw new IOException("Expected server to acknowledge end of file");
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1322 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1323 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1324
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1325 private void closeAfterServerCancelled() {
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1326 // nothing to do here, we have already read the error prompt.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1327 }
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1328
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1329 private void wrote(final int i) {
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1330 chunkLeft -= i;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1331 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1332
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1333 private void handleChunking() throws IOException {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1334 if (chunkLeft > 0) {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1335 return;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1336 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1337 flushAndReadPrompt();
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1338 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1339
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1340 private void flushAndReadPrompt() throws IOException {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1341 out.flush();
521 72007c4f8f8a Allow MonetUploadHandler to configure the chunk size Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 512 diff changeset	1342 chunkLeft = chunkSize;
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1343 final LineType lineType = readPrompt();
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1344 switch (lineType) {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1345 case MORE:
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1346 return;
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1347 case FILETRANSFER:
533 b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1348 // Note, if the caller is calling print methods instead of write, the IO exception gets hidden.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1349 // This is unfortunate but there's nothing we can do about it.
b75464874130 Keep better track of whether the server has cancelled the upload Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 521 diff changeset	1350 serverCancelled = true;
557 ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1351 if (cancellationCallback != null) {
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1352 cancellationCallback.run();
ce2b616ed22e Add a cancellation callback to UploadHandler Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 556 diff changeset	1353 }
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1354 throw new IOException("Server aborted the upload");
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1355 default:
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1356 throw new IOException("Expected MORE/DONE from server, got " + lineType);
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1357 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1358 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1359
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1360 private LineType readPrompt() throws IOException {
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1361 final int nread = fromMonet.read(promptBuffer);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1362 if (nread != promptBuffer.length \|\| promptBuffer[promptBuffer.length - 1] != '\n') {
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1363 throw new IOException("server return incomplete prompt");
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1364 }
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1365 return LineType.classify(promptBuffer);
502 83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1366 }
83354bd21320 Upload fake data when an upload request is received Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 501 diff changeset	1367 }
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1368
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1369
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1370 /**
c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1371 * Stream of data received from the server
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1372 *
095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1373 * Building block for {@link org.monetdb.jdbc.MonetConnection.DownloadHandler}.
535 c9d88af06d35 Javadoc and some minor changes Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 533 diff changeset	1374 */
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1375 public static class DownloadStream extends InputStream {
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1376 private final BlockInputStream.Raw rawIn;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1377 private final OutputStream out;
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1378 private final boolean prependCr;
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1379 private boolean endBlockSeen = false;
547 8029d7368b5a Make sure the download stream isn't closed twice Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1380 private boolean closed = false;
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1381 private boolean newlinePending = false; // used for crlf conversion
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1382
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1383 DownloadStream(BlockInputStream.Raw rawIn, OutputStream out, boolean prependCr) {
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1384 this.rawIn = rawIn;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1385 this.out = out;
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1386 this.prependCr = prependCr;
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1387 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1388
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1389 void nextBlock() throws IOException {
547 8029d7368b5a Make sure the download stream isn't closed twice Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1390 if (endBlockSeen \|\| closed)
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1391 return;
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1392 final int ret = rawIn.readBlock();
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1393 if (ret < 0 \|\| rawIn.wasEndBlock()) {
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1394 endBlockSeen = true;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1395 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1396 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1397
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1398 @Override
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1399 public void close() throws IOException {
547 8029d7368b5a Make sure the download stream isn't closed twice Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1400 if (closed)
8029d7368b5a Make sure the download stream isn't closed twice Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1401 return;
8029d7368b5a Make sure the download stream isn't closed twice Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 541 diff changeset	1402 closed = true;
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1403 while (!endBlockSeen) {
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1404 nextBlock();
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1405 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1406 // Send acknowledgement to server
512 a4000e374a43 Fix silly mistake Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 511 diff changeset	1407 out.write('\n');
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1408 out.flush();
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1409 // Do whatever super has to do
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1410 super.close();
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1411 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1412
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1413 @Override
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1414 public int read() throws IOException {
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1415 final byte[] buf = { 0 };
095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1416 final int nread = read(buf, 0, 1);
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1417 if (nread == 1)
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1418 return buf[0];
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1419 else
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1420 return -1;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1421 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1422
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1423 @Override
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1424 public int read(final byte[] dest, int off, int len) throws IOException {
576 095e896f9d7a Updated comments. Improved code. Added final keywords Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 573 diff changeset	1425 final int origOff = off;
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1426 int end = off + len;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1427
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1428 while (off < end) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1429 // minimum of what's requested and what we have in stock
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1430 int chunk = Integer.min(end - off, rawIn.getLength() - rawIn.getPosition());
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1431 assert chunk >= 0;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1432 if (chunk == 0) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1433 // make progress by fetching more data
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1434 if (endBlockSeen)
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1435 break;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1436 nextBlock();
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1437 continue;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1438 }
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1439 // make progress copying some bytes
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1440 if (!prependCr) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1441 // no conversion needed, use arraycopy
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1442 System.arraycopy(rawIn.getBytes(), rawIn.getPosition(), dest, off, chunk);
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1443 off += chunk;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1444 rawIn.consume(chunk);
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1445 } else {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1446 int chunkEnd = off + chunk;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1447 if (newlinePending && off < chunkEnd) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1448 // we were in the middle of a line ending conversion
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1449 dest[off++] = '\n';
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1450 newlinePending = false;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1451 }
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1452 while (off < chunkEnd) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1453 byte b = rawIn.getBytes()[rawIn.consume(1)];
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1454 if (b != '\n') {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1455 dest[off++] = b;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1456 } else if (chunkEnd - off >= 2) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1457 dest[off++] = '\r';
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1458 dest[off++] = '\n';
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1459 } else {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1460 dest[off++] = '\r';
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1461 newlinePending = true;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1462 break;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1463 }
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1464 }
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1465 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1466 }
616 65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1467
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1468 if (off < end && newlinePending) {
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1469 dest[off++] = '\n';
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1470 newlinePending = false;
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1471 }
65641a7cea31 Implement line ending conversion for downloads Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 612 diff changeset	1472
509 455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1473 if (off == origOff && endBlockSeen)
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1474 return -1;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1475 else
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1476 return off - origOff;
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1477 }
455497783026 Add MapiSocket.DownloadStream Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 508 diff changeset	1478 }
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1479
834 5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1480 /**
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1481 * Callback used during the initial MAPI handshake.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1482 *
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1483 * Newer MonetDB versions allow setting some options during the handshake.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1484 * The options are language-specific and each has a 'level'. The server
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1485 * advertises up to which level options are supported for a given language
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1486 * and for each language/option combination, {@link addOptions} will be invoked.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1487 * It should call {@link contribute} for each option it wants to set.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1488 *
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1489 * At the time of writing, only the 'sql' language supports options,
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1490 * they are listed in enum mapi_handshake_options_levels in mapi.h.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1491 */
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1492 public static abstract class OptionsCallback {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1493 private StringBuilder buffer;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1494
834 5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1495 /**
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1496 * Callback called for each language/level combination supported by the
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1497 * server. May call {@link contribute} for options with a level STRICTLY
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1498 * LOWER than the level passed as a parameter.
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1499 * @param lang language advertised by the server
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1500 * @param level one higher than the maximum supported option
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1501 */
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1502 public abstract void addOptions(String lang, int level);
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1503
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1504 /**
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1505 * Pass option=value during the handshake
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1506 * @param field
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1507 * @param value
5aa19bbed0d6 Comments and formatting Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 811 diff changeset	1508 */
793 5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1509 protected void contribute(String field, int value) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1510 if (buffer.length() > 0)
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1511 buffer.append(',');
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1512 buffer.append(field);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1513 buffer.append('=');
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1514 buffer.append(value);
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1515 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1516
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1517
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1518 void setBuffer(StringBuilder buf) {
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1519 buffer = buf;
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1520 }
5bfe3357fb1c Use the new url parser Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> parents: 768 diff changeset	1521 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1522 }

Mercurial > hg > monetdb-java

annotate src/main/java/org/monetdb/mcl/net/MapiSocket.java @ 836:aad275e042b2 monetdbs