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

annotate src/main/java/org/monetdb/mcl/net/MapiSocket.java @ 391:f523727db392

Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.* This naming complies to the Java Package Naming convention as MonetDB's main website is www.monetdb.org.

author	Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date	Thu, 12 Nov 2020 22:02:01 +0100 (2020-11-12)
parents	src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java@af6db116238d
children	bf9f6b6ecf40

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 *
350 54137aeb1f92 Update Copyright year. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 301 diff changeset	6 * Copyright 1997 - July 2008 CWI, August 2008 - 2020 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.UnsupportedEncodingException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	20 import java.io.Writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	21 import java.net.Socket;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	22 import java.net.SocketException;
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	23 import java.net.UnknownHostException;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	24 import java.net.URI;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	25 import java.security.MessageDigest;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	26 import java.security.NoSuchAlgorithmException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	27 import java.util.ArrayList;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	28 import java.util.HashSet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	29 import java.util.List;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	30
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	31 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	32 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	33 import org.monetdb.mcl.io.BufferedMCLWriter;
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	34 import org.monetdb.mcl.parser.MCLParseException;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	35
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	36 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	37 * 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	38 * mode.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	39 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	40 * 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	41 * 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	42 * 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	43 * 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	44 * 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	45 * 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	46 * 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	47 * 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	48 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	49 * 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	50 * 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	51 * 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	52 * 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	53 * line read.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	54 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	55 * 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	56 * 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	57 * to a file on disk.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	58 * 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	59 * 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	60 * 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	61 * 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	62 * 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	63 * 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	64 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	65 * 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	66 * 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	67 * normal Socket, allowing for seamless plugging.
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 * Socket \ / InputStream ----> (BufferedMCL)Reader
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	70 * > o <
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	71 * MapiSocket / \ OutputStream ----> (BufferedMCL)Writer
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	72 * </pre>
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	73 * 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	74 * 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	75 * 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	76 * 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	77 * interface is most sufficient. In particular the BufferedMCL*
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	78 * implementations of those interfaces supply some extra functionality
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	79 * geared towards the format of the data.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	80 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	81 * @author Fabian Groffen
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	82 * @version 4.1
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	83 * @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	84 * @see org.monetdb.mcl.io.BufferedMCLWriter
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	85 */
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	86 public class MapiSocket { /* cannot (yet) be final as nl.cwi.monetdb.mcl.net.MapiSocket extends this class */
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	87 /** The TCP Socket to mserver */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	88 private Socket con;
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	89 /** The TCP Socket timeout in milliseconds. Default is 0 meaning the timeout is disabled (i.e., timeout of infinity) */
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	90 private int soTimeout = 0;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	91 /** Stream from the Socket for reading */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	92 private InputStream fromMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	93 /** Stream from the Socket for writing */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	94 private OutputStream toMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	95 /** MCLReader on the InputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	96 private BufferedMCLReader reader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	97 /** MCLWriter on the OutputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	98 private BufferedMCLWriter writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	99 /** protocol version of the connection */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	100 private int version;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	101
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	102 /** The database to connect to */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	103 private String database = null;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	104 /** The language to connect with */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	105 private String language = "sql";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	106 /** The hash methods to use (null = default) */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	107 private String hash = null;
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	108
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	109 /** Whether we should follow redirects */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	110 private boolean followRedirects = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	111 /** 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	112 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	113
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	114 /** Whether we are debugging or not */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	115 private boolean debug = false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	116 /** The Writer for the debug log-file */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	117 private Writer log;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	118
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	119 /** The blocksize (hardcoded in compliance with MonetDB common/stream/stream.h) */
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	120 public final static int BLOCK = 8 * 1024 - 2;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	121
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	122 /** 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	123 private final byte[] blklen = new byte[2];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	124
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	125 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	126 * Constructs a new MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	127 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	128 public MapiSocket() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	129 con = null;
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
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	132 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	133 * 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	134 * 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	135 * is also the default.
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 * @param db the database
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	138 */
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	139 public void setDatabase(final String db) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	140 this.database = db;
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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	144 * Sets the language to use for this connection.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	145 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	146 * @param lang the language
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	147 */
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	148 public void setLanguage(final String lang) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	149 this.language = lang;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	150 }
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 * 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	154 * 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	155 * 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	156 * separating the hashes by commas.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	157 * 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	158 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	159 * @param hash the hash method to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	160 */
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	161 public void setHash(final String hash) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	162 this.hash = hash;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	163 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	164
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	165 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	166 * 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	167 * 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	168 * encountered during connect. The default bahaviour is to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	169 * automatically follow redirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	170 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	171 * @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	172 */
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	173 public void setFollowRedirects(final boolean r) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	174 this.followRedirects = r;
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
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	177 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	178 * 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	179 * 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	180 * 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	181 * 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	182 * disable the following of redirects you should use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	183 * setFollowRedirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	184 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	185 * @see #setFollowRedirects(boolean r)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	186 * @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	187 */
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	188 public void setTTL(final int t) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	189 this.ttl = t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	190 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	191
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	192 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	193 * 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	194 * 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	195 * useful to break out of this indefinite wait.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	196 * 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	197 * operation to have effect.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	198 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	199 * @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	200 * 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	201 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	202 */
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	203 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	204 if (s < 0) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	205 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	206 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	207 this.soTimeout = s;
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	208 // 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	209 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	210 con.setSoTimeout(s);
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	211 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	212 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	213
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	214 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	215 * Gets the SO_TIMEOUT from the underlying Socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	216 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	217 * @return the currently in use timeout in milliseconds
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	218 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	219 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	220 public int getSoTimeout() throws SocketException {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	221 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	222 this.soTimeout = con.getSoTimeout();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	223 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	224 return this.soTimeout;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	225 }
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	226
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	227 /**
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	228 * 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	229 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	230 * @param debug Value to set
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	231 */
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	232 public void setDebug(final boolean debug) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	233 this.debug = debug;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	234 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	235
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 * 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	238 * user. If followRedirect is false, a RedirectionException is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	239 * thrown when a redirect is encountered.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	240 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	241 * @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	242 * @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	243 * @param user the username
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	244 * @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	245 * @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	246 * 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	247 * @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	248 * @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	249 * @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	250 * @throws MCLParseException if bogus data is received
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	251 * @throws MCLException if an MCL related error occurs
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	252 */
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	253 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	254 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	255 {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	256 // Wrap around the internal connect that needs to know if it
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	257 // should really make a TCP connection or not.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	258 return connect(host, port, user, pass, true);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	259 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	260
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	261 private List<String> connect(final String host, final int port, final String user, final String pass, final boolean makeConnection)
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	262 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	263 {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	264 if (ttl-- <= 0)
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	265 throw new MCLException("Maximum number of redirects reached, aborting connection attempt.");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	266
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	267 if (makeConnection) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	268 con = new Socket(host, port);
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	269 con.setSoTimeout(this.soTimeout);
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	270 // set nodelay, as it greatly speeds up small messages (like we often do)
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	271 con.setTcpNoDelay(true);
276 fab4e6165be9 use so_keepalive (like the server does) Niels Nes <niels@cwi.nl> parents: 261 diff changeset	272 con.setKeepAlive(true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	273
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	274 fromMonet = new BlockInputStream(con.getInputStream());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	275 toMonet = new BlockOutputStream(con.getOutputStream());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	276 try {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	277 reader = new BufferedMCLReader(fromMonet, "UTF-8");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	278 writer = new BufferedMCLWriter(toMonet, "UTF-8");
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	279 writer.registerReader(reader);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	280 } catch (UnsupportedEncodingException e) {
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	281 throw new MCLException(e.toString());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	282 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	283 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	284
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	285 final String c = reader.readLine();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	286 reader.waitForPrompt();
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	287 writer.writeLine(getChallengeResponse(c, user, pass, language, database, hash));
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	288
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	289 // read monetdb mserver response till prompt
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	290 final ArrayList<String> redirects = new ArrayList<String>();
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	291 final List<String> warns = new ArrayList<String>();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	292 String err = "", tmp;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	293 int lineType;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	294 do {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	295 tmp = reader.readLine();
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	296 if (tmp == null)
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	297 throw new IOException("Read from " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	298 con.getInetAddress().getHostName() + ":" +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	299 con.getPort() + ": End of stream reached");
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	300 lineType = reader.getLineType();
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	301 if (lineType == BufferedMCLReader.ERROR) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	302 err += "\n" + tmp.substring(7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	303 } else if (lineType == BufferedMCLReader.INFO) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	304 warns.add(tmp.substring(1));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	305 } else if (lineType == BufferedMCLReader.REDIRECT) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	306 redirects.add(tmp.substring(1));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	307 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	308 } while (lineType != BufferedMCLReader.PROMPT);
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	309
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	310 if (err.length() > 0) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	311 close();
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	312 throw new MCLException(err);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	313 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	314
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	315 if (!redirects.isEmpty()) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	316 if (followRedirects) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	317 // Ok, server wants us to go somewhere else. The list
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	318 // might have multiple clues on where to go. For now we
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	319 // don't support anything intelligent but trying the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	320 // first one. URI should be in form of:
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	321 // "mapi:monetdb://host:port/database?arg=value&..."
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	322 // or
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	323 // "mapi:merovingian://proxy?arg=value&..."
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	324 // note that the extra arguments must be obeyed in both
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	325 // cases
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	326 final String suri = redirects.get(0).toString();
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	327 if (!suri.startsWith("mapi:"))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	328 throw new MCLException("unsupported redirect: " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	329
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	330 final URI u;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	331 try {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	332 u = new URI(suri.substring(5));
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	333 } catch (java.net.URISyntaxException e) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	334 throw new MCLParseException(e.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	335 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	336
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	337 tmp = u.getQuery();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	338 if (tmp != null) {
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	339 final String args[] = tmp.split("&");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	340 for (int i = 0; i < args.length; i++) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	341 int pos = args[i].indexOf("=");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	342 if (pos > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	343 tmp = args[i].substring(0, pos);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	344 if (tmp.equals("database")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	345 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	346 if (!tmp.equals(database)) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	347 warns.add("redirect points to different database: " + tmp);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	348 setDatabase(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	349 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	350 } else if (tmp.equals("language")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	351 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	352 warns.add("redirect specifies use of different language: " + tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	353 setLanguage(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	354 } else if (tmp.equals("user")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	355 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	356 if (!tmp.equals(user))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	357 warns.add("ignoring different username '" + tmp + "' set by " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	358 "redirect, what are the security implications?");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	359 } else if (tmp.equals("password")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	360 warns.add("ignoring different password set by redirect, " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	361 "what are the security implications?");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	362 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	363 warns.add("ignoring unknown argument '" + tmp + "' from redirect");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	364 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	365 } else {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	366 warns.add("ignoring illegal argument from redirect: " + args[i]);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	367 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	368 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	369 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	370
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	371 if (u.getScheme().equals("monetdb")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	372 // this is a redirect to another (monetdb) server,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	373 // which means a full reconnect
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	374 // avoid the debug log being closed
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	375 if (debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	376 debug = false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	377 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	378 debug = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	379 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	380 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	381 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	382 tmp = u.getPath();
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	383 if (tmp != null && tmp.length() > 0) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	384 tmp = tmp.substring(1).trim();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	385 if (!tmp.isEmpty() && !tmp.equals(database)) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	386 warns.add("redirect points to different database: " + tmp);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	387 setDatabase(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	388 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	389 }
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	390 final int p = u.getPort();
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	391 warns.addAll(connect(u.getHost(), p == -1 ? port : p, user, pass, true));
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	392 warns.add("Redirect by " + host + ":" + port + " to " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	393 } else if (u.getScheme().equals("merovingian")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	394 // reuse this connection to inline connect to the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	395 // right database that Merovingian proxies for us
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	396 warns.addAll(connect(host, port, user, pass, false));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	397 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	398 throw new MCLException("unsupported scheme in redirect: " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	399 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	400 } 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	401 final StringBuilder msg = new StringBuilder("The server sent a redirect for this connection:");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	402 for (String it : redirects) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	403 msg.append(" [" + it + "]");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	404 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	405 throw new MCLException(msg.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	406 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	407 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	408 return warns;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	409 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	410
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	411 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	412 * A little helper function that processes a challenge string, and
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	413 * returns a response string for the server. If the challenge
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	414 * string is null, a challengeless response is returned.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	415 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	416 * @param chalstr the challenge string
363 34ce6e1b1be8 Remove support for deprecated MD5 encryption algorithm in MapiSocket. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 350 diff changeset	417 * for example: H8sRMhtevGd:mserver:9:PROT10,RIPEMD160,SHA256,SHA1,COMPRESSION_SNAPPY,COMPRESSION_LZ4:LIT:SHA512:
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	418 * @param username the username to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	419 * @param password the password to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	420 * @param language the language to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	421 * @param database the database to connect to
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	422 * @param hash the hash method(s) to use, or NULL for all supported hashes
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	423 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	424 private String getChallengeResponse(
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	425 final String chalstr,
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	426 String username,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	427 String password,
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	428 final String language,
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	429 final String database,
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	430 final String hash
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	431 ) throws MCLParseException, MCLException, IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	432 // parse the challenge string, split it on ':'
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	433 final String[] chaltok = chalstr.split(":");
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	434 if (chaltok.length <= 5)
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	435 throw new MCLParseException("Server challenge string unusable! It contains too few (" + chaltok.length + ") tokens: " + chalstr);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	436
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	437 try {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	438 version = Integer.parseInt(chaltok[2]); // protocol version
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	439 } catch (NumberFormatException e) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	440 throw new MCLParseException("Protocol version (" + chaltok[2] + ") unparseable as integer.");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	441 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	442
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	443 // handle the challenge according to the version it is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	444 switch (version) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	445 case 9:
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	446 // proto 9 is like 8, but uses a hash instead of the plain password
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	447 // the server tells us (in 6th token) which hash in the
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	448 // challenge after the byte-order token
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	449
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	450 String algo;
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	451 String pwhash = chaltok[5];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	452 /* NOTE: Java doesn't support RIPEMD160 :( */
368 af6db116238d Add javadoc url where the supported hash algorithms are described. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 363 diff changeset	453 /* see: https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	454 if (pwhash.equals("SHA512")) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	455 algo = "SHA-512";
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	456 } else if (pwhash.equals("SHA384")) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	457 algo = "SHA-384";
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	458 } else if (pwhash.equals("SHA256")) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	459 algo = "SHA-256";
363 34ce6e1b1be8 Remove support for deprecated MD5 encryption algorithm in MapiSocket. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 350 diff changeset	460 /* NOTE: Java 7 doesn't support SHA-224. Java 8 does but we have not tested it. It is also not requested yet. */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	461 } else if (pwhash.equals("SHA1")) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	462 algo = "SHA-1";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	463 } else {
363 34ce6e1b1be8 Remove support for deprecated MD5 encryption algorithm in MapiSocket. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 350 diff changeset	464 /* Note: MD5 has been deprecated by security experts and support is removed from Oct 2020 release */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	465 throw new MCLException("Unsupported password hash: " + pwhash);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	466 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	467 try {
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	468 final MessageDigest md = MessageDigest.getInstance(algo);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	469 md.update(password.getBytes("UTF-8"));
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	470 password = toHex(md.digest());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	471 } catch (NoSuchAlgorithmException e) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	472 throw new MCLException("This JVM does not support password hash: " + pwhash + "\n" + e.toString());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	473 } catch (UnsupportedEncodingException e) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	474 throw new MCLException("This JVM does not support UTF-8 encoding\n" + e.toString());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	475 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	476
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	477 // proto 7 (finally) used the challenge and works with a
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	478 // password hash. The supported implementations come
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	479 // from the server challenge. We chose the best hash
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	480 // we can find, in the order SHA512, SHA1, MD5, plain.
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	481 // Also the byte-order is reported in the challenge string,
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	482 // which makes sense, since only blockmode is supported.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	483 // proto 8 made this obsolete, but retained the
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	484 // byte-order report for future "binary" transports.
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	485 // In proto 8, the byte-order of the blocks is always little
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	486 // endian because most machines today are.
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	487 final String hashes = (hash == null \|\| hash.isEmpty()) ? chaltok[3] : hash;
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	488 final HashSet<String> hashesSet = new HashSet<String>(java.util.Arrays.asList(hashes.toUpperCase().split("[, ]"))); // split on comma or space
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	489
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	490 // if we deal with merovingian, mask our credentials
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	491 if (chaltok[1].equals("merovingian") && !language.equals("control")) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	492 username = "merovingian";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	493 password = "merovingian";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	494 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	495
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	496 // reuse variables algo and pwhash
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	497 algo = null;
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	498 pwhash = null;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	499 if (hashesSet.contains("SHA512")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	500 algo = "SHA-512";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	501 pwhash = "{SHA512}";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	502 } else if (hashesSet.contains("SHA384")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	503 algo = "SHA-384";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	504 pwhash = "{SHA384}";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	505 } else if (hashesSet.contains("SHA256")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	506 algo = "SHA-256";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	507 pwhash = "{SHA256}";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	508 } else if (hashesSet.contains("SHA1")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	509 algo = "SHA-1";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	510 pwhash = "{SHA1}";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	511 } else {
363 34ce6e1b1be8 Remove support for deprecated MD5 encryption algorithm in MapiSocket. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 350 diff changeset	512 /* Note: MD5 has been deprecated by security experts and support is removed from Oct 2020 release */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	513 throw new MCLException("no supported hash algorithms found in " + hashes);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	514 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	515 try {
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	516 final MessageDigest md = MessageDigest.getInstance(algo);
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	517 md.update(password.getBytes("UTF-8"));
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	518 md.update(chaltok[0].getBytes("UTF-8")); // salt/key
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	519 pwhash += toHex(md.digest());
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	520 } catch (NoSuchAlgorithmException e) {
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	521 throw new MCLException("This JVM does not support password hash: " + pwhash + "\n" + e.toString());
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	522 } catch (UnsupportedEncodingException e) {
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	523 throw new MCLException("This JVM does not support UTF-8 encoding\n" + e.toString());
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	524 }
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	525
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	526 // TODO: some day when we need this, we should store this
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	527 if (chaltok[4].equals("BIG")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	528 // byte-order of server is big-endian
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	529 } else if (chaltok[4].equals("LIT")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	530 // byte-order of server is little-endian
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	531 } else {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	532 throw new MCLParseException("Invalid byte-order: " + chaltok[4]);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	533 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	534
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	535 // compose and return response
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	536 return "BIG:" // JVM byte-order is big-endian
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	537 + username + ":"
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	538 + pwhash + ":"
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	539 + language + ":"
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	540 + (database == null ? "" : database) + ":";
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	541 default:
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	542 throw new MCLException("Unsupported protocol version: " + version);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	543 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	544 }
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	545
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	546 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	547 * Small helper method to convert a byte string to a hexadecimal
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	548 * string representation.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	549 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	550 * @param digest the byte array to convert
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	551 * @return the byte array as hexadecimal string
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	552 */
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	553 private final static String toHex(final byte[] digest) {
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	554 final char[] result = new char[digest.length * 2];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	555 int pos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	556 for (int i = 0; i < digest.length; i++) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	557 result[pos++] = hexChar((digest[i] & 0xf0) >> 4);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	558 result[pos++] = hexChar(digest[i] & 0x0f);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	559 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	560 return new String(result);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	561 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	562
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	563 private final static char hexChar(final int n) {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	564 return (n > 9)
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	565 ? (char) ('a' + (n - 10))
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	566 : (char) ('0' + n);
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	567 }
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	568
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	569
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	570 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	571 * 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	572 * the MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	573 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	574 * @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	575 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	576 public InputStream getInputStream() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	577 return fromMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	578 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	579
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	580 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	581 * Returns an output stream for this MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	582 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	583 * @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	584 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	585 public OutputStream getOutputStream() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	586 return toMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	587 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	588
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	589 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	590 * 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	591 * BufferedMCLReader which does protocol interpretation of the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	592 * BlockInputStream produced by this MapiSocket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	593 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	594 * @return a BufferedMCLReader connected to this 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 public BufferedMCLReader getReader() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	597 return reader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	598 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	599
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 * 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	602 * BufferedMCLWriter which produces protocol compatible data blocks
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	603 * that the BlockOutputStream can properly translate into blocks.
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 a BufferedMCLWriter connected 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 BufferedMCLWriter getWriter() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	608 return writer;
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 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	613 * 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	614 * MapiSocket should check this version to act appropriately.
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 the mapi protocol version
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 int getProtocolVersion() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	619 return version;
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 * 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	624 * 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	625 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	626 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	627 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	628 * @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	629 * @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	630 */
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	631 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	632 debug(new FileWriter(filename));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	633 }
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	634
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	635 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	636 * 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	637 * 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	638 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	639 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	640 *
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	641 * @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	642 * @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	643 */
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	644 // 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	645 // 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	646 // 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	647 // }
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	648
0 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 * 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	651 * 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	652 * encouraged to start debugging before actually connecting the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	653 * socket.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	654 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	655 * @param out to write the log to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	656 */
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	657 public void debug(final Writer out) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	658 log = out;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	659 debug = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	660 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	661
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 * 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	664 *
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	665 * @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	666 */
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	667 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	668 return log;
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	669 }
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	670
b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	671 /**
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	672 * 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	673 * 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	674 *
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	675 * 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	676 * 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	677 * 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	678 *
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 * @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	680 * @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	681 * @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	682 * @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	683 */
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	684 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	685 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	686 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	687 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	688 }
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	689
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	690 /**
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	691 * 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	692 * 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	693 * "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	694 * 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	695 * 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	696 * 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	697 * being written to the stream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	698 */
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	699 final class BlockOutputStream extends FilterOutputStream {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	700 private int writePos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	701 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	702 private final byte[] block = new byte[BLOCK];
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	703
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	704 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	705 * Constructs this BlockOutputStream, backed by the given
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	706 * OutputStream. A BufferedOutputStream is internally used.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	707 */
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	708 public BlockOutputStream(final OutputStream out) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	709 // 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	710 // 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	711 // some reason
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	712 super(new BufferedOutputStream(out));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	713 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	714
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	715 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	716 public void flush() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	717 // write the block (as final) then flush.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	718 writeBlock(true);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	719 out.flush();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	720
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	721 // 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	722 // 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	723 // 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	724 // 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	725 // 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	726 // 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	727 if (debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	728 log.flush();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	729 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	730 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	731
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	732 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	733 * 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	734 * 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	735 * 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	736 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	737 * @param last whether this is the last block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	738 * @throws IOException if writing to the stream failed
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	739 */
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	740 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	741 if (last) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	742 // always fits, because of BLOCK's size
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	743 blocksize = (short)writePos;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	744 // this is the last block, so encode least
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	745 // significant bit in the first byte (little-endian)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	746 blklen[0] = (byte)(blocksize << 1 & 0xFF \| 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	747 blklen[1] = (byte)(blocksize >> 7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	748 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	749 // always fits, because of BLOCK's size
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	750 blocksize = (short)BLOCK;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	751 // another block will follow, encode least
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	752 // significant bit in the first byte (little-endian)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	753 blklen[0] = (byte)(blocksize << 1 & 0xFF);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	754 blklen[1] = (byte)(blocksize >> 7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	755 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	756
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	757 out.write(blklen);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	758 // write the actual block
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	759 out.write(block, 0, writePos);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	760
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	761 if (debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	762 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	763 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	764 } 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	765 log("TD ", "write block: " + writePos + " bytes", false);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	766 }
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	767 log("TX ", new String(block, 0, writePos, "UTF-8"), true);
0 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 writePos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	771 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	772
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	773 @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	774 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	775 if (writePos == BLOCK) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	776 writeBlock(false);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	777 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	778 block[writePos++] = (byte)b;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	779 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	780
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	781 @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	782 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	783 write(b, 0, b.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	784 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	785
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	786 @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	787 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	788 int t = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	789 while (len > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	790 t = BLOCK - writePos;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	791 if (len > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	792 System.arraycopy(b, off, block, writePos, t);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	793 off += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	794 len -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	795 writePos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	796 writeBlock(false);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	797 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	798 System.arraycopy(b, off, block, writePos, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	799 writePos += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	800 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	801 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	802 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	803 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	804
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	805 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	806 public void close() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	807 // 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	808 // the FilterOutputStream), so we close manually here
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	809 out.close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	810 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	811 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	812
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	813
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 * 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	816 * available as a normal stream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	817 */
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	818 final class BlockInputStream extends FilterInputStream {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	819 private int readPos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	820 private int blockLen = 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	821 private final byte[] block = new byte[BLOCK + 3]; // \n.\n
0 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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	824 * Constructs this BlockInputStream, backed by the given
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	825 * InputStream. A BufferedInputStream is internally used.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	826 */
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	827 public BlockInputStream(final InputStream in) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	828 // 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	829 // 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	830 // some reason
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	831 super(new BufferedInputStream(in));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	832 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	833
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	834 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	835 public int available() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	836 return blockLen - readPos;
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 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	840 public boolean markSupported() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	841 return false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	842 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	843
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	844 @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	845 public void mark(final int readlimit) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	846 throw new AssertionError("Not implemented!");
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 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	850 public void reset() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	851 throw new AssertionError("Not implemented!");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	852 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	853
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	854 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	855 * 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	856 * 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	857 * 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	858 * 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	859 * data will greatly complicate matters, while a performance
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	860 * 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	861 * 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	862 * consider this method a quick bug fix/workaround.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	863 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	864 * @return false if reading the block failed due to EOF
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 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	867 int s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	868 int off = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	869 while (len > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	870 s = in.read(b, off, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	871 if (s == -1) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	872 // 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	873 // 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	874 if (off > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	875 if (debug) {
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	876 log("RD ", "the following incomplete block was received:", false);
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	877 log("RX ", new String(b, 0, off, "UTF-8"), true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	878 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	879 throw new IOException("Read from " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	880 con.getInetAddress().getHostName() + ":" +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	881 con.getPort() + ": Incomplete block read from stream");
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 if (debug)
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	884 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	885 return false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	886 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	887 len -= s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	888 off += s;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	889 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	890
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	891 return true;
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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	895 * 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	896 * or writes the prompt in the buffer.
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 * 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	899 * 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	900 * 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	901 * 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	902 * 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	903 * 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	904 * 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	905 * read methods.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	906 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	907 * 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	908 * 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	909 * 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	910 * 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	911 * 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	912 * Reader that is possibly chained to this InputStream.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	913 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	914 * 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	915 * loose.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	916 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	917 private int readBlock() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	918 // read next two bytes (short)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	919 if (!_read(blklen, 2))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	920 return(-1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	921
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	922 // 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	923 blockLen = (short)(
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	924 (blklen[0] & 0xFF) >> 1 \|
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	925 (blklen[1] & 0xFF) << 7
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 readPos = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	928
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	929 if (debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	930 if ((blklen[0] & 0x1) == 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	931 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	932 } 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	933 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	934 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	935 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	936
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	937 // 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	938 // stack trace
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	939 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	940 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	941 blockLen + " > " + block.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	942 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	943 return -1;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	944
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	945 if (debug)
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	946 log("RX ", new String(block, 0, blockLen, "UTF-8"), true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	947
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	948 // if this is the last block, make it end with a newline and prompt
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	949 if ((blklen[0] & 0x1) == 1) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	950 if (blockLen > 0 && block[blockLen - 1] != '\n') {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	951 // to terminate the block in a Reader
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	952 block[blockLen++] = '\n';
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	953 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	954 // insert 'fake' flush
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	955 block[blockLen++] = BufferedMCLReader.PROMPT;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	956 block[blockLen++] = '\n';
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	957 if (debug)
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	958 log("RD ", "inserting prompt", true);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	959 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	960
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	961 return blockLen;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	962 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	963
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	964 @Override
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	965 public int read() throws IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	966 if (available() == 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	967 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	968 return -1;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	969 }
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	970
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	971 if (debug)
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	972 log("RX ", new String(block, readPos, 1, "UTF-8"), true);
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	973
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	974 return (int)block[readPos++];
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	975 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	976
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	977 @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	978 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	979 return read(b, 0, b.length);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	980 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	981
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	982 @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	983 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	984 int t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	985 int size = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	986 while (size < len) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	987 t = available();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	988 if (t == 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	989 if (size != 0)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	990 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	991 if (readBlock() == -1) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	992 if (size == 0)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	993 size = -1;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	994 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	995 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	996 t = available();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	997 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	998 if (len > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	999 System.arraycopy(block, readPos, b, off, t);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1000 off += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1001 len -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1002 readPos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1003 size += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1004 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1005 System.arraycopy(block, readPos, b, off, len);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1006 readPos += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1007 size += len;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1008 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1009 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1010 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1011 return size;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1012 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1013
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1014 @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	1015 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	1016 long skip = n;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1017 int t = 0;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1018 while (skip > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1019 t = available();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1020 if (skip > t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1021 skip -= t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1022 readPos += t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1023 readBlock();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1024 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1025 readPos += skip;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1026 break;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1027 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1028 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1029 return n;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1030 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1031 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1032
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1033 /**
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1034 * 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	1035 * 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	1036 * resources as possible are closed.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1037 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1038 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	1039 if (writer != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1040 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1041 writer.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1042 writer = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1043 } 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	1044 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1045 if (reader != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1046 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1047 reader.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1048 reader = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1049 } 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	1050 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1051 if (toMonet != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1052 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1053 toMonet.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1054 toMonet = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1055 } 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	1056 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1057 if (fromMonet != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1058 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1059 fromMonet.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1060 fromMonet = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1061 } 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	1062 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1063 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1064 try {
281 b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 276 diff changeset	1065 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	1066 con = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1067 } 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	1068 }
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	1069 if (debug && 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	1070 try {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1071 log.close();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1072 log = null;
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	1073 } catch (IOException e) { /* ignore it */ }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1074 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1075 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1076
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1077 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1078 * Destructor called by garbage collector before destroying this
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1079 * object tries to disconnect the MonetDB connection if it has not
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1080 * been disconnected already.
368 af6db116238d Add javadoc url where the supported hash algorithms are described. Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 363 diff changeset	1081 *
301 59bc8bebbfe9 Resolve javac -Xlint warnings when compiled on Java 9 or higher Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 297 diff changeset	1082 * @deprecated (since="9")
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1083 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1084 @Override
301 59bc8bebbfe9 Resolve javac -Xlint warnings when compiled on Java 9 or higher Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 297 diff changeset	1085 @Deprecated
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1086 protected void finalize() throws Throwable {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1087 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1088 super.finalize();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1089 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	1090 }

Mercurial > hg > monetdb-java

annotate src/main/java/org/monetdb/mcl/net/MapiSocket.java @ 391:f523727db392