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

1 /*

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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:

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:

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:

5 *

261

d4baf8a4b43a Update Copyright year to 2019

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

parents: 225

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

7 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

8

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

10

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

11 import java.io.BufferedInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

12 import java.io.BufferedOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

13 import java.io.EOFException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

14 import java.io.FileWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

15 import java.io.FilterInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

16 import java.io.FilterOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

17 import java.io.IOException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

18 import java.io.InputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

19 import java.io.OutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

20 import java.io.PrintStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

21 import java.io.PrintWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

22 import java.io.UnsupportedEncodingException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

23 import java.io.Writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

24 import java.net.Socket;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

25 import java.net.SocketException;

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

26 import java.net.UnknownHostException;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

27 import java.net.URI;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

28 import java.net.URISyntaxException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

29 import java.security.MessageDigest;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

30 import java.security.NoSuchAlgorithmException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

31 import java.util.ArrayList;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

32 import java.util.Arrays;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

33 import java.util.HashSet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

34 import java.util.List;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

35 import java.util.Set;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

36

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

37 import nl.cwi.monetdb.mcl.MCLException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

41

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

42 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

44 * mode.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

45 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

46 * The MapiSocket implements the protocol specifics of the MAPI block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

48 * BufferedReader and a BufferedWriter. Because logging in is an

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

51 * calling the connect() method to influence the login process. Only

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

52 * after a successful call to connect() the BufferedReader and

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

53 * BufferedWriter can be retrieved.

194

1296dbcc4958 Resolved javadoc many errors and warnings, such as:

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

parents: 180

54 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

57 * PROMPT, HEADER, RESULT, ERROR or UNKNOWN. Use the getLineType()

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

59 * line read.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

60 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

61 * For debugging purposes a socket level debugging is implemented where

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

63 * to a file on disk.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

64 * Incoming messages are prefixed by "RX" (received by the driver),

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

65 * outgoing messages by "TX" (transmitted by the driver). Special

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

70 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

73 * normal Socket, allowing for seamless plugging.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

74 * <pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

76 * > o <

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

78 * </pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

79 * The MapiSocket allows to retrieve Streams for communicating. They

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

84 * implementations of those interfaces supply some extra functionality

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

85 * geared towards the format of the data.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

86 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

87 * @author Fabian Groffen

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

88 * @version 4.1

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

91 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

92 public final class MapiSocket {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

93 /** The TCP Socket to mserver */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

94 private Socket con;

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

96 private int soTimeout = 0;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

98 private InputStream fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

100 private OutputStream toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

101 /** MCLReader on the InputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

102 private BufferedMCLReader reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

103 /** MCLWriter on the OutputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

104 private BufferedMCLWriter writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

105 /** protocol version of the connection */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

106 private int version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

107

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

108 /** The database to connect to */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

109 private String database = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

110 /** The language to connect with */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

111 private String language = "sql";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

113 private String hash = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

114 /** Whether we should follow redirects */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

115 private boolean followRedirects = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

117 private int ttl = 10;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

119 private boolean debug = false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

121 private Writer log;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

122

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

123 /** The blocksize (hardcoded in compliance with stream.mx) */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

125

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

128

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

129 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

130 * Constructs a new MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

131 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

132 public MapiSocket() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

133 con = null;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

134 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

135

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

136 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

139 * is also the default.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

140 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

141 * @param db the database

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

142 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

143 public void setDatabase(String db) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

144 this.database = db;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

145 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

146

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

147 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

148 * Sets the language to use for this connection.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

149 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

150 * @param lang the language

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

151 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

152 public void setLanguage(String lang) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

153 this.language = lang;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

154 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

155

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

156 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

158 * for debugging purposes. Setting a hash method can yield in

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

159 * connection failures. Multiple hash methods can be given by

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

160 * separating the hashes by commas.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

162 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

163 * @param hash the hash method to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

164 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

165 public void setHash(String hash) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

166 this.hash = hash;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

167 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

168

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

169 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

172 * encountered during connect. The default bahaviour is to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

173 * automatically follow redirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

174 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

175 * @param r whether to follow redirects (true) or not (false)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

176 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

177 public void setFollowRedirects(boolean r) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

178 this.followRedirects = r;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

179 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

181 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

182 * Sets the number of redirects that are followed when

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

186 * disable the following of redirects you should use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

187 * setFollowRedirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

188 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

189 * @see #setFollowRedirects(boolean r)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

191 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

192 public void setTTL(int t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

193 this.ttl = t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

194 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

195

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

196 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

199 * useful to break out of this indefinite wait.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

200 * This option must be enabled prior to entering the blocking

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

201 * operation to have effect.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

202 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

204 * of zero is interpreted as an infinite timeout.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

205 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

206 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

207 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

208 if (s < 0) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

209 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

210 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

211 this.soTimeout = s;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

213 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

214 con.setSoTimeout(s);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

215 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

216 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

217

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

218 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

219 * Gets the SO_TIMEOUT from the underlying Socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

220 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

221 * @return the currently in use timeout in milliseconds

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

222 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

223 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

224 public int getSoTimeout() throws SocketException {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

225 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

226 this.soTimeout = con.getSoTimeout();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

227 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

228 return this.soTimeout;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

229 }

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

230

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

231 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

232 * Enables/disables debug

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

233 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

234 * @param debug Value to set

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

235 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

236 public void setDebug(boolean debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

237 this.debug = debug;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

238 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

239

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

240 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

243 * thrown when a redirect is encountered.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

244 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

246 * @param port the port number (must be between 0 and 65535, inclusive)

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

247 * @param user the username

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

248 * @param pass the password

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

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

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

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

252 * @throws SocketException - if there is an error in the underlying protocol, such as a TCP error.

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

253 * @throws UnknownHostException if the IP address of the host could not be determined

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

254 * @throws MCLParseException if bogus data is received

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

255 * @throws MCLException if an MCL related error occurs

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

256 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

258 throws IOException, UnknownHostException, SocketException, MCLParseException, MCLException

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

259 {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

263 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

264

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

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

5ddb1f20d5d5 Socket may also throw an UnknownHostException. Add it to MapiSocket.connect() and catch it in MonetConnection(Properties props).

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

parents: 200

266 throws IOException, UnknownHostException, SocketException, MCLParseException, MCLException

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

267 {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

268 if (ttl-- <= 0)

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

269 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:

270

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

271 if (makeConnection) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

272 con = new Socket(host, port);

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

273 con.setSoTimeout(this.soTimeout);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

275 con.setTcpNoDelay(true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

277

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

278 fromMonet = new BlockInputStream(con.getInputStream());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

279 toMonet = new BlockOutputStream(con.getOutputStream());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

280 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

281 reader = new BufferedMCLReader(fromMonet, "UTF-8");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

282 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

283 writer.registerReader(reader);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

284 } catch (UnsupportedEncodingException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

286 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

287 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

288

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

289 String c = reader.readLine();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

290 reader.waitForPrompt();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

291 writer.writeLine(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

292 getChallengeResponse(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

293 c,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

294 user,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

295 pass,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

296 language,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

297 database,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

298 hash

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

299 )

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

300 );

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

301

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

302 // read monet response till prompt

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

305 String err = "", tmp;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

306 int lineType;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

307 do {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

309 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

318 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

321 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

323 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

324 if (!redirects.isEmpty()) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

325 if (followRedirects) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

326 // Ok, server wants us to go somewhere else. The list

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

331 // or

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

333 // note that the extra arguments must be obeyed in both

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

334 // cases

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

338

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

339 URI u;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

340 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

342 } catch (URISyntaxException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

344 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

345

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

346 tmp = u.getQuery();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

347 if (tmp != null) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

351 if (pos > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

357 "database: " + tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

358 setDatabase(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

359 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

362 warns.add("redirect specifies use of different language: " + tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

363 setLanguage(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

366 if (!tmp.equals(user))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

371 "what are the security implications?");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

372 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

374 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

375 } else {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

376 warns.add("ignoring illegal argument from redirect: " + args[i]);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

377 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

378 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

379 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

380

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

383 // which means a full reconnect

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

384 // avoid the debug log being closed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

385 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

386 debug = false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

387 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

388 debug = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

389 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

390 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

391 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

392 tmp = u.getPath();

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

395 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

396 warns.add("redirect points to different " + "database: " + tmp);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

397 setDatabase(tmp);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

398 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

399 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

400 int p = u.getPort();

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

401 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:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

404 // reuse this connection to inline connect to the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

405 // right database that Merovingian proxies for us

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

407 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

409 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

410 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

411 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:

412 for (String it : redirects) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

414 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

415 throw new MCLException(msg.toString());

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

416 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

417 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

418 return warns;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

419 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

420

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

421 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

422 * A little helper function that processes a challenge string, and

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

423 * returns a response string for the server. If the challenge

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

425 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

426 * @param chalstr the challenge string

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

427 * @param username the username to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

428 * @param password the password to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

429 * @param language the language to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

432 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

433 private String getChallengeResponse(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

434 String chalstr,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

435 String username,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

436 String password,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

437 String language,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

438 String database,

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

439 String hash

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

440 ) throws MCLParseException, MCLException, IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

441 String response;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

442 String algo;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

443

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

446 if (chaltok.length <= 4)

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

447 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:

448

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

449 // challenge string to use as salt/key

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

450 String challenge = chaltok[0];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

451 String servert = chaltok[1];

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

452 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

454 } catch (NumberFormatException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

456 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

457

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

458 // handle the challenge according to the version it is

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

459 switch (version) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

460 default:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

462 case 9:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

465 // challenge after the byte-order

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

466

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

469 algo = "SHA-512";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

471 algo = "SHA-384";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

473 algo = "SHA-256";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

476 algo = "SHA-1";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

478 algo = "MD5";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

481 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

482

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

483 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

484 MessageDigest md = MessageDigest.getInstance(algo);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

487 password = toHex(digest);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

488 } catch (NoSuchAlgorithmException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

490 } catch (UnsupportedEncodingException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

492 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

493

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

494 // proto 7 (finally) used the challenge and works with a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

495 // password hash. The supported implementations come

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

503 // endian because most machines today are.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

505 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:

506

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

509 username = "merovingian";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

510 password = "merovingian";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

511 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

512 String pwhash;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

513 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

514

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

516 algo = "SHA-512";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

517 pwhash = "{SHA512}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

519 algo = "SHA-384";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

520 pwhash = "{SHA384}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

522 algo = "SHA-256";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

523 pwhash = "{SHA256}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

525 algo = "SHA-1";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

526 pwhash = "{SHA1}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

528 algo = "MD5";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

529 pwhash = "{MD5}";

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

530 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

532 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

533 if (algo != null) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

534 try {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

535 MessageDigest md = MessageDigest.getInstance(algo);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

539 pwhash += toHex(digest);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

540 } catch (NoSuchAlgorithmException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

542 } catch (UnsupportedEncodingException e) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

544 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

545 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

547 // this

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

552 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

554 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

555

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

556 // generate response

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

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

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

558 + username + ":" + pwhash + ":" + language

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

559 + ":" + (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

560

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

561 return response;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

562 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

563 }

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

564

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

565 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

566 return (n > 9)

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

569 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

570

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

571 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

573 * string representation.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

574 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

575 * @param digest the byte array to convert

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

576 * @return the byte array as hexadecimal string

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

577 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

578 private static String toHex(byte[] digest) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

580 int pos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

584 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

585 return new String(result);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

586 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

587

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

588 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

589 * Returns an InputStream that reads from this open connection on

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

590 * the MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

591 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

592 * @return an input stream that reads from this open connection

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

593 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

594 public InputStream getInputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

595 return fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

596 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

597

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

598 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

599 * Returns an output stream for this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

600 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

601 * @return an output stream for writing bytes to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

602 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

603 public OutputStream getOutputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

604 return toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

605 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

606

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

607 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

608 * Returns a Reader for this MapiSocket. The Reader is a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

609 * BufferedMCLReader which does protocol interpretation of the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

610 * BlockInputStream produced by this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

611 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

612 * @return a BufferedMCLReader connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

613 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

614 public BufferedMCLReader getReader() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

615 return reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

616 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

617

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

618 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

619 * Returns a Writer for this MapiSocket. The Writer is a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

620 * BufferedMCLWriter which produces protocol compatible data blocks

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

621 * that the BlockOutputStream can properly translate into blocks.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

622 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

623 * @return a BufferedMCLWriter connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

624 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

625 public BufferedMCLWriter getWriter() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

626 return writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

627 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

628

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

629 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

630 * Returns the mapi protocol version used by this socket. The

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

632 * MapiSocket should check this version to act appropriately.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

633 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

634 * @return the mapi protocol version

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

635 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

636 public int getProtocolVersion() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

637 return version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

638 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

639

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

640 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

643 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

644 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

645 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

646 * @param filename the name of the file to write to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

648 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

649 public void debug(String filename) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

650 debug(new FileWriter(filename));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

651 }

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

652

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

653 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

656 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

657 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

658 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

659 * @param out to write the log to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

661 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

662 public void debug(PrintStream out) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

663 debug(new PrintWriter(out));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

664 }

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

665

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

666 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

669 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

670 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

671 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

672 * @param out to write the log to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

674 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

675 public void debug(Writer out) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

676 log = out;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

677 debug = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

678 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

679

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

680 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

683 * "final" block to the underlying stream. Non-final blocks are

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

687 * being written to the stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

688 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

689 class BlockOutputStream extends FilterOutputStream {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

690 private int writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

692 private int blocksize = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

693

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

694 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

695 * Constructs this BlockOutputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

696 * OutputStream. A BufferedOutputStream is internally used.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

697 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

698 public BlockOutputStream(OutputStream out) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

699 // always use a buffered stream, even though we know how

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

701 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

702 super(new BufferedOutputStream(out));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

703 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

704

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

705 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

706 public void flush() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

708 writeBlock(true);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

709 out.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

710

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

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

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

717 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

718 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

719 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

720 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

721

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

722 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

724 * boolean last controls whether the block is sent with an

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

726 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

727 * @param last whether this is the last block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

728 * @throws IOException if writing to the stream failed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

729 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

730 public void writeBlock(boolean last) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

731 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

733 blocksize = (short)writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

738 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

740 blocksize = (short)BLOCK;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

741 // another block will follow, encode least

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

745 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

746

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

747 out.write(blklen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

748

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

749 // write the actual block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

751

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

752 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

753 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

755 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

757 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

759 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

760

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

761 writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

762 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

763

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

764 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

765 public void write(int b) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

766 if (writePos == BLOCK) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

767 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

768 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

770 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

771

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

772 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

775 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

776

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

777 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

778 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:

779 int t = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

780 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

781 t = BLOCK - writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

782 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

784 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

785 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

786 writePos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

787 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

788 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

790 writePos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

791 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

792 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

793 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

794 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

795

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

796 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

797 public void close() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

800 out.close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

801 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

802 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

803

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

804

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

805 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

807 * available as a normal stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

808 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

809 class BlockInputStream extends FilterInputStream {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

810 private int readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

811 private int blockLen = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

813

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

814 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

815 * Constructs this BlockInputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

816 * InputStream. A BufferedInputStream is internally used.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

817 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

818 public BlockInputStream(InputStream in) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

819 // always use a buffered stream, even though we know how

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

821 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

822 super(new BufferedInputStream(in));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

823 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

824

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

825 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

826 public int available() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

827 return blockLen - readPos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

828 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

829

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

830 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

831 public boolean markSupported() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

832 return false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

833 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

834

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

835 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

836 public void mark(int readlimit) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

838 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

839

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

840 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

841 public void reset() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

843 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

844

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

845 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

847 * on the BufferedInputStream. We want to benefit from the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

848 * Buffered pre-fetching, but not dealing with half blocks.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

850 * data will greatly complicate matters, while a performance

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

851 * improvement is debatable given the relatively small size of

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

854 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

855 * @return false if reading the block failed due to EOF

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

856 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

858 int s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

859 int off = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

860

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

861 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

863 if (s == -1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

864 // if we have read something before, we should have been

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

865 // able to read the whole, so make this fatal

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

866 if (off > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

867 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

870 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

871 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

874 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

875 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

877 return false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

878 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

879 len -= s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

880 off += s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

881 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

882

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

883 return true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

884 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

885

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

886 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

888 * or writes the prompt in the buffer.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

889 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

890 * The blocked stream protocol consists of first a two byte

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

891 * integer indicating the length of the block, then the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

892 * block, followed by another length + block. The end of

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

894 * hence this length should be shifted to the right to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

895 * obtain the real length value first. We simply fetch

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

897 * read methods.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

898 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

900 * a block sequence, is communicated beyond the stream by

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

901 * inserting a prompt sequence on the stream after the last

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

904 * Reader that is possibly chained to this InputStream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

905 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

906 * If the stream is not positioned correctly, hell will break

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

907 * loose.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

908 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

909 private int readBlock() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

910 // read next two bytes (short)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

911 if (!_read(blklen, 2))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

912 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

913

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

914 // Get the short-value and store its value in blockLen.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

915 blockLen = (short)(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

918 );

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

919 readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

920

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

921 if (debug) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

924 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

926 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

927 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

928

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

930 // stack trace

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

931 if (blockLen > block.length)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

933 "larger than BLOCKsize: " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

935 if (!_read(block, blockLen))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

936 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

937

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

938 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

940

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

942 // prompt

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

945 // to terminate the block in a Reader

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

947 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

948 // insert 'fake' flush

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

951 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

952 logRd("inserting prompt");

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

953 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

954

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

955 return(blockLen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

956 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

957

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

958 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

959 public int read() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

960 if (available() == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

961 if (readBlock() == -1)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

962 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

963 }

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

964

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

965 if (debug)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

968 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

969

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

970 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

973 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

974

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

975 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

976 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:

977 int t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

978 int size = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

979 while (size < len) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

980 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

981 if (t == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

982 if (size != 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

983 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

985 if (size == 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

986 size = -1;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

987 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

988 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

989 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

990 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

991 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

993 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

994 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

995 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

996 size += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

997 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

999 readPos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1000 size += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1001 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1002 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1003 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1004 return size;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1005 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1006

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1007 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1008 public long skip(long n) throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1009 long skip = n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1010 int t = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1011 while (skip > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1012 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1013 if (skip > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1014 skip -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1015 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1016 readBlock();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1017 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1018 readPos += skip;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1019 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1020 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1021 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1022 return n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1023 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1024 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1025

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1026 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1029 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1030 public synchronized void close() {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1031 if (writer != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1032 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1033 writer.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1034 writer = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1035 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1036 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1037 if (reader != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1038 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1039 reader.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1040 reader = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1041 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1042 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1043 if (toMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1044 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1045 toMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1046 toMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1047 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1048 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1049 if (fromMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1050 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1051 fromMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1052 fromMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1053 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1054 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1055 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1056 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1057 con.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1058 con = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1059 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1060 }

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

1061 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

1062 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1063 log.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1064 log = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1065 } catch (IOException e) { /* ignore it */ }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1066 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1067 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1068

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1069 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1070 * Destructor called by garbage collector before destroying this

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1072 * been disconnected already.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1073 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1074 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1075 protected void finalize() throws Throwable {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1076 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1077 super.finalize();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1078 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1079

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1080

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1081 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

1085 * TX 152545124: Hello MonetDB!

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1086 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1087 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1089 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1090 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1092 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1093

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1094 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1098 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1099 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1101 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1102 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1104 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1105

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1106 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1111 * might look like:

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1112 * RX 152545124: Hi JDBC!

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1113 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1114 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1116 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1117 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1119 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1120 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1121

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1122 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1126 * received.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1127 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1128 * @param message the message to log

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1130 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1131 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1133 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1134 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents: