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

author	Sjoerd Mullender <sjoerd@acm.org>
date	Thu, 04 Jan 2018 13:24:01 +0100 (2018-01-04)
parents	1296dbcc4958
children	5ddb1f20d5d5

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 *
200 c38d4eaf5479 It's 2018 now. Sjoerd Mullender <sjoerd@acm.org> parents: 194 diff changeset	6 * Copyright 1997 - July 2008 CWI, August 2008 - 2018 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
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	9 package nl.cwi.monetdb.mcl.net;
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.EOFException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	14 import java.io.FileWriter;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	15 import java.io.FilterInputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	16 import java.io.FilterOutputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	17 import java.io.IOException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	18 import java.io.InputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	19 import java.io.OutputStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	20 import java.io.PrintStream;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	21 import java.io.PrintWriter;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	22 import java.io.UnsupportedEncodingException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	23 import java.io.Writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	24 import java.net.Socket;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	25 import java.net.SocketException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	26 import java.net.URI;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	27 import java.net.URISyntaxException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	28 import java.security.MessageDigest;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	29 import java.security.NoSuchAlgorithmException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	30 import java.util.ArrayList;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	31 import java.util.Arrays;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	32 import java.util.HashSet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	33 import java.util.List;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	34 import java.util.Set;
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 import nl.cwi.monetdb.mcl.MCLException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	37 import nl.cwi.monetdb.mcl.io.BufferedMCLReader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	38 import nl.cwi.monetdb.mcl.io.BufferedMCLWriter;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	39 import nl.cwi.monetdb.mcl.parser.MCLParseException;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	40
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	41 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	42 * 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	43 * mode.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	44 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	45 * 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	46 * 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	47 * 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	48 * 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	49 * 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	50 * 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	51 * 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	52 * 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	53 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	54 * 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	55 * 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	56 * 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	57 * 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	58 * line read.
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	59 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	60 * 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	61 * 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	62 * to a file on disk.
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	63 * 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	64 * 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	65 * 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	66 * 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	67 * 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	68 * 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	69 *
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	70 * 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	71 * 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	72 * normal Socket, allowing for seamless plugging.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	73 * <pre>
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	74 * Socket \ / InputStream ----> (BufferedMCL)Reader
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	75 * > o <
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	76 * MapiSocket / \ OutputStream ----> (BufferedMCL)Writer
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	77 * </pre>
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	78 * 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	79 * 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	80 * 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	81 * 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	82 * interface is most sufficient. In particular the BufferedMCL*
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	83 * implementations of those interfaces supply some extra functionality
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	84 * geared towards the format of the data.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	85 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	86 * @author Fabian Groffen
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	87 * @version 4.1
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	88 * @see nl.cwi.monetdb.mcl.io.BufferedMCLReader
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	89 * @see nl.cwi.monetdb.mcl.io.BufferedMCLWriter
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	90 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	91 public final class MapiSocket {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	92 /** The TCP Socket to mserver */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	93 private Socket con;
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	94 /** 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	95 private int soTimeout = 0;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	96 /** Stream from the Socket for reading */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	97 private InputStream fromMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	98 /** Stream from the Socket for writing */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	99 private OutputStream toMonet;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	100 /** MCLReader on the InputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	101 private BufferedMCLReader reader;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	102 /** MCLWriter on the OutputStream */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	103 private BufferedMCLWriter writer;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	104 /** protocol version of the connection */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	105 private int version;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	106
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	107 /** The database to connect to */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	108 private String database = null;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	109 /** The language to connect with */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	110 private String language = "sql";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	111 /** The hash methods to use (null = default) */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	112 private String hash = null;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	113 /** Whether we should follow redirects */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	114 private boolean followRedirects = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	115 /** 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	116 private int ttl = 10;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	117 /** Whether we are debugging or not */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	118 private boolean debug = false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	119 /** The Writer for the debug log-file */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	120 private Writer log;
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 /** The blocksize (hardcoded in compliance with stream.mx) */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	123 public final static int BLOCK = 8 * 1024 - 2;
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 /** A short in two bytes for holding the block size in bytes */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	126 private byte[] blklen = new byte[2];
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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	129 * Constructs a new MapiSocket.
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 public MapiSocket() {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	132 con = null;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	133 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	134
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	135 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	136 * 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	137 * 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	138 * is also the default.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	139 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	140 * @param db the database
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 public void setDatabase(String db) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	143 this.database = db;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	144 }
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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	147 * Sets the language to use for this connection.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	148 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	149 * @param lang the language
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 public void setLanguage(String lang) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	152 this.language = lang;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	153 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	154
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	155 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	156 * 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	157 * 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	158 * 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	159 * separating the hashes by commas.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	160 * 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	161 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	162 * @param hash the hash method to use
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 public void setHash(String hash) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	165 this.hash = hash;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	166 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	167
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	168 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	169 * 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	170 * 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	171 * encountered during connect. The default bahaviour is to
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	172 * automatically follow redirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	173 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	174 * @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	175 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	176 public void setFollowRedirects(boolean r) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	177 this.followRedirects = r;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	178 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	179
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	180 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	181 * 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	182 * 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	183 * 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	184 * 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	185 * disable the following of redirects you should use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	186 * setFollowRedirects.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	187 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	188 * @see #setFollowRedirects(boolean r)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	189 * @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	190 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	191 public void setTTL(int t) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	192 this.ttl = t;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	193 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	194
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	195 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	196 * 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	197 * 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	198 * useful to break out of this indefinite wait.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	199 * 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	200 * operation to have effect.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	201 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	202 * @param s The specified timeout, in milliseconds. A timeout
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	203 * of zero is interpreted as an infinite timeout.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	204 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	205 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	206 public void setSoTimeout(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	207 if (s < 0) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	208 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	209 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	210 this.soTimeout = s;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	211 // limit time to wait on blocking operations (0 = indefinite)
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	212 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	213 con.setSoTimeout(s);
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	214 }
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	215 }
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 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	218 * Gets the SO_TIMEOUT from the underlying 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 * @return the currently in use timeout in milliseconds
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	221 * @throws SocketException Issue with the socket
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	222 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	223 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	224 if (con != null) {
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	225 this.soTimeout = con.getSoTimeout();
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	226 }
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	227 return this.soTimeout;
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	228 }
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	229
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	230 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	231 * Enables/disables debug
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	232 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	233 * @param debug Value to set
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 public void setDebug(boolean debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	236 this.debug = debug;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	237 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	238
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	239 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	240 * 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	241 * user. If followRedirect is false, a RedirectionException is
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	242 * thrown when a redirect is encountered.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	243 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	244 * @param host the hostname, or null for the loopback address
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	245 * @param port the port number
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	246 * @param user the username
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	247 * @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	248 * @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	249 * 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	250 * @throws IOException if an I/O error occurs when creating the socket
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	251 * @throws MCLParseException if bogus data is received
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	252 * @throws MCLException if an MCL related error occurs
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	253 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	254 public List<String> connect(String host, int port, String user, String pass)
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	255 throws IOException, MCLParseException, MCLException
fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	256 {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	257 // 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	258 // should really make a TCP connection or not.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	259 return connect(host, port, user, pass, true);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	260 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	261
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	262 private List<String> connect(String host, int port, String user, String pass, boolean makeConnection)
fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	263 throws IOException, MCLParseException, MCLException
fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	264 {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	265 if (ttl-- <= 0)
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	266 throw new MCLException("Maximum number of redirects reached, aborting connection attempt. Sorry.");
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	267
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	268 if (makeConnection) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	269 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	270 con.setSoTimeout(this.soTimeout);
6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	271 // 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	272 con.setTcpNoDelay(true);
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) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	281 throw new AssertionError(e.toString());
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
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	285 String c = reader.readLine();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	286 reader.waitForPrompt();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	287 writer.writeLine(
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	288 getChallengeResponse(
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	289 c,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	290 user,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	291 pass,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	292 language,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	293 database,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	294 hash
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	295 )
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	296 );
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	297
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	298 // read monet response till prompt
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	299 List<String> redirects = new ArrayList<String>();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	300 List<String> warns = new ArrayList<String>();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	301 String err = "", tmp;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	302 int lineType;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	303 do {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	304 if ((tmp = reader.readLine()) == null)
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	305 throw new IOException("Read from " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	306 con.getInetAddress().getHostName() + ":" +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	307 con.getPort() + ": End of stream reached");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	308 if ((lineType = reader.getLineType()) == BufferedMCLReader.ERROR) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	309 err += "\n" + tmp.substring(7);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	310 } else if (lineType == BufferedMCLReader.INFO) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	311 warns.add(tmp.substring(1));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	312 } else if (lineType == BufferedMCLReader.REDIRECT) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	313 redirects.add(tmp.substring(1));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	314 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	315 } while (lineType != BufferedMCLReader.PROMPT);
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	316 if (err.length() > 0) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	317 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	318 throw new MCLException(err.trim());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	319 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	320 if (!redirects.isEmpty()) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	321 if (followRedirects) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	322 // 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	323 // 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	324 // don't support anything intelligent but trying the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	325 // first one. URI should be in form of:
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	326 // "mapi:monetdb://host:port/database?arg=value&..."
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	327 // or
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	328 // "mapi:merovingian://proxy?arg=value&..."
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	329 // 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	330 // cases
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	331 String suri = redirects.get(0).toString();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	332 if (!suri.startsWith("mapi:"))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	333 throw new MCLException("unsupported redirect: " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	334
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	335 URI u;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	336 try {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	337 u = new URI(suri.substring(5));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	338 } catch (URISyntaxException e) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	339 throw new MCLParseException(e.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	340 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	341
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	342 tmp = u.getQuery();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	343 if (tmp != null) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	344 String args[] = tmp.split("&");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	345 for (int i = 0; i < args.length; i++) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	346 int pos = args[i].indexOf("=");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	347 if (pos > 0) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	348 tmp = args[i].substring(0, pos);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	349 if (tmp.equals("database")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	350 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	351 if (!tmp.equals(database)) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	352 warns.add("redirect points to different " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	353 "database: " + tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	354 setDatabase(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	355 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	356 } else if (tmp.equals("language")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	357 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	358 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	359 setLanguage(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	360 } else if (tmp.equals("user")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	361 tmp = args[i].substring(pos + 1);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	362 if (!tmp.equals(user))
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	363 warns.add("ignoring different username '" + tmp + "' set by " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	364 "redirect, what are the security implications?");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	365 } else if (tmp.equals("password")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	366 warns.add("ignoring different password set by redirect, " +
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	367 "what are the security implications?");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	368 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	369 warns.add("ignoring unknown argument '" + tmp + "' from redirect");
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 } else {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	372 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	373 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	374 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	375 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	376
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	377 if (u.getScheme().equals("monetdb")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	378 // this is a redirect to another (monetdb) server,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	379 // which means a full reconnect
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	380 // avoid the debug log being closed
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	381 if (debug) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	382 debug = false;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	383 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	384 debug = true;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	385 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	386 close();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	387 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	388 tmp = u.getPath();
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	389 if (tmp != null && tmp.length() > 0) {
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	390 tmp = tmp.substring(1).trim();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	391 if (!tmp.isEmpty() && !tmp.equals(database)) {
53 6cc63d6cb224 Implemented fix as suggested in Bug 3973 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 0 diff changeset	392 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	393 setDatabase(tmp);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	394 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	395 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	396 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	397 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	398 warns.add("Redirect by " + host + ":" + port + " to " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	399 } else if (u.getScheme().equals("merovingian")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	400 // reuse this connection to inline connect to the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	401 // right database that Merovingian proxies for us
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	402 warns.addAll(connect(host, port, user, pass, false));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	403 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	404 throw new MCLException("unsupported scheme in redirect: " + suri);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	405 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	406 } else {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	407 StringBuilder msg = new StringBuilder("The server sent a redirect for this connection:");
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	408 for (String it : redirects) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	409 msg.append(" [" + it + "]");
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 throw new MCLException(msg.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	412 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	413 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	414 return warns;
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
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	417 /**
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	418 * 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	419 * 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	420 * string is null, a challengeless response is returned.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	421 *
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	422 * @param chalstr the challenge string
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	423 * @param username the username to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	424 * @param password the password to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	425 * @param language the language to use
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	426 * @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	427 * @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	428 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	429 private String getChallengeResponse(
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	430 String chalstr,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	431 String username,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	432 String password,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	433 String language,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	434 String database,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	435 String hash
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	436 ) throws MCLParseException, MCLException, IOException {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	437 String response;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	438 String algo;
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	439
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	440 // parse the challenge string, split it on ':'
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	441 String[] chaltok = chalstr.split(":");
180 fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	442 if (chaltok.length <= 4)
fdf4c888d5b7 Small code and layout improvements Martin van Dinther <martin.van.dinther@monetdbsolutions.com> parents: 90 diff changeset	443 throw new MCLParseException("Server challenge string unusable! Challenge contains too few tokens: " + chalstr);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	444
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	445 // challenge string to use as salt/key
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	446 String challenge = chaltok[0];
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	447 String servert = chaltok[1];
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	448 try {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	449 version = Integer.parseInt(chaltok[2].trim()); // protocol version
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	450 } catch (NumberFormatException e) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	451 throw new MCLParseException("Protocol version unparseable: " + chaltok[3]);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	452 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	453
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	454 // 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	455 switch (version) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	456 default:
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	457 throw new MCLException("Unsupported protocol version: " + version);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	458 case 9:
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	459 // proto 9 is like 8, but uses a hash instead of the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	460 // plain password, the server tells us which hash in the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	461 // challenge after the byte-order
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	462
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	463 /* NOTE: Java doesn't support RIPEMD160 :( */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	464 if (chaltok[5].equals("SHA512")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	465 algo = "SHA-512";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	466 } else if (chaltok[5].equals("SHA384")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	467 algo = "SHA-384";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	468 } else if (chaltok[5].equals("SHA256")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	469 algo = "SHA-256";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	470 /* NOTE: Java doesn't support SHA-224 */
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	471 } else if (chaltok[5].equals("SHA1")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	472 algo = "SHA-1";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	473 } else if (chaltok[5].equals("MD5")) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	474 algo = "MD5";
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	475 } else {
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	476 throw new MCLException("Unsupported password hash: " + chaltok[5]);
0 a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	477 }
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	478
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	479 try {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	480 MessageDigest md = MessageDigest.getInstance(algo);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	481 md.update(password.getBytes("UTF-8"));
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	482 byte[] digest = md.digest();
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	483 password = toHex(digest);
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	484 } catch (NoSuchAlgorithmException e) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	485 throw new AssertionError("internal error: " + e.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	486 } catch (UnsupportedEncodingException e) {
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	487 throw new AssertionError("internal error: " + e.toString());
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	488 }
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 // 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	491 // password hash. The supported implementations come
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	492 // from the server challenge. We chose the best hash
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	493 // we can find, in the order SHA1, MD5, plain. Also,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	494 // the byte-order is reported in the challenge string,
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	495 // which makes sense, since only blockmode is supported.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	496 // proto 8 made this obsolete, but retained the
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	497 // byte-order report for future "binary" transports. In
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	498 // proto 8, the byte-order of the blocks is always little
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	499 // endian because most machines today are.
a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31. Sjoerd Mullender <sjoerd@acm.org> parents: diff changeset	500 String hashes = (hash == null ? chaltok[3] : hash);

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 *

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

9 package nl.cwi.monetdb.mcl.net;

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.EOFException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

14 import java.io.FileWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

15 import java.io.FilterInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

16 import java.io.FilterOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

17 import java.io.IOException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

18 import java.io.InputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

19 import java.io.OutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

20 import java.io.PrintStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

21 import java.io.PrintWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

22 import java.io.UnsupportedEncodingException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

23 import java.io.Writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

24 import java.net.Socket;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

25 import java.net.SocketException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

26 import java.net.URI;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

27 import java.net.URISyntaxException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

28 import java.security.MessageDigest;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

29 import java.security.NoSuchAlgorithmException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

30 import java.util.ArrayList;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

31 import java.util.Arrays;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

32 import java.util.HashSet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

33 import java.util.List;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

34 import java.util.Set;

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 import nl.cwi.monetdb.mcl.MCLException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

37 import nl.cwi.monetdb.mcl.io.BufferedMCLReader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

38 import nl.cwi.monetdb.mcl.io.BufferedMCLWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

39 import nl.cwi.monetdb.mcl.parser.MCLParseException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

40

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

41 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

42 * 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

43 * mode.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

44 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

45 * 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

46 * 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

47 * 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

48 * 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

49 * 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

50 * 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

51 * 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

52 * 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

53 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

54 * 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

55 * 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

56 * 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

57 * 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

58 * line read.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

59 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

60 * 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

61 * 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

62 * to a file on disk.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

63 * 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

64 * 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

65 * 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

66 * 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

67 * 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

68 * 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

69 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

70 * 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

71 * 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

72 * normal Socket, allowing for seamless plugging.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

73 * <pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

74 * Socket \ / InputStream ----> (BufferedMCL)Reader

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

75 * > o <

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

76 * MapiSocket / \ OutputStream ----> (BufferedMCL)Writer

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

77 * </pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

78 * 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

79 * 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

80 * 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

81 * 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

82 * interface is most sufficient. In particular the BufferedMCL*

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

83 * implementations of those interfaces supply some extra functionality

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

84 * geared towards the format of the data.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

85 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

86 * @author Fabian Groffen

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

87 * @version 4.1

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

88 * @see nl.cwi.monetdb.mcl.io.BufferedMCLReader

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

89 * @see nl.cwi.monetdb.mcl.io.BufferedMCLWriter

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

90 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

91 public final class MapiSocket {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

92 /** The TCP Socket to mserver */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

93 private Socket con;

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

94 /** 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

95 private int soTimeout = 0;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

96 /** Stream from the Socket for reading */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

97 private InputStream fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

98 /** Stream from the Socket for writing */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

99 private OutputStream toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

100 /** MCLReader on the InputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

101 private BufferedMCLReader reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

102 /** MCLWriter on the OutputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

103 private BufferedMCLWriter writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

104 /** protocol version of the connection */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

105 private int version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

106

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

107 /** The database to connect to */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

108 private String database = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

109 /** The language to connect with */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

110 private String language = "sql";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

111 /** The hash methods to use (null = default) */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

112 private String hash = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

113 /** Whether we should follow redirects */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

114 private boolean followRedirects = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

115 /** 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

116 private int ttl = 10;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

117 /** Whether we are debugging or not */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

118 private boolean debug = false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

119 /** The Writer for the debug log-file */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

120 private Writer log;

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 /** The blocksize (hardcoded in compliance with stream.mx) */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

123 public final static int BLOCK = 8 * 1024 - 2;

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 /** A short in two bytes for holding the block size in bytes */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

126 private byte[] blklen = new byte[2];

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 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

129 * Constructs a new MapiSocket.

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 public MapiSocket() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

132 con = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

133 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

134

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

135 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

136 * 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

137 * 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

138 * is also the default.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

139 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

140 * @param db the database

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 public void setDatabase(String db) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

143 this.database = db;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

144 }

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 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

147 * Sets the language to use for this connection.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

148 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

149 * @param lang the language

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 public void setLanguage(String lang) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

152 this.language = lang;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

153 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

154

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

155 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

156 * 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

157 * 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

158 * 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

159 * separating the hashes by commas.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

160 * 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

161 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

162 * @param hash the hash method to use

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 public void setHash(String hash) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

165 this.hash = hash;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

166 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

167

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

168 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

169 * 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

170 * 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

171 * encountered during connect. The default bahaviour is to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

172 * automatically follow redirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

173 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

174 * @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

175 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

176 public void setFollowRedirects(boolean r) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

177 this.followRedirects = r;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

178 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

179

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

180 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

181 * 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

182 * 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

183 * 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

184 * 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

185 * disable the following of redirects you should use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

186 * setFollowRedirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

187 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

188 * @see #setFollowRedirects(boolean r)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

189 * @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

190 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

191 public void setTTL(int t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

192 this.ttl = t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

193 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

194

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

195 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

196 * 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

197 * 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

198 * useful to break out of this indefinite wait.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

199 * 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

200 * operation to have effect.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

201 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

202 * @param s The specified timeout, in milliseconds. A timeout

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

203 * of zero is interpreted as an infinite timeout.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

204 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

205 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

206 public void setSoTimeout(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

207 if (s < 0) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

208 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

209 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

210 this.soTimeout = s;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

211 // limit time to wait on blocking operations (0 = indefinite)

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

212 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

213 con.setSoTimeout(s);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

214 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

215 }

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 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

218 * Gets the SO_TIMEOUT from the underlying 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 * @return the currently in use timeout in milliseconds

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

221 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

222 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

223 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

224 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

225 this.soTimeout = con.getSoTimeout();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

226 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

227 return this.soTimeout;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

228 }

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

229

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

230 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

231 * Enables/disables debug

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

232 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

233 * @param debug Value to set

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 public void setDebug(boolean debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

236 this.debug = debug;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

237 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

238

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

239 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

240 * 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

241 * user. If followRedirect is false, a RedirectionException is

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

242 * thrown when a redirect is encountered.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

243 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

244 * @param host the hostname, or null for the loopback address

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

245 * @param port the port number

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

246 * @param user the username

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

247 * @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

248 * @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

249 * 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

250 * @throws IOException if an I/O error occurs when creating the socket

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

251 * @throws MCLParseException if bogus data is received

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

252 * @throws MCLException if an MCL related error occurs

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

253 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

254 public List<String> connect(String host, int port, String user, String pass)

180

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

255 throws IOException, MCLParseException, MCLException

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

256 {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

257 // 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

258 // should really make a TCP connection or not.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

259 return connect(host, port, user, pass, true);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

260 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

261

180

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

262 private List<String> connect(String host, int port, String user, String pass, boolean makeConnection)

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

263 throws IOException, MCLParseException, MCLException

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

264 {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

265 if (ttl-- <= 0)

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

266 throw new MCLException("Maximum number of redirects reached, aborting connection attempt. Sorry.");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

267

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

268 if (makeConnection) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

269 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

270 con.setSoTimeout(this.soTimeout);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

271 // 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

272 con.setTcpNoDelay(true);

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) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

281 throw new AssertionError(e.toString());

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

285 String c = reader.readLine();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

286 reader.waitForPrompt();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

287 writer.writeLine(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

288 getChallengeResponse(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

289 c,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

290 user,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

291 pass,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

292 language,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

293 database,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

294 hash

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

295 )

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

296 );

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

297

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

298 // read monet response till prompt

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

299 List<String> redirects = new ArrayList<String>();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

300 List<String> warns = new ArrayList<String>();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

301 String err = "", tmp;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

302 int lineType;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

303 do {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

304 if ((tmp = reader.readLine()) == null)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

305 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

306 con.getInetAddress().getHostName() + ":" +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

307 con.getPort() + ": End of stream reached");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

308 if ((lineType = reader.getLineType()) == BufferedMCLReader.ERROR) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

309 err += "\n" + tmp.substring(7);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

310 } else if (lineType == BufferedMCLReader.INFO) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

311 warns.add(tmp.substring(1));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

312 } else if (lineType == BufferedMCLReader.REDIRECT) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

313 redirects.add(tmp.substring(1));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

314 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

315 } while (lineType != BufferedMCLReader.PROMPT);

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

316 if (err.length() > 0) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

317 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

318 throw new MCLException(err.trim());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

319 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

320 if (!redirects.isEmpty()) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

321 if (followRedirects) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

322 // 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

323 // 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

324 // don't support anything intelligent but trying the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

325 // first one. URI should be in form of:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

326 // "mapi:monetdb://host:port/database?arg=value&..."

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

327 // or

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

328 // "mapi:merovingian://proxy?arg=value&..."

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

329 // 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

330 // cases

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

331 String suri = redirects.get(0).toString();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

332 if (!suri.startsWith("mapi:"))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

333 throw new MCLException("unsupported redirect: " + suri);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

334

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

335 URI u;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

336 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

337 u = new URI(suri.substring(5));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

338 } catch (URISyntaxException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

339 throw new MCLParseException(e.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

340 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

341

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

342 tmp = u.getQuery();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

343 if (tmp != null) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

344 String args[] = tmp.split("&");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

345 for (int i = 0; i < args.length; i++) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

346 int pos = args[i].indexOf("=");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

347 if (pos > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

348 tmp = args[i].substring(0, pos);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

349 if (tmp.equals("database")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

350 tmp = args[i].substring(pos + 1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

351 if (!tmp.equals(database)) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

352 warns.add("redirect points to different " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

353 "database: " + tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

354 setDatabase(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

355 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

356 } else if (tmp.equals("language")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

357 tmp = args[i].substring(pos + 1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

358 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

359 setLanguage(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

360 } else if (tmp.equals("user")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

361 tmp = args[i].substring(pos + 1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

362 if (!tmp.equals(user))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

363 warns.add("ignoring different username '" + tmp + "' set by " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

364 "redirect, what are the security implications?");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

365 } else if (tmp.equals("password")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

366 warns.add("ignoring different password set by redirect, " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

367 "what are the security implications?");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

368 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

369 warns.add("ignoring unknown argument '" + tmp + "' from redirect");

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 } else {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

372 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

373 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

374 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

375 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

376

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

377 if (u.getScheme().equals("monetdb")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

378 // this is a redirect to another (monetdb) server,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

379 // which means a full reconnect

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

380 // avoid the debug log being closed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

381 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

382 debug = false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

383 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

384 debug = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

385 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

386 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

387 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

388 tmp = u.getPath();

180

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

389 if (tmp != null && tmp.length() > 0) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

390 tmp = tmp.substring(1).trim();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

391 if (!tmp.isEmpty() && !tmp.equals(database)) {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

392 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

393 setDatabase(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

394 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

395 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

396 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

397 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

398 warns.add("Redirect by " + host + ":" + port + " to " + suri);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

399 } else if (u.getScheme().equals("merovingian")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

400 // reuse this connection to inline connect to the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

401 // right database that Merovingian proxies for us

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

402 warns.addAll(connect(host, port, user, pass, false));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

403 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

404 throw new MCLException("unsupported scheme in redirect: " + suri);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

405 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

406 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

407 StringBuilder msg = new StringBuilder("The server sent a redirect for this connection:");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

408 for (String it : redirects) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

409 msg.append(" [" + it + "]");

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 throw new MCLException(msg.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

412 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

413 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

414 return warns;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

417 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

418 * 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

419 * 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

420 * string is null, a challengeless response is returned.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

421 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

422 * @param chalstr the challenge string

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

423 * @param username the username to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

424 * @param password the password to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

425 * @param language the language to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

426 * @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

427 * @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

428 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

429 private String getChallengeResponse(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

430 String chalstr,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

431 String username,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

432 String password,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

433 String language,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

434 String database,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

435 String hash

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

436 ) throws MCLParseException, MCLException, IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

437 String response;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

438 String algo;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

439

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

440 // parse the challenge string, split it on ':'

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

441 String[] chaltok = chalstr.split(":");

180

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

442 if (chaltok.length <= 4)

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

443 throw new MCLParseException("Server challenge string unusable! Challenge contains too few tokens: " + chalstr);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

444

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

445 // challenge string to use as salt/key

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

446 String challenge = chaltok[0];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

447 String servert = chaltok[1];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

448 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

449 version = Integer.parseInt(chaltok[2].trim()); // protocol version

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

450 } catch (NumberFormatException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

451 throw new MCLParseException("Protocol version unparseable: " + chaltok[3]);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

452 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

453

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

454 // 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

455 switch (version) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

456 default:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

457 throw new MCLException("Unsupported protocol version: " + version);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

458 case 9:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

459 // proto 9 is like 8, but uses a hash instead of the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

460 // plain password, the server tells us which hash in the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

461 // challenge after the byte-order

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

462

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

463 /* NOTE: Java doesn't support RIPEMD160 :( */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

464 if (chaltok[5].equals("SHA512")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

465 algo = "SHA-512";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

466 } else if (chaltok[5].equals("SHA384")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

467 algo = "SHA-384";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

468 } else if (chaltok[5].equals("SHA256")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

469 algo = "SHA-256";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

470 /* NOTE: Java doesn't support SHA-224 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

471 } else if (chaltok[5].equals("SHA1")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

472 algo = "SHA-1";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

473 } else if (chaltok[5].equals("MD5")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

474 algo = "MD5";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

475 } else {

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

476 throw new MCLException("Unsupported password hash: " + chaltok[5]);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

477 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

478

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

479 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

480 MessageDigest md = MessageDigest.getInstance(algo);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

481 md.update(password.getBytes("UTF-8"));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

482 byte[] digest = md.digest();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

483 password = toHex(digest);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

484 } catch (NoSuchAlgorithmException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

485 throw new AssertionError("internal error: " + e.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

486 } catch (UnsupportedEncodingException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

487 throw new AssertionError("internal error: " + e.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

488 }

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 // 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

491 // password hash. The supported implementations come

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

492 // from the server challenge. We chose the best hash

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

493 // we can find, in the order SHA1, MD5, plain. Also,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

494 // the byte-order is reported in the challenge string,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

495 // which makes sense, since only blockmode is supported.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

496 // proto 8 made this obsolete, but retained the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

497 // byte-order report for future "binary" transports. In

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

498 // proto 8, the byte-order of the blocks is always little

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

499 // endian because most machines today are.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

500 String hashes = (hash == null ? chaltok[3] : hash);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

501 Set<String> hashesSet = new HashSet<String>(Arrays.asList(hashes.toUpperCase().split("[, ]")));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

502

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

503 // if we deal with merovingian, mask our credentials

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

504 if (servert.equals("merovingian") && !language.equals("control")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

505 username = "merovingian";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

506 password = "merovingian";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

507 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

508 String pwhash;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

509 algo = null;

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

510

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

511 if (hashesSet.contains("SHA512")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

512 algo = "SHA-512";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

513 pwhash = "{SHA512}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

514 } else if (hashesSet.contains("SHA384")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

515 algo = "SHA-384";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

516 pwhash = "{SHA384}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

517 } else if (hashesSet.contains("SHA256")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

518 algo = "SHA-256";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

519 pwhash = "{SHA256}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

520 } else if (hashesSet.contains("SHA1")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

521 algo = "SHA-1";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

522 pwhash = "{SHA1}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

523 } else if (hashesSet.contains("MD5")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

524 algo = "MD5";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

525 pwhash = "{MD5}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

526 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

527 throw new MCLException("no supported password hashes in " + hashes);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

528 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

529 if (algo != null) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

530 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

531 MessageDigest md = MessageDigest.getInstance(algo);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

532 md.update(password.getBytes("UTF-8"));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

533 md.update(challenge.getBytes("UTF-8"));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

534 byte[] digest = md.digest();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

535 pwhash += toHex(digest);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

536 } catch (NoSuchAlgorithmException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

537 throw new AssertionError("internal error: " + e.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

538 } catch (UnsupportedEncodingException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

539 throw new AssertionError("internal error: " + e.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

540 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

541 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

542 // TODO: some day when we need this, we should store

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

543 // this

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

544 if (chaltok[4].equals("BIG")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

545 // byte-order of server is big-endian

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

546 } else if (chaltok[4].equals("LIT")) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

547 // byte-order of server is little-endian

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

548 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

549 throw new MCLParseException("Invalid byte-order: " + chaltok[5]);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

550 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

551

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

552 // generate response

180

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

553 response = "BIG:" // JVM byte-order is big-endian

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

554 + username + ":" + pwhash + ":" + language

fdf4c888d5b7 Small code and layout improvements

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 90

diff changeset

555 + ":" + (database == null ? "" : database) + ":";

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

556

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

557 return response;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

558 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

559 }

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

560

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

561 private static char hexChar(int n) {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

562 return (n > 9)

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

563 ? (char) ('a' + (n - 10))

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

564 : (char) ('0' + n);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

565 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

566

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

567 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

568 * 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

569 * string representation.

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 * @param digest the byte array to convert

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

572 * @return the byte array as hexadecimal string

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 private static String toHex(byte[] digest) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

575 char[] result = new char[digest.length * 2];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

576 int pos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

577 for (int i = 0; i < digest.length; i++) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

578 result[pos++] = hexChar((digest[i] & 0xf0) >> 4);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

579 result[pos++] = hexChar(digest[i] & 0x0f);

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 return new String(result);

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

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 * 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

586 * the MapiSocket.

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 * @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

589 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

590 public InputStream getInputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

591 return fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

592 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

593

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

594 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

595 * Returns an output stream for this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

596 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

597 * @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

598 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

599 public OutputStream getOutputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

600 return toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

601 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

602

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

603 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

604 * 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

605 * BufferedMCLReader which does protocol interpretation of the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

606 * BlockInputStream produced by this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

607 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

608 * @return a BufferedMCLReader connected to this MapiSocket

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 public BufferedMCLReader getReader() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

611 return reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

612 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

613

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

614 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

615 * 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

616 * BufferedMCLWriter which produces protocol compatible data blocks

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

617 * that the BlockOutputStream can properly translate into blocks.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

618 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

619 * @return a BufferedMCLWriter connected to this MapiSocket

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 public BufferedMCLWriter getWriter() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

622 return writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

623 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

624

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

625 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

626 * 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

627 * 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

628 * MapiSocket should check this version to act appropriately.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

629 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

630 * @return the mapi protocol version

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

631 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

632 public int getProtocolVersion() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

633 return version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

634 }

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 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

637 * 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

638 * 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

639 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

640 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

641 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

642 * @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

643 * @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

644 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

645 public void debug(String filename) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

646 debug(new FileWriter(filename));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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 * @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

657 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

658 public void debug(PrintStream out) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

659 debug(new PrintWriter(out));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

660 }

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

661

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

662 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

663 * 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

664 * 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

665 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

666 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

667 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

668 * @param out to write the log to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

669 * @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

670 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

671 public void debug(Writer out) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

672 log = out;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

673 debug = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

674 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

675

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

676 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

677 * 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

678 * 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

679 * "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

680 * 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

681 * 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

682 * 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

683 * being written to the stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

684 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

685 class BlockOutputStream extends FilterOutputStream {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

686 private int writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

687 private byte[] block = new byte[BLOCK];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

688 private int blocksize = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

689

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

690 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

691 * Constructs this BlockOutputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

692 * OutputStream. A BufferedOutputStream is internally used.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

693 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

694 public BlockOutputStream(OutputStream out) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

695 // 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

696 // 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

697 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

698 super(new BufferedOutputStream(out));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

699 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

700

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

701 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

702 public void flush() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

703 // write the block (as final) then flush.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

704 writeBlock(true);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

705 out.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

706

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

707 // 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

708 // 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

709 // 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

710 // 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

711 // 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

712 // 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

713 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

714 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

715 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

716 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

717

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

718 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

719 * 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

720 * 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

721 * 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

722 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

723 * @param last whether this is the last block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

724 * @throws IOException if writing to the stream failed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

725 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

726 public void writeBlock(boolean last) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

727 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

728 // always fits, because of BLOCK's size

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

729 blocksize = (short)writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

730 // this is the last block, so encode least

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

731 // significant bit in the first byte (little-endian)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

732 blklen[0] = (byte)(blocksize << 1 & 0xFF | 1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

733 blklen[1] = (byte)(blocksize >> 7);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

734 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

735 // always fits, because of BLOCK's size

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

736 blocksize = (short)BLOCK;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

737 // another block will follow, encode least

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

738 // significant bit in the first byte (little-endian)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

739 blklen[0] = (byte)(blocksize << 1 & 0xFF);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

740 blklen[1] = (byte)(blocksize >> 7);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

741 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

742

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

743 out.write(blklen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

744

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

745 // write the actual block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

746 out.write(block, 0, writePos);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

747

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

748 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

749 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

750 logTd("write final block: " + writePos + " bytes");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

751 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

752 logTd("write block: " + writePos + " bytes");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

753 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

754 logTx(new String(block, 0, writePos, "UTF-8"));

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 writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

758 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

759

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

760 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

761 public void write(int b) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

762 if (writePos == BLOCK) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

763 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

764 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

765 block[writePos++] = (byte)b;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

766 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

767

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

768 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

769 public void write(byte[] b) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

770 write(b, 0, b.length);

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

774 public void write(byte[] b, int off, int len) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

775 int t = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

776 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

777 t = BLOCK - writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

778 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

779 System.arraycopy(b, off, block, writePos, t);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

780 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

781 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

782 writePos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

783 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

784 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

785 System.arraycopy(b, off, block, writePos, len);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

786 writePos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

787 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

788 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

789 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

790 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

791

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

792 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

793 public void close() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

794 // 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

795 // the FilterOutputStream), so we close manually here

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

796 out.close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

797 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

798 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

799

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

800

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 * 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

803 * available as a normal stream.

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 class BlockInputStream extends FilterInputStream {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

806 private int readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

807 private int blockLen = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

808 private byte[] block = new byte[BLOCK + 3]; // \n.\n

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

809

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

810 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

811 * Constructs this BlockInputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

812 * InputStream. A BufferedInputStream is internally used.

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 public BlockInputStream(InputStream in) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

815 // 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

816 // 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

817 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

818 super(new BufferedInputStream(in));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

819 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

820

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

821 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

822 public int available() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

823 return blockLen - readPos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

824 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

825

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

826 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

827 public boolean markSupported() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

828 return false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

829 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

830

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

831 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

832 public void mark(int readlimit) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

833 throw new AssertionError("Not implemented!");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

834 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

835

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

836 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

837 public void reset() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

838 throw new AssertionError("Not implemented!");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

839 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

840

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

841 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

842 * 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

843 * 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

844 * 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

845 * 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

846 * data will greatly complicate matters, while a performance

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

847 * 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

848 * 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

849 * consider this method a quick bug fix/workaround.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

850 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

851 * @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

852 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

853 private boolean _read(byte[] b, int len) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

854 int s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

855 int off = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

856

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

857 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

858 s = in.read(b, off, len);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

859 if (s == -1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

860 // 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

861 // 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

862 if (off > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

863 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

864 logRd("the following incomplete block was received:");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

865 logRx(new String(b, 0, off, "UTF-8"));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

866 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

867 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

868 con.getInetAddress().getHostName() + ":" +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

869 con.getPort() + ": Incomplete block read from stream");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

870 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

871 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

872 logRd("server closed the connection (EOF)");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

873 return false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

874 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

875 len -= s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

876 off += s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

877 }

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 return true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

880 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

881

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 * 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

884 * or writes the prompt in the buffer.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

885 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

886 * 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

887 * 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

888 * 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

889 * 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

890 * 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

891 * 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

892 * 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

893 * read methods.

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 * 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

896 * 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

897 * 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

898 * 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

899 * 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

900 * Reader that is possibly chained to this InputStream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

901 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

902 * 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

903 * loose.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

904 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

905 private int readBlock() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

906 // read next two bytes (short)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

907 if (!_read(blklen, 2))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

908 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

909

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

910 // 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

911 blockLen = (short)(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

912 (blklen[0] & 0xFF) >> 1 |

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

913 (blklen[1] & 0xFF) << 7

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

914 );

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

915 readPos = 0;

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 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

918 if ((blklen[0] & 0x1) == 1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

919 logRd("read final block: " + blockLen + " bytes");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

920 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

921 logRd("read new block: " + blockLen + " bytes");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

922 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

923 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

924

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

925 // 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

926 // stack trace

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

927 if (blockLen > block.length)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

928 throw new AssertionError("Server sent a block " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

929 "larger than BLOCKsize: " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

930 blockLen + " > " + block.length);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

931 if (!_read(block, blockLen))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

932 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

933

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

934 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

935 logRx(new String(block, 0, blockLen, "UTF-8"));

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 // if this is the last block, make it end with a newline and

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

938 // prompt

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

939 if ((blklen[0] & 0x1) == 1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

940 if (blockLen > 0 && block[blockLen - 1] != '\n') {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

941 // to terminate the block in a Reader

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

942 block[blockLen++] = '\n';

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

943 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

944 // insert 'fake' flush

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

945 block[blockLen++] = BufferedMCLReader.PROMPT;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

946 block[blockLen++] = '\n';

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

947 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

948 logRd("inserting prompt");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

949 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

950

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

951 return(blockLen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

952 }

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 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

955 public int read() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

956 if (available() == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

957 if (readBlock() == -1)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

958 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

959 }

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

960

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

961 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

962 logRx(new String(block, readPos, 1, "UTF-8"));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

963 return (int)block[readPos++];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

964 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

965

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

966 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

967 public int read(byte[] b) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

968 return read(b, 0, b.length);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

969 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

970

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

971 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

972 public int read(byte[] b, int off, int len) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

973 int t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

974 int size = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

975 while (size < len) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

976 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

977 if (t == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

978 if (size != 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

979 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

980 if (readBlock() == -1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

981 if (size == 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

982 size = -1;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

983 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

984 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

985 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

986 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

987 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

988 System.arraycopy(block, readPos, b, off, t);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

989 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

990 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

991 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

992 size += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

993 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

994 System.arraycopy(block, readPos, b, off, len);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

995 readPos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

996 size += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

997 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

998 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

999 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1000 return size;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1001 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1002

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1003 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1004 public long skip(long n) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1005 long skip = n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1006 int t = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1007 while (skip > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1008 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1009 if (skip > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1010 skip -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1011 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1012 readBlock();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1013 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1014 readPos += skip;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1015 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1016 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1017 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1018 return n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1019 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1020 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1021

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1022 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1023 * Closes the streams and socket connected to the server if

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1024 * possible. If an error occurs during disconnecting it is ignored.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1025 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1026 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

1027 if (writer != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1028 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1029 writer.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1030 writer = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1031 } 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

1032 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1033 if (reader != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1034 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1035 reader.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1036 reader = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1037 } 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

1038 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1039 if (toMonet != 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 toMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1042 toMonet = 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 (fromMonet != 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 fromMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1048 fromMonet = 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 (con != 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 con.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1054 con = 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 }

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

1057 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

1058 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1059 log.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

diff changeset

1060 log = 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 */ }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1062 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1063 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1064

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1065 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1066 * Destructor called by garbage collector before destroying this

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1067 * 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

1068 * been disconnected already.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1069 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1070 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1071 protected void finalize() throws Throwable {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1072 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1073 super.finalize();

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 * Writes a logline tagged with a timestamp using the given string.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1079 * Used for debugging purposes only and represents a message that is

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1080 * connected to writing to the socket. A logline might look like:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1081 * TX 152545124: Hello MonetDB!

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1082 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1083 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1084 * @throws IOException if an IO error occurs while writing to the logfile

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1085 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1086 private void logTx(String message) throws IOException {

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

1087 log.write("TX " + System.currentTimeMillis() + ": " + message + "\n");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1088 }

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 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1091 * Writes a logline tagged with a timestamp using the given string.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1092 * Lines written using this log method are tagged as "added

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1093 * metadata" which is not strictly part of the data sent.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1094 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1095 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1096 * @throws IOException if an IO error occurs while writing to the logfile

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1097 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1098 private void logTd(String message) throws IOException {

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

1099 log.write("TD " + System.currentTimeMillis() + ": " + message + "\n");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1100 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1101

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1102 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1103 * Writes a logline tagged with a timestamp using the given string,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1104 * and flushes afterwards. Used for debugging purposes only and

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1105 * represents a message that is connected to reading from the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1106 * socket. The log is flushed after writing the line. A logline

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1107 * might look like:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1108 * RX 152545124: Hi JDBC!

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1109 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1110 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1111 * @throws IOException if an IO error occurs while writing to the logfile

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1112 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1113 private void logRx(String message) throws IOException {

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

1114 log.write("RX " + System.currentTimeMillis() + ": " + message + "\n");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1115 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1116 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1117

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1118 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1119 * Writes a logline tagged with a timestamp using the given string,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1120 * and flushes afterwards. Lines written using this log method are

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1121 * tagged as "added metadata" which is not strictly part of the data

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1122 * received.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1123 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1124 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1125 * @throws IOException if an IO error occurs while writing to the logfile

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1126 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1127 private void logRd(String message) throws IOException {

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

1128 log.write("RD " + System.currentTimeMillis() + ": " + message + "\n");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1129 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1130 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

diff changeset

1131 }

Mercurial > hg > monetdb-java

annotate src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java @ 200:c38d4eaf5479