monetdb-java: src/main/java/org/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 *

716

aeb268156580 Updated Copyright year.

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

parents: 709

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

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

9 package org.monetdb.mcl.net;

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

14 import java.io.FilterInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

15 import java.io.FilterOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

16 import java.io.IOException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

17 import java.io.InputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

18 import java.io.OutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

19 import java.io.Writer;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

20 import java.net.*;

90c346571eb4 Use StandardCharsets.UTF_8 where possible

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 554

21 import java.nio.charset.StandardCharsets;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

22 import java.security.MessageDigest;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

23 import java.security.NoSuchAlgorithmException;

811

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 803

24 import java.util.*;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

25

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

26 import org.monetdb.mcl.MCLException;

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

27 import org.monetdb.mcl.io.BufferedMCLReader;

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

28 import org.monetdb.mcl.io.BufferedMCLWriter;

497

aed7f32e029a Refactor LineType to be an enum

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 495

29 import org.monetdb.mcl.io.LineType;

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

30 import org.monetdb.mcl.parser.MCLParseException;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

31

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

32 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

33 * A Socket for communicating with the MonetDB database in MAPI block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

34 * mode.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

35 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

37 * mode protocol, and interfaces it as a socket that delivers a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

39 * integral part of the MAPI protocol, the MapiSocket performs the login

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

40 * procedure. Like the Socket class, various options can be set before

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

43 * BufferedWriter can be retrieved.

194

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

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

parents: 180

44 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

45 * For each line read, it is determined what type of line it is

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

46 * according to the MonetDB MAPI protocol. This results in a line to be

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

48 * method on the BufferedMCLReader to retrieve the type of the last

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

49 * line read.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

50 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

52 * each and every interaction to and from the MonetDB server is logged

194

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

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

parents: 180

53 * to a file on disk.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

56 * decoded non-human readable messages are prefixed with "RD" and "TD"

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

57 * instead. Following this two char prefix, a timestamp follows as the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

58 * number of milliseconds since the UNIX epoch. The rest of the line is

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

59 * a String representation of the data sent or received.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

60 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

61 * The general use of this Socket must be seen only in the full context

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

62 * of a MAPI connection to a server. It has the same ingredients as a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

63 * normal Socket, allowing for seamless plugging.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

64 * <pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

66 * > o <

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

68 * </pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

70 * are interfaced, so they can be chained in any way. While the Socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

71 * transparently deals with how data is sent over the wire, the actual

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

72 * data read needs to be interpreted, for which a Reader/Writer

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

74 * implementations of those interfaces supply some extra functionality

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

75 * geared towards the format of the data.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

76 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

77 * @author Fabian Groffen

768

a80c21fe7bb2 Removed deprecated nl.cwi.monetdb.*.* classes and package.

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

parents: 756

78 * @version 4.3

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

79 * @see org.monetdb.mcl.io.BufferedMCLReader

f523727db392 Moved Java classes from packages starting with nl.cwi.monetdb.* to package org.monetdb.*

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

parents: 368

80 * @see org.monetdb.mcl.io.BufferedMCLWriter

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

81 */

768

a80c21fe7bb2 Removed deprecated nl.cwi.monetdb.*.* classes and package.

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

parents: 756

82 public final class MapiSocket {

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

83 /* an even number of NUL bytes used during the handshake */

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

84 private static final byte[] NUL_BYTES = new byte[]{ 0, 0, 0, 0, 0, 0, 0, 0, };

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

85

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

86 /* A mapping between hash algorithm names as used in the MAPI

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

87 * protocol, and the names by which the Java runtime knows them.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

88 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

89 private static final String[][] KNOWN_ALGORITHMS = new String[][] {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

90 {"SHA512", "SHA-512"},

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

91 {"SHA384", "SHA-384"},

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

92 {"SHA256", "SHA-256"},

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

93 // should we deprecate this by now?

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

94 {"SHA1", "SHA-1"},

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

95 };

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

96

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

97 // MUST be lowercase!

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

98 private static final char[] HEXDIGITS = "0123456789abcdef".toCharArray();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

99

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

100 /** Connection parameters */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

101 private Target target;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

102 /** The TCP Socket to mserver */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

103 private Socket con;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

105 private BlockInputStream fromMonet;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

107 private OutputStream toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

108 /** MCLReader on the InputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

109 private BufferedMCLReader reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

110 /** MCLWriter on the OutputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

111 private BufferedMCLWriter writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

112 /** protocol version of the connection */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

113 private int version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

114

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

115 /** Whether we should follow redirects */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

116 private boolean followRedirects = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

118 private int ttl = 10;

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

119

0

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

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

123 /** The blocksize (hardcoded in compliance with MonetDB common/stream/stream.h) */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

124 public final static int BLOCK = 8190;

0

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

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

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

133 target = new Target();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

134 con = null;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

140 * is also the default.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

141 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

142 * @param db the database

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

143 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

144 public void setDatabase(final String db) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

145 target.setDatabase(db);

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

149 * Sets the language to use for this connection.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

150 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

151 * @param lang the language

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

152 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

153 public void setLanguage(final String lang) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

154 target.setLanguage(lang);

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

161 * separating the hashes by commas.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

163 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

164 * @param hash the hash method to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

165 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

166 public void setHash(final String hash) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

167 target.setHash(hash);

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

173 * encountered during connect. The default bahaviour is to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

174 * automatically follow redirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

175 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

177 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

178 public void setFollowRedirects(final boolean r) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

179 this.followRedirects = r;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

180 }

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

183 * Sets the number of redirects that are followed when

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

187 * disable the following of redirects you should use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

188 * setFollowRedirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

189 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

190 * @see #setFollowRedirects(boolean r)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

192 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

193 public void setTTL(final int t) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

194 this.ttl = t;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

200 * useful to break out of this indefinite wait.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

202 * operation to have effect.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

203 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

205 * of zero will disable timeout (i.e., timeout of infinity).

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

206 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

207 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

208 public void setSoTimeout(final int s) throws SocketException {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

209 if (s < 0) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

210 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

211 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

212 target.setSoTimeout(s);

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

213 // limit time to wait on blocking operations

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

214 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

215 con.setSoTimeout(s);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

216 }

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

220 * Gets the SO_TIMEOUT from the underlying Socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

221 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

222 * @return the currently in use timeout in milliseconds

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

223 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

224 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

225 public int getSoTimeout() throws SocketException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

226 return target.getSoTimeout();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

227 }

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

228

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

229 /**

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

230 * Enables/disables debug mode with logging to file

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 * @param debug Value to set

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

233 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

234 public void setDebug(final boolean debug) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

235 target.setDebug(debug);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

236 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

237

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

241 * thrown when a redirect is encountered.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

242 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

225

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

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

parents: 200

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

245 * @param user the username

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

246 * @param pass the password

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

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

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

225

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

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

parents: 200

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

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

252 * @throws MCLParseException if bogus data is received

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

253 * @throws MCLException if an MCL related error occurs

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

254 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

256 throws IOException, SocketException, UnknownHostException, MCLParseException, MCLException

180

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

257 {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

258 target.setHost(host);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

259 target.setPort(port);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

260 target.setUser(user);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

261 target.setPassword(pass);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

262 return connect(target, null);

0

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

811

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 803

265 public List<String> connect(String url, Properties props) throws URISyntaxException, ValidationError, MCLException, MCLParseException, IOException {

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 803

266 return connect(new Target(url, props), null);

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 803

267 }

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 803

268

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

269 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

270 * Connect according to the settings in the 'target' parameter.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

271 * If followRedirect is false, a RedirectionException is

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

272 * thrown when a redirect is encountered.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

273 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

274 * Some settings, such as the initial reply size, can already be configured

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

275 * during the handshake, saving a command round-trip later on.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

276 * To do so, create and pass a subclass of {@link MapiSocket.OptionsCallback}.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

277 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

278 * @param target the connection settings

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

279 * @param callback will be called if the server allows options to be set during the

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

280 * initial handshake

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

281 * @return A List with informational (warning) messages. If this

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

282 * list is empty; then there are no warnings.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

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

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

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

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

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

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

286 * @throws MCLParseException if bogus data is received

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

287 * @throws MCLException if an MCL related error occurs

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

288 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

289 public List<String> connect(Target target, OptionsCallback callback) throws MCLException, MCLParseException, IOException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

290 // get rid of any earlier connection state, including the existing target

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

291 close();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

292 this.target = target;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

293

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

294 Target.Validated validated;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

295 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

296 validated = target.validate();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

297 } catch (ValidationError e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

298 throw new MCLException(e.getMessage());

0

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

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

301 if (validated.connectScan()) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

302 return scanUnixSockets(callback);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

303 }

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

304

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

305 ArrayList<String> warnings = new ArrayList<>();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

306 int attempts = 0;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

307 do {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

308 boolean ok = false;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

309 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

310 boolean done = tryConnect(callback, warnings);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

311 ok = true;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

312 if (done) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

313 return warnings;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

314 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

315 } finally {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

316 if (!ok)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

317 close();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

318 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

319 } while (attempts++ < this.ttl);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

320 throw new MCLException("max redirect count exceeded");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

321 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

322

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

323 private List<String> scanUnixSockets(OptionsCallback callback) throws MCLException, MCLParseException, IOException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

324 // Because we do not support Unix Domain sockets, we just go back to connect().

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

325 // target.connectScan() will now return false;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

326 target.setHost("localhost");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

327 return connect(target, callback);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

328 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

329

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

330 private boolean tryConnect(OptionsCallback callback, ArrayList<String> warningBuffer) throws MCLException, IOException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

331 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

332 // We need a valid target

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

333 Target.Validated validated = target.validate();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

334 // con will be non-null if the previous attempt ended in a redirect to mapi:monetdb://proxy

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

335 if (con == null)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

336 connectSocket(validated);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

337 return handshake(validated, callback, warningBuffer);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

338 } catch (IOException | MCLException e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

339 close();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

340 throw e;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

341 } catch (ValidationError e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

342 close();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

343 throw new MCLException(e.getMessage());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

344 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

345 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

346

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

347 private void connectSocket(Target.Validated validated) throws MCLException, IOException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

348 // This method performs steps 2-6 of the procedure outlined in the URL spec

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

349 String tcpHost = validated.connectTcp();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

350 if (tcpHost.isEmpty()) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

351 throw new MCLException("Unix domain sockets are not supported, only TCP");

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

352 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

353 int port = validated.connectPort();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

354 Socket sock = new Socket(tcpHost, port);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

355 sock.setSoTimeout(validated.getSoTimeout());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

356 sock.setTcpNoDelay(true);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

357 sock.setKeepAlive(true);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

358

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

359 sock = wrapTLS(sock, validated);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

360

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

361 fromMonet = new BlockInputStream(sock.getInputStream());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

362 toMonet = new BlockOutputStream(sock.getOutputStream());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

363 reader = new BufferedMCLReader(fromMonet, StandardCharsets.UTF_8);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

364 writer = new BufferedMCLWriter(toMonet, StandardCharsets.UTF_8);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

365 writer.registerReader(reader);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

366 reader.advance();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

367

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

368 // Only assign to sock when everything went ok so far

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

369 con = sock;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

370 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

371

800

09f463444dde TLS support in its most basic form

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 799

372 private Socket wrapTLS(Socket sock, Target.Validated validated) throws IOException {

801

88b3e8e89126 TLS seems to work

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 800

373 if (validated.getTls())

88b3e8e89126 TLS seems to work

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 800

374 return SecureSocket.wrap(validated, sock);

803

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

375 else {

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

376 // Send an even number of NUL bytes.

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

377 // We expect the server to speak MAPI and in that case, it's a NOP.

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

378 // If we're accidentally connecting to a TLS server, the bytes are

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

379 // invalid as a Client Hello message and most TLS implementations

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

380 // drop the connection.

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

381 // This is nice because otherwise we would hang, as the TLS server

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

382 // is waiting for us to send a TLS CLient Hello, and we are waiting

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

383 // for a MAPI server to send a server challenge.

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

384 sock.getOutputStream().write(NUL_BYTES);

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

385 }

1671f2eb130b Send NUL bytes on non-TLS connect

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 801

386 return sock;

801

88b3e8e89126 TLS seems to work

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 800

387 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

388

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

389 private boolean handshake(Target.Validated validated, OptionsCallback callback, ArrayList<String> warnings) throws IOException, MCLException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

390 String challenge = reader.getLine();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

391 reader.advance();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

392 if (reader.getLineType() != LineType.PROMPT)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

393 throw new MCLException("Garbage after server challenge: " + reader.getLine());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

394 String response = challengeResponse(validated, challenge, callback);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

395 writer.writeLine(response);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

396 reader.advance();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

397

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

398 // Process the response lines.

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

399 String redirect = null;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

400 StringBuilder errors = new StringBuilder();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

401 while (reader.getLineType() != LineType.PROMPT) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

402 switch (reader.getLineType()) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

403 case REDIRECT:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

404 if (redirect == null)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

405 redirect = reader.getLine(1);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

406 break;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

407 case ERROR:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

408 if (errors.length() > 0)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

409 errors.append("\n");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

410 errors.append(reader.getLine(7)); // 7 not 1!

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

411 break;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

412 case INFO:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

413 warnings.add(reader.getLine(1));

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

414 break;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

415 default:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

416 // ignore??!!

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

417 break;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

418 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

419 reader.advance();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

420 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

421 if (errors.length() > 0)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

422 throw new MCLException(errors.toString());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

423

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

424 if (redirect == null)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

425 return true; // we're happy

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

426

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

427 // process redirect

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

428 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

429 MonetUrlParser.parse(target, redirect);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

430 } catch (URISyntaxException | ValidationError e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

431 throw new MCLException("While processing redirect " + redirect + ": " + e.getMessage(), e);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

432 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

433 if (redirect.startsWith("mapi:merovingian://proxy")) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

434 // The reader is stuck at LineType.PROMPT but actually the

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

435 // next challenge is already there.

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

436 reader.resetLineType();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

437 reader.advance();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

438 } else {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

439 close();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

440 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

441

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

442 return false; // we need another go

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

443 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

444

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

445 private String challengeResponse(

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

446 Target.Validated validated, final String challengeLine,

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

447 OptionsCallback callback

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

448 ) throws MCLException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

449 // The challengeLine looks like this:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

450 //

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

451 // 45IYyVyRnbgEnK92ad:merovingian:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1:LIT:SHA512:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

452 // WgHIibSyH:mserver:9:RIPEMD160,SHA512,SHA384,SHA256,SHA224,SHA1:LIT:SHA512:sql=6:BINARY=1:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

453 // 0 1 2 3 4 5 6 7

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

454

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

455 String parts[] = challengeLine.split(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

456 if (parts.length < 3)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

457 throw new MCLException("Invalid challenge: expect at least 3 fields");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

458 String challengePart = parts[0];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

459 String serverTypePart = parts[1];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

460 String versionPart = parts[2];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

461 int version;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

462 if (versionPart.equals("9"))

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

463 version = 9;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

464 else

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

465 throw new MCLException("Protocol versions other than 9 are note supported: " + versionPart);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

466 if (parts.length < 6)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

467 throw new MCLException("Protocol version " + version + " requires at least 6 fields, found " + parts.length + ": " + challengeLine);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

468 String serverHashesPart = parts[3];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

469 // String endianPart = parts[4];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

470 String passwordHashPart = parts[5];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

471 String optionsPart = parts.length > 6 ? parts[6] : null;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

472 // String binaryPart = parts.length > 7 ? parts[7] : null;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

473

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

474 String userResponse;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

475 String password = target.getPassword();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

476 if (serverTypePart.equals("merovingian") && !target.getLanguage().equals("control")) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

477 userResponse = "merovingian";

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

478 password = "merovingian";

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

479 } else {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

480 userResponse = target.getUser();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

481 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

482 String passwordResponse = hashPassword(challengePart, password, passwordHashPart, validated.getHash(), serverHashesPart);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

483

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

484 String optionsResponse = handleOptions(callback, optionsPart);

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

485

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

486 // Response looks like this:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

487 //

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

488 // LIT:monetdb:{RIPEMD160}f2236256e5a9b20a5ecab4396e36c14f66c3e3c5:sql:demo

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

489 // :FILETRANS:auto_commit=1,reply_size=1000,size_header=0,columnar_protocol=0,time_zone=3600:

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

490 StringBuilder response = new StringBuilder(80);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

491 response.append("BIG:");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

492 response.append(userResponse).append(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

493 response.append(passwordResponse).append(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

494 response.append(validated.getLanguage()).append(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

495 response.append(validated.getDatabase()).append(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

496 response.append("FILETRANS:");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

497 response.append(optionsResponse).append(":");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

498

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

499 return response.toString();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

500 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

502 // challengePart, passwordHashPart, supportedHashesPart, target.getPassword()

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

503 private String hashPassword(String challenge, String password, String passwordAlgo, String configuredHashes, String serverSupportedAlgos) throws MCLException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

504 int maxHashLength = 512;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

505

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

506 StringBuilder output = new StringBuilder(10 + maxHashLength / 4);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

507 MessageDigest passwordDigest = pickBestAlgorithm(Collections.singleton(passwordAlgo), output);

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

510 if (!configuredHashes.isEmpty()) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

512 algoSet.retainAll(keep);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

513 if (algoSet.isEmpty()) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

514 throw new MCLException("None of the hash algorithms <" + configuredHashes + "> are supported, server only supports <" + serverSupportedAlgos + ">");

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

515 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

516 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

517 MessageDigest challengeDigest = pickBestAlgorithm(algoSet, null);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

518

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

519 // First we use the password algo to hash the password.

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

520 // Then we use the challenge algo to hash the combination of the resulting hash digits and the challenge.

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

521 StringBuilder intermediate = new StringBuilder(maxHashLength / 4 + challenge.length());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

522 hexhash(intermediate, passwordDigest, password);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

523 intermediate.append(challenge);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

524 hexhash(output, challengeDigest, intermediate.toString());

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

525 return output.toString();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

526 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

527

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

528 private MessageDigest pickBestAlgorithm(Set<String> algos, StringBuilder appendPrefixHere) throws MCLException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

529 for (String[] choice: KNOWN_ALGORITHMS) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

530 String mapiName = choice[0];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

531 String algoName = choice[1];

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

532 MessageDigest digest;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

533 if (!algos.contains(mapiName))

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

534 continue;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

535 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

536 digest = MessageDigest.getInstance(algoName);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

537 } catch (NoSuchAlgorithmException e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

538 continue;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

539 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

540 // we found a match

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

541 if (appendPrefixHere != null) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

542 appendPrefixHere.append('{');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

543 appendPrefixHere.append(mapiName);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

544 appendPrefixHere.append('}');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

545 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

546 return digest;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

547 }

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

548 String algoNames = String.join(",", algos);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

549 throw new MCLException("No supported hash algorithm: " + algoNames);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

550 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

551

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

552 private void hexhash(StringBuilder buffer, MessageDigest digest, String text) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

553 byte[] bytes = text.getBytes(StandardCharsets.UTF_8);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

554 digest.update(bytes);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

555 byte[] output = digest.digest();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

556 for (byte b: output) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

557 int hi = (b & 0xF0) >> 4;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

558 int lo = b & 0x0F;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

559 buffer.append(HEXDIGITS[hi]);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

560 buffer.append(HEXDIGITS[lo]);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

561 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

562 }

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

563

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

564 private String handleOptions(OptionsCallback callback, String optionsPart) throws MCLException {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

565 if (callback == null || optionsPart == null || optionsPart.isEmpty())

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

566 return "";

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

567

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

568 StringBuilder buffer = new StringBuilder();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

569 callback.setBuffer(buffer);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

570 for (String optlevel: optionsPart.split(",")) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

571 int eqindex = optlevel.indexOf('=');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

572 if (eqindex < 0)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

573 throw new MCLException("Invalid options part in server challenge: " + optionsPart);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

574 String lang = optlevel.substring(0, eqindex);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

575 int level;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

576 try {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

577 level = Integer.parseInt(optlevel.substring(eqindex + 1));

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

578 } catch (NumberFormatException e) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

579 throw new MCLException("Invalid option level in server challenge: " + optlevel);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

580 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

581 callback.addOptions(lang, level);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

582 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

583

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

584 return buffer.toString();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

585 }

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

586

0

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 * Returns an InputStream that reads from this open connection on

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

589 * the MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

590 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

592 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

593 public InputStream getInputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

594 return fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

595 }

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 * Returns an output stream for this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

599 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

601 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

602 public OutputStream getOutputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

603 return toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

604 }

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 * Returns a Reader for this MapiSocket. The Reader is a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

608 * BufferedMCLReader which does protocol interpretation of the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

609 * BlockInputStream produced by this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

610 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

611 * @return a BufferedMCLReader connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

612 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

613 public BufferedMCLReader getReader() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

614 return reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

615 }

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:

617 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

619 * BufferedMCLWriter which produces protocol compatible data blocks

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

620 * that the BlockOutputStream can properly translate into blocks.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

621 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

622 * @return a BufferedMCLWriter connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

623 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

624 public BufferedMCLWriter getWriter() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

625 return writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

626 }

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 * Returns the mapi protocol version used by this socket. The

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

631 * MapiSocket should check this version to act appropriately.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

632 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

633 * @return the mapi protocol version

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

634 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

635 public int getProtocolVersion() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

636 return version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

637 }

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

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

642 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

643 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

644 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

647 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

648 public void debug(final String filename) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

649 debug(new FileWriter(filename));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

650 }

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

651

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

652 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

655 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

656 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

657 *

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

658 * @param out to write the log to a print stream

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

660 */

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

661 // disabled as it is not used by JDBC driver code

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

662 // public void debug(PrintStream out) throws IOException {

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

663 // debug(new PrintWriter(out));

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

674 public void debug(final Writer out) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

675 log = out;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

676 setDebug(true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

677 }

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

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

680 * Get the log Writer.

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

681 *

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

682 * @return the log writer

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

683 */

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

684 public Writer getLogWriter() {

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

685 return log;

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

686 }

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

687

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

688 /**

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

689 * Writes a logline tagged with a timestamp using the given type and message

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

690 * and optionally flushes afterwards.

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

691 *

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

693 * connected to reading (RD or RX) or writing (TD or TX) to the socket.

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

694 * R=Receive, T=Transmit, D=Data, X=??

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

695 *

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

696 * @param type message type: either RD, RX, TD or TX

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

697 * @param message the message to log

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

698 * @param flush whether we need to flush buffered data to the logfile.

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

700 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

701 private final void log(final String type, final String message, final boolean flush) throws IOException {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

702 log.write(type + System.currentTimeMillis() + ": " + message + "\n");

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

703 if (flush)

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

704 log.flush();

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

705 }

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

706

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

707 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

708 * For internal use

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

709 *

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

710 * @param b to enable/disable insert 'fake' newline and prompt

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

711 * @return previous setting

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

712 */

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

713 public boolean setInsertFakePrompts(boolean b) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

714 return fromMonet.setInsertFakePrompts(b);

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

715 }

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

716

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

717 public boolean isDebug() {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

718 return target.isDebug();

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

719 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

720

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

721 /**

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

728 * being written to the stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

729 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

730 final class BlockOutputStream extends FilterOutputStream {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

731 private int writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

732 private int blocksize = 0;

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

733 private final byte[] block = new byte[BLOCK];

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

734

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

735 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

736 * Constructs this BlockOutputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

737 * OutputStream. A BufferedOutputStream is internally used.

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

738 * @param out an OutputStream

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

739 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

740 public BlockOutputStream(final OutputStream out) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

743 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

744 super(new BufferedOutputStream(out));

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

748 public void flush() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

750 writeBlock(true);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

751 out.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

752

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

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

758 // let it go so there is feedback about something going wrong

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

759 if (isDebug()) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

760 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

761 }

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

768 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

769 * @param last whether this is the last block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

770 * @throws IOException if writing to the stream failed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

771 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

772 public void writeBlock(final boolean last) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

773 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

775 blocksize = (short)writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

780 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

782 blocksize = (short)BLOCK;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

783 // another block will follow, encode least

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

787 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

788

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

789 out.write(blklen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

790 // write the actual block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

792

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

793 if (isDebug()) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

794 if (last) {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

795 log("TD ", "write final block: " + writePos + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

796 } else {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

797 log("TD ", "write block: " + writePos + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

798 }

90c346571eb4 Use StandardCharsets.UTF_8 where possible

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 554

799 log("TX ", new String(block, 0, writePos, StandardCharsets.UTF_8), true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

800 }

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

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

806 public void write(final int b) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

807 if (writePos == BLOCK) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

808 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

809 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

811 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

812

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

813 @Override

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

816 }

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

820 while (len > 0) {

556

87feb93330a6 Misc. changes suggested by analysis tool

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 555

821 int t = BLOCK - writePos;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

822 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

824 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

825 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

826 writePos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

827 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

828 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

830 writePos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

831 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

832 }

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

836 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

837 public void close() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

840 out.close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

841 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

842 }

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

847 * available as a normal stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

848 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

849 final class BlockInputStream extends FilterInputStream {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

850 private int readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

851 private int blockLen = 0;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

852 private boolean wasEndBlock = false;

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

854 private boolean insertFakePrompts = true;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

855

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 * Constructs this BlockInputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

858 * InputStream. A BufferedInputStream is internally used.

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

859 * @param in an InputStream

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

860 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

861 public BlockInputStream(final InputStream in) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

864 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

865 super(new BufferedInputStream(in));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

866 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

867

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

868 public boolean setInsertFakePrompts(boolean doFake) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

869 boolean old = insertFakePrompts;

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

870 insertFakePrompts = doFake;

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

871 return old;

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

872 }

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

873

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

874 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

875 public int available() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

876 return blockLen - readPos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

877 }

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

880 public boolean markSupported() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

881 return false;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

884 @Override

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

885 public void mark(final int readlimit) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

887 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

888

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

889 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

890 public void reset() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

892 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

893

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

894 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

899 * data will greatly complicate matters, while a performance

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

900 * improvement is debatable given the relatively small size of

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

903 *

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

904 * @param b a byte array to store read bytes

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

905 * @param len number of bytes to read

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

907 * @throws IOException if an IO error occurs while reading

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

908 */

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

910 int s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

911 int off = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

912 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

914 if (s == -1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

917 if (off > 0) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

918 if (isDebug()) {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

919 log("RD ", "the following incomplete block was received:", false);

90c346571eb4 Use StandardCharsets.UTF_8 where possible

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 554

920 log("RX ", new String(b, 0, off, StandardCharsets.UTF_8), true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

921 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

922 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

925 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

926 if (isDebug())

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

927 log("RD ", "server closed the connection (EOF)", true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

928 return false;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

929 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

930 len -= s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

931 off += s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

932 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

933

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

934 return true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

935 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

936

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

939 * or writes the prompt in the buffer.

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 * The blocked stream protocol consists of first a two byte

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

948 * read methods.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

949 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

955 * Reader that is possibly chained to this InputStream.

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 * If the stream is not positioned correctly, hell will break

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

958 * loose.

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

959 *

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

960 * @return blockLen

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

961 * @throws IOException if an IO error occurs while reading

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

962 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

963 private int readBlock() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

964 // read next two bytes (short)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

965 if (!_read(blklen, 2))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

966 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

967

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

969 blockLen = (short)(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

972 );

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

973 wasEndBlock = (blklen[0] & 0x1) == 1;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

974

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

975 readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

976

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

977 if (isDebug()) {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

978 if (wasEndBlock) {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

979 log("RD ", "read final block: " + blockLen + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

980 } else {

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

981 log("RD ", "read new block: " + blockLen + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

982 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

983 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

984

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

986 // stack trace

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

987 if (blockLen > block.length)

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

988 throw new IOException("Server sent a block larger than BLOCKsize: " +

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

990 if (!_read(block, blockLen))

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

991 return -1;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

992

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

993 if (isDebug())

90c346571eb4 Use StandardCharsets.UTF_8 where possible

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 554

994 log("RX ", new String(block, 0, blockLen, StandardCharsets.UTF_8), true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

995

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

996 // if this is the last block, make it end with a newline and prompt

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

997 if (wasEndBlock) {

537

242debd7e866 Fix mistake in comment

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 535

998 // insert 'fake' newline and prompt

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

999 if (insertFakePrompts) {

507

1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 502

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

1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 502

1001 // to terminate the block in a Reader

1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 502

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

1db3398b78f7 If we don't want a fake prompt we probably also don't want a fake newline

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 502

1003 }

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

1004 for (byte b : LineType.PROMPT.bytes()) {

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

1005 block[blockLen++] = b;

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

1006 }

eaad79c3235f Make the fake prompts at block ends optional

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 498

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

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1008 if (isDebug()) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1009 log("RD ", "inserting prompt", true);

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1010 }

498

4cfe4991ee63 Use the prompt characters from mapi_prompt.h

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 497

1011 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1012 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1013

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

1014 return blockLen;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1015 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1016

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1017 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1018 public int read() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1019 if (available() == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1020 if (readBlock() == -1)

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

1021 return -1;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1022 }

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

1023

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1024 if (isDebug())

90c346571eb4 Use StandardCharsets.UTF_8 where possible

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 554

1025 log("RX ", new String(block, readPos, 1, StandardCharsets.UTF_8), true);

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

1026

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1028 }

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1033 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1034

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1035 @Override

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1037 int t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1038 int size = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1039 while (size < len) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1040 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1041 if (t == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1042 if (size != 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1043 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1045 if (size == 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1046 size = -1;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1047 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1048 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1049 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1050 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1051 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1053 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1054 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1055 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1056 size += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1057 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1059 readPos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1060 size += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1061 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1062 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1063 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1064 return size;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1065 }

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

bb273e9c7e09 Add "final" keyword to classes, method arguments and local variables where possible.

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

parents: 281

1068 public long skip(final long n) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1069 long skip = n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1070 while (skip > 0) {

556

87feb93330a6 Misc. changes suggested by analysis tool

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 555

1071 int t = available();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1072 if (skip > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1073 skip -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1074 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1075 readBlock();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1076 } else {

756

a39d3a45da56 Resolve warning: [lossy-conversions] implicit cast from long to int in compound assignment is possibly lossy

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

parents: 750

1077 readPos += (int)skip;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1078 break;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1082 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1083

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1084 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1085 * For internal use

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1086 * @return new Raw object

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1087 */

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1088 Raw getRaw() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1089 return new Raw();

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1090 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1091

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1092 /** An alternative I/O interface that exposes the block based nature of the MAPI protocol */

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1093 final class Raw {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1094 byte[] getBytes() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1095 return block;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1096 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1097

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1098 int getLength() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1099 return blockLen;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1100 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1101

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1102 int getPosition() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1103 return readPos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1104 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1105

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1106 int consume(int delta) {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1107 int pos = readPos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1108 readPos += delta;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1109 return pos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1110 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1111

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1112 int readBlock() throws IOException {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1113 boolean wasFaking = setInsertFakePrompts(false);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1114 try {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1115 return BlockInputStream.this.readBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1116 } finally {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1117 setInsertFakePrompts(wasFaking);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1118 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1119 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1120

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1121 boolean wasEndBlock() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1122 return wasEndBlock;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1123 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1124 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1125 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1126

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1127 /**

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

1128 * Closes the streams and socket connected to the server if possible.

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

1129 * If an error occurs at closing a resource, it is ignored so as many

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

1130 * resources as possible are closed.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1131 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1132 public synchronized void close() {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1133 if (writer != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1134 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1135 writer.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1136 writer = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1138 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1139 if (reader != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1140 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1141 reader.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1142 reader = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1144 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1145 if (toMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1146 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1147 toMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1148 toMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1150 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1151 if (fromMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1152 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1153 fromMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1154 fromMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1156 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1157 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1158 try {

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

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

parents: 276

1159 con.close(); // close the socket

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1160 con = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1162 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1163 if (isDebug() && log != null && log instanceof FileWriter) {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1164 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1165 log.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

1166 log = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1168 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1169 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1170

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1171 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1172 * Return an UploadStream for use with for example COPY FROM filename ON CLIENT.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1173 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1174 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1175 *

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1176 * @param chunkSize chunk size for the upload stream

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1177 * @return UploadStream new upload stream with the given chunk size

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1178 */

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1179 public UploadStream uploadStream(int chunkSize) {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1180 return new UploadStream(chunkSize);

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1181 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1182

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1183 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1184 * Return an UploadStream for use with for example COPY FROM filename ON CLIENT.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1185 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1186 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1187 *

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1188 * @return UploadStream new upload stream

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1189 */

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1190 public UploadStream uploadStream() {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1191 return new UploadStream();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1192 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1193

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1194 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1195 * Return a DownloadStream for use with for example COPY INTO filename ON CLIENT

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1196 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1197 * Building block for {@link org.monetdb.jdbc.MonetConnection.DownloadHandler}.

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1198 *

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1199 * @param prependCr convert \n to \r\n

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1200 * @return DownloadStream new download stream

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1201 */

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1202 public DownloadStream downloadStream(boolean prependCr) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1203 return new DownloadStream(fromMonet.getRaw(), toMonet, prependCr);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1204 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1205

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1206

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1207 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1208 * Stream of data sent to the server

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1209 *

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1210 * Building block for {@link org.monetdb.jdbc.MonetConnection.UploadHandler}.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1211 *

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1212 * An UploadStream has a chunk size. Every chunk size bytes, the server gets

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1213 * the opportunity to abort the upload.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1214 */

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1215 public class UploadStream extends FilterOutputStream {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1216 public final static int DEFAULT_CHUNK_SIZE = 1024 * 1024;

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1217 private final int chunkSize;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1218 private boolean closed = false;

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1219 private boolean serverCancelled = false;

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1220 private int chunkLeft;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1221 private byte[] promptBuffer;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1222 private Runnable cancellationCallback = null;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1223

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1224 /**

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1225 * Create an UploadStream with the given chunk size

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1226 * @param chunkSize chunk size for the upload stream

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1227 */

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1228 UploadStream(final int chunkSize) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1229 super(toMonet);

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1230 if (chunkSize <= 0) {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1231 throw new IllegalArgumentException("chunk size must be positive");

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1232 }

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1233 this.chunkSize = chunkSize;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1234 assert LineType.MORE.bytes().length == LineType.FILETRANSFER.bytes().length;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1235 int promptLen = LineType.MORE.bytes().length;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1236 promptBuffer = new byte[promptLen + 1];

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1237 chunkLeft = this.chunkSize;

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1238 }

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1239

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1240 /** Create an UploadStream with the default chunk size */

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1241 UploadStream() {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1242 this(DEFAULT_CHUNK_SIZE);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1243 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1244

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1245 /** Set a callback to be invoked if the server cancels the upload

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1246 *

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

1247 * @param cancellationCallback callback to call

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1248 */

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1249 public void setCancellationCallback(final Runnable cancellationCallback) {

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1250 this.cancellationCallback = cancellationCallback;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1251 }

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1252

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1253 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1254 public void write(final int b) throws IOException {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1255 if (serverCancelled) {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1256 // We have already thrown an exception and apparently that has been ignored.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1257 // Probably because they're calling print methods instead of write.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1258 // Throw another one, maybe they'll catch this one.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1259 throw new IOException("Server aborted the upload");

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1260 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1261 handleChunking();

612

1d44b8a577ca write to out, not to super when implementing FilterOutputStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 610

1262 out.write(b);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1263 wrote(1);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1264 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1265

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1266 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

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

612

1d44b8a577ca write to out, not to super when implementing FilterOutputStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 610

1268 this.write(b, 0, b.length);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1269 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1270

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1271 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

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

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1273 if (serverCancelled) {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1274 // We have already thrown an exception and apparently that has been ignored.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1275 // Probably because they're calling print methods instead of write.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1276 // Throw another one, maybe they'll catch this one.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1277 throw new IOException("Server aborted the upload");

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1278 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1279 while (len > 0) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1280 handleChunking();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1281 int toWrite = Integer.min(len, chunkLeft);

612

1d44b8a577ca write to out, not to super when implementing FilterOutputStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 610

1282 out.write(b, off, toWrite);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1283 off += toWrite;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1284 len -= toWrite;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1285 wrote(toWrite);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1286 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1287 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1288

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1289 @Override

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1290 public void flush() throws IOException {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1291 // suppress flushes

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1292 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1293

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1294 @Override

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1295 public void close() throws IOException {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1296 if (closed) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1297 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1298 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1299 closed = true;

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1300

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1301 if (serverCancelled)

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1302 closeAfterServerCancelled();

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1303 else

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1304 closeAfterSuccesfulUpload();

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1305 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1306

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1307 private void closeAfterSuccesfulUpload() throws IOException {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1308 if (chunkLeft != chunkSize) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1309 // flush pending data

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1310 flushAndReadPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1311 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1312 // send empty block

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1313 out.flush();

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1314 final LineType acknowledgement = readPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1315 if (acknowledgement != LineType.FILETRANSFER) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1316 throw new IOException("Expected server to acknowledge end of file");

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1317 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1318 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1319

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1320 private void closeAfterServerCancelled() {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1321 // nothing to do here, we have already read the error prompt.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1322 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1323

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1324 private void wrote(final int i) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1325 chunkLeft -= i;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1326 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1327

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1328 private void handleChunking() throws IOException {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1329 if (chunkLeft > 0) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1330 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1331 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1332 flushAndReadPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1333 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1334

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1335 private void flushAndReadPrompt() throws IOException {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1336 out.flush();

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1337 chunkLeft = chunkSize;

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1338 final LineType lineType = readPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1339 switch (lineType) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1340 case MORE:

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1341 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1342 case FILETRANSFER:

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1343 // Note, if the caller is calling print methods instead of write, the IO exception gets hidden.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1344 // This is unfortunate but there's nothing we can do about it.

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1345 serverCancelled = true;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1346 if (cancellationCallback != null) {

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1347 cancellationCallback.run();

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1348 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1349 throw new IOException("Server aborted the upload");

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1350 default:

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1351 throw new IOException("Expected MORE/DONE from server, got " + lineType);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1352 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1353 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1354

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1355 private LineType readPrompt() throws IOException {

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1356 final int nread = fromMonet.read(promptBuffer);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1357 if (nread != promptBuffer.length || promptBuffer[promptBuffer.length - 1] != '\n') {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1358 throw new IOException("server return incomplete prompt");

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1359 }

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1360 return LineType.classify(promptBuffer);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1361 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1362 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1363

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1364

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1365 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1366 * Stream of data received from the server

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1367 *

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1368 * Building block for {@link org.monetdb.jdbc.MonetConnection.DownloadHandler}.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1369 */

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1370 public static class DownloadStream extends InputStream {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1371 private final BlockInputStream.Raw rawIn;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1372 private final OutputStream out;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1373 private final boolean prependCr;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1374 private boolean endBlockSeen = false;

547

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1375 private boolean closed = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1376 private boolean newlinePending = false; // used for crlf conversion

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1377

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1378 DownloadStream(BlockInputStream.Raw rawIn, OutputStream out, boolean prependCr) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1379 this.rawIn = rawIn;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1380 this.out = out;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1381 this.prependCr = prependCr;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1382 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1383

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1384 void nextBlock() throws IOException {

547

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1385 if (endBlockSeen || closed)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1386 return;

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1387 final int ret = rawIn.readBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1388 if (ret < 0 || rawIn.wasEndBlock()) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1389 endBlockSeen = true;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1390 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1391 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1392

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1393 @Override

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1394 public void close() throws IOException {

547

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1395 if (closed)

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1396 return;

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1397 closed = true;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1398 while (!endBlockSeen) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1399 nextBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1400 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1401 // Send acknowledgement to server

512

a4000e374a43 Fix silly mistake

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 511

1402 out.write('\n');

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1403 out.flush();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1404 // Do whatever super has to do

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1405 super.close();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1406 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1407

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1408 @Override

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1409 public int read() throws IOException {

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1410 final byte[] buf = { 0 };

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1411 final int nread = read(buf, 0, 1);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1412 if (nread == 1)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1413 return buf[0];

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1414 else

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1415 return -1;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1416 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1417

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1418 @Override

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1419 public int read(final byte[] dest, int off, int len) throws IOException {

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

1420 final int origOff = off;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1421 int end = off + len;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1422

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1423 while (off < end) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1424 // minimum of what's requested and what we have in stock

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1425 int chunk = Integer.min(end - off, rawIn.getLength() - rawIn.getPosition());

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1426 assert chunk >= 0;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1427 if (chunk == 0) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1428 // make progress by fetching more data

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1429 if (endBlockSeen)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1430 break;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1431 nextBlock();

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1432 continue;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1433 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1434 // make progress copying some bytes

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1435 if (!prependCr) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1436 // no conversion needed, use arraycopy

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1437 System.arraycopy(rawIn.getBytes(), rawIn.getPosition(), dest, off, chunk);

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1438 off += chunk;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1439 rawIn.consume(chunk);

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1440 } else {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1441 int chunkEnd = off + chunk;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1442 if (newlinePending && off < chunkEnd) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1443 // we were in the middle of a line ending conversion

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1444 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1445 newlinePending = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1446 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1447 while (off < chunkEnd) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1448 byte b = rawIn.getBytes()[rawIn.consume(1)];

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1449 if (b != '\n') {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1450 dest[off++] = b;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1451 } else if (chunkEnd - off >= 2) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1452 dest[off++] = '\r';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1453 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1454 } else {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1455 dest[off++] = '\r';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1456 newlinePending = true;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1457 break;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1458 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1459 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1460 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1461 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1462

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1463 if (off < end && newlinePending) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1464 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1465 newlinePending = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1466 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1467

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1468 if (off == origOff && endBlockSeen)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1469 return -1;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1470 else

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1471 return off - origOff;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1472 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1473 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1474

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1475 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1476 * Callback used during the initial MAPI handshake.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1477 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1478 * Newer MonetDB versions allow setting some options during the handshake.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1479 * The options are language-specific and each has a 'level'. The server

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1480 * advertises up to which level options are supported for a given language

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1481 * and for each language/option combination, {@link addOptions} will be invoked.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1482 * It should call {@link contribute} for each option it wants to set.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1483 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1484 * At the time of writing, only the 'sql' language supports options,

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1485 * they are listed in enum mapi_handshake_options_levels in mapi.h.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1486 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1487 public static abstract class OptionsCallback {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1488 private StringBuilder buffer;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1489

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1490 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1491 * Callback called for each language/level combination supported by the

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1492 * server. May call {@link contribute} for options with a level STRICTLY

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1493 * LOWER than the level passed as a parameter.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1494 * @param lang language advertised by the server

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1495 * @param level one higher than the maximum supported option

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1496 */

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1497 public abstract void addOptions(String lang, int level);

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1498

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1499 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1500 * Pass option=value during the handshake

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1501 * @param field

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1502 * @param value

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1503 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1504 protected void contribute(String field, int value) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1505 if (buffer.length() > 0)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1506 buffer.append(',');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1507 buffer.append(field);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1508 buffer.append('=');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1509 buffer.append(value);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1510 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1511

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1512

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1513 void setBuffer(StringBuilder buf) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1514 buffer = buf;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1515 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1516 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents: