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

1 /*

833

e890195256ac Update copyright for the new year, move to MonetDB Foundation, add SPDX.

Sjoerd Mullender <sjoerd@acm.org>

parents: 816

2 * SPDX-License-Identifier: MPL-2.0

e890195256ac Update copyright for the new year, move to MonetDB Foundation, add SPDX.

Sjoerd Mullender <sjoerd@acm.org>

parents: 816

3 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

7 *

833

e890195256ac Update copyright for the new year, move to MonetDB Foundation, add SPDX.

Sjoerd Mullender <sjoerd@acm.org>

parents: 816

e890195256ac Update copyright for the new year, move to MonetDB Foundation, add SPDX.

Sjoerd Mullender <sjoerd@acm.org>

parents: 816

9 * Copyright August 2008 - 2023 MonetDB B.V.;

e890195256ac Update copyright for the new year, move to MonetDB Foundation, add SPDX.

Sjoerd Mullender <sjoerd@acm.org>

parents: 816

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

11 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

12

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

13 package org.monetdb.mcl.net;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

14

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

15 import java.io.BufferedInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

16 import java.io.BufferedOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

17 import java.io.FileWriter;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

18 import java.io.FilterInputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

19 import java.io.FilterOutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

20 import java.io.IOException;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

21 import java.io.InputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

22 import java.io.OutputStream;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

23 import java.io.Writer;

5bfe3357fb1c Use the new url parser

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

parents: 768

24 import java.net.*;

90c346571eb4 Use StandardCharsets.UTF_8 where possible

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

parents: 554

25 import java.nio.charset.StandardCharsets;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

26 import java.security.MessageDigest;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

27 import java.security.NoSuchAlgorithmException;

811

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

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

parents: 803

28 import java.util.*;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

29

a2b1ae53565e Improve error messages

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

parents: 839

30 import javax.net.ssl.SSLException;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

31

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

32 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

33 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

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

497

aed7f32e029a Refactor LineType to be an enum

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

parents: 495

35 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

37

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

38 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

40 * mode.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

41 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

49 * BufferedWriter can be retrieved.

194

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

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

parents: 180

50 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

55 * line read.

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

56 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

59 * to a file on disk.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

66 *

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

69 * normal Socket, allowing for seamless plugging.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

70 * <pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

72 * > o <

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

74 * </pre>

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

80 * implementations of those interfaces supply some extra functionality

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

81 * geared towards the format of the data.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

82 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

83 * @author Fabian Groffen

768

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

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

parents: 756

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

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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

87 */

768

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

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

parents: 756

88 public final class MapiSocket {

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

4d80fd66541d formatting

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

parents: 846

90 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

91

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

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

94 */

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

99 // should we deprecate this by now?

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

101 };

5bfe3357fb1c Use the new url parser

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

parents: 768

102

5bfe3357fb1c Use the new url parser

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

parents: 768

103 // MUST be lowercase!

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

105

5bfe3357fb1c Use the new url parser

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

parents: 768

106 /** Connection parameters */

5bfe3357fb1c Use the new url parser

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

parents: 768

107 private Target target;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

108 /** The TCP Socket to mserver */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

109 private Socket con;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

111 private BlockInputStream fromMonet;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

113 private OutputStream toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

114 /** MCLReader on the InputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

115 private BufferedMCLReader reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

116 /** MCLWriter on the OutputStream */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

117 private BufferedMCLWriter writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

118 /** protocol version of the connection */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

119 private int version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

120

836

aad275e042b2 Heed followRedirect

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

parents: 835

121 /** Whether we should follow redirects.

aad275e042b2 Heed followRedirect

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

parents: 835

122 * Not sure why this needs to be separate

aad275e042b2 Heed followRedirect

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

parents: 835

123 * from 'ttl' but someone someday explicitly documented setTtl

aad275e042b2 Heed followRedirect

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

parents: 835

124 * with 'to disable completely, use followRedirects' so

aad275e042b2 Heed followRedirect

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

parents: 835

125 * apparently there is a use case.

aad275e042b2 Heed followRedirect

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

parents: 835

126 */

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

127 private boolean followRedirects = true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

129 private int ttl = 10;

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

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

parents: 276

130

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

132 private Writer log;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

133

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

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

parents: 276

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

135 public final static int BLOCK = 8190;

0

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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

139

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

140 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

141 * Constructs a new MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

142 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

143 public MapiSocket() {

5bfe3357fb1c Use the new url parser

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

parents: 768

144 target = new Target();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

145 con = null;

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 database to connect to. If database is null, a

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

151 * is also the default.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

152 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

153 * @param db the database

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

154 */

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

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

parents: 281

155 public void setDatabase(final String db) {

5bfe3357fb1c Use the new url parser

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

parents: 768

156 target.setDatabase(db);

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

159 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

160 * Sets the language to use for this connection.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

161 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

162 * @param lang the language

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

163 */

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

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

parents: 281

164 public void setLanguage(final String lang) {

5bfe3357fb1c Use the new url parser

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

parents: 768

165 target.setLanguage(lang);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

166 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

167

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

168 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

172 * separating the hashes by commas.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

174 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

175 * @param hash the hash method to use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

176 */

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

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

parents: 281

177 public void setHash(final String hash) {

5bfe3357fb1c Use the new url parser

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

parents: 768

178 target.setHash(hash);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

179 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

184 * encountered during connect. The default bahaviour is to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

185 * automatically follow redirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

186 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

188 */

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

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

parents: 281

189 public void setFollowRedirects(final boolean r) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

190 this.followRedirects = r;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

191 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

192

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

193 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

194 * Sets the number of redirects that are followed when

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

198 * disable the following of redirects you should use

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

199 * setFollowRedirects.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

200 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

201 * @see #setFollowRedirects(boolean r)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

203 */

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

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

parents: 281

204 public void setTTL(final int t) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

205 this.ttl = t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

206 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

207

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

208 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

211 * useful to break out of this indefinite wait.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

213 * operation to have effect.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

214 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

217 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

218 */

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

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

parents: 281

219 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

220 if (s < 0) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

221 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

222 }

5bfe3357fb1c Use the new url parser

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

parents: 768

223 target.setSoTimeout(s);

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

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

parents: 276

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

225 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

226 con.setSoTimeout(s);

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

227 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

228 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

229

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

230 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

231 * Gets the SO_TIMEOUT from the underlying Socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

232 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

233 * @return the currently in use timeout in milliseconds

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

234 * @throws SocketException Issue with the socket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

235 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

236 public int getSoTimeout() throws SocketException {

5bfe3357fb1c Use the new url parser

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

parents: 768

237 return target.getSoTimeout();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

238 }

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

239

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

240 /**

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

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

parents: 276

241 * Enables/disables debug mode with logging to file

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

244 */

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

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

parents: 281

245 public void setDebug(final boolean debug) {

5bfe3357fb1c Use the new url parser

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

parents: 768

246 target.setDebug(debug);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

247 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

248

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

249 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

252 * thrown when a redirect is encountered.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

253 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

256 * @param user the username

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

257 * @param pass the password

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

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

parents: 0

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

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

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

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

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

263 * @throws MCLParseException if bogus data is received

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

264 * @throws MCLException if an MCL related error occurs

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

265 */

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

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

parents: 281

266 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

267 throws IOException, SocketException, UnknownHostException, MCLParseException, MCLException

180

fdf4c888d5b7 Small code and layout improvements

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

parents: 90

268 {

5bfe3357fb1c Use the new url parser

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

parents: 768

269 target.setHost(host);

5bfe3357fb1c Use the new url parser

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

parents: 768

270 target.setPort(port);

5bfe3357fb1c Use the new url parser

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

parents: 768

271 target.setUser(user);

5bfe3357fb1c Use the new url parser

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

parents: 768

272 target.setPassword(pass);

5bfe3357fb1c Use the new url parser

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

parents: 768

273 return connect(target, null);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

274 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

275

811

ede3a59ff4f2 Add MapiSocket.connect(url, properties) method

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

parents: 803

276 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

278 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

279

721

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

280 /**

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

5aa19bbed0d6 Comments and formatting

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

parents: 811

282 * If followRedirect is false, a RedirectionException is

721

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

283 * thrown when a redirect is encountered.

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

284 *

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

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

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

4d80fd66541d formatting

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

parents: 846

288 *

5aa19bbed0d6 Comments and formatting

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

parents: 811

289 * @param target the connection settings

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

291 * initial handshake

721

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

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

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

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

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

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

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

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

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

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

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

297 * @throws MCLParseException if bogus data is received

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

298 * @throws MCLException if an MCL related error occurs

b78d8167a997 Remove finalize() method as it is deprecated and marked for removal in a future JDK. See also: https://openjdk.org/jeps/421

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

parents: 716

299 */

5bfe3357fb1c Use the new url parser

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

parents: 768

300 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

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

302 close();

5bfe3357fb1c Use the new url parser

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

parents: 768

303 this.target = target;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

304

5bfe3357fb1c Use the new url parser

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

parents: 768

305 Target.Validated validated;

5bfe3357fb1c Use the new url parser

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

parents: 768

306 try {

5bfe3357fb1c Use the new url parser

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

parents: 768

307 validated = target.validate();

5bfe3357fb1c Use the new url parser

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

parents: 768

308 } catch (ValidationError e) {

5bfe3357fb1c Use the new url parser

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

parents: 768

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

310 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

311

5bfe3357fb1c Use the new url parser

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

parents: 768

312 if (validated.connectScan()) {

5bfe3357fb1c Use the new url parser

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

parents: 768

313 return scanUnixSockets(callback);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

314 }

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

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

parents: 276

315

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

317 int attempts = 0;

5bfe3357fb1c Use the new url parser

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

parents: 768

318 do {

5bfe3357fb1c Use the new url parser

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

parents: 768

319 boolean ok = false;

5bfe3357fb1c Use the new url parser

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

parents: 768

320 try {

5bfe3357fb1c Use the new url parser

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

parents: 768

321 boolean done = tryConnect(callback, warnings);

5bfe3357fb1c Use the new url parser

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

parents: 768

322 ok = true;

5bfe3357fb1c Use the new url parser

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

parents: 768

323 if (done) {

5bfe3357fb1c Use the new url parser

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

parents: 768

324 return warnings;

5bfe3357fb1c Use the new url parser

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

parents: 768

325 }

5bfe3357fb1c Use the new url parser

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

parents: 768

326 } finally {

5bfe3357fb1c Use the new url parser

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

parents: 768

327 if (!ok)

5bfe3357fb1c Use the new url parser

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

parents: 768

328 close();

5bfe3357fb1c Use the new url parser

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

parents: 768

329 }

836

aad275e042b2 Heed followRedirect

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

parents: 835

330 } while (followRedirects && attempts++ < this.ttl);

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

332 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

333

5bfe3357fb1c Use the new url parser

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

parents: 768

334 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

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

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

5bfe3357fb1c Use the new url parser

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

parents: 768

337 target.setHost("localhost");

5bfe3357fb1c Use the new url parser

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

parents: 768

338 return connect(target, callback);

5bfe3357fb1c Use the new url parser

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

parents: 768

339 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

340

5bfe3357fb1c Use the new url parser

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

parents: 768

341 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

342 try {

5bfe3357fb1c Use the new url parser

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

parents: 768

343 // We need a valid target

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

346 if (con == null)

5bfe3357fb1c Use the new url parser

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

parents: 768

347 connectSocket(validated);

5bfe3357fb1c Use the new url parser

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

parents: 768

348 return handshake(validated, callback, warningBuffer);

5bfe3357fb1c Use the new url parser

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

parents: 768

349 } catch (IOException | MCLException e) {

5bfe3357fb1c Use the new url parser

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

parents: 768

350 close();

5bfe3357fb1c Use the new url parser

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

parents: 768

351 throw e;

5bfe3357fb1c Use the new url parser

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

parents: 768

352 } catch (ValidationError e) {

5bfe3357fb1c Use the new url parser

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

parents: 768

353 close();

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

355 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

356 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

357

5bfe3357fb1c Use the new url parser

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

parents: 768

358 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

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

360 String tcpHost = validated.connectTcp();

5bfe3357fb1c Use the new url parser

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

parents: 768

361 if (tcpHost.isEmpty()) {

5bfe3357fb1c Use the new url parser

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

parents: 768

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

363 }

5bfe3357fb1c Use the new url parser

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

parents: 768

364 int port = validated.connectPort();

a2b1ae53565e Improve error messages

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

parents: 839

365 Socket sock = null;

a2b1ae53565e Improve error messages

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

parents: 839

366 try {

a2b1ae53565e Improve error messages

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

parents: 839

367 sock = new Socket(tcpHost, port);

a2b1ae53565e Improve error messages

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

parents: 839

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

a2b1ae53565e Improve error messages

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

parents: 839

369 sock.setTcpNoDelay(true);

a2b1ae53565e Improve error messages

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

parents: 839

370 sock.setKeepAlive(true);

5bfe3357fb1c Use the new url parser

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

parents: 768

371

a2b1ae53565e Improve error messages

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

parents: 839

372 sock = wrapTLS(sock, validated);

5bfe3357fb1c Use the new url parser

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

parents: 768

373

a2b1ae53565e Improve error messages

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

parents: 839

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

a2b1ae53565e Improve error messages

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

parents: 839

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

750

02ad91fb3438 UTF-8 is a standard character set, which is always available in Java Runtime. Use it and avoid looking it up every time.

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

parents: 737

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

02ad91fb3438 UTF-8 is a standard character set, which is always available in Java Runtime. Use it and avoid looking it up every time.

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

parents: 737

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

02ad91fb3438 UTF-8 is a standard character set, which is always available in Java Runtime. Use it and avoid looking it up every time.

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

parents: 737

378 writer.registerReader(reader);

700

940e266eeccd Refactor BufferedMCLReader

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

parents: 698

379 reader.advance();

5bfe3357fb1c Use the new url parser

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

parents: 768

380

a2b1ae53565e Improve error messages

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

parents: 839

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

a2b1ae53565e Improve error messages

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

parents: 839

382 con = sock;

850

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

383 sock = null;

a2b1ae53565e Improve error messages

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

parents: 839

384 } catch (SSLException e) {

a2b1ae53565e Improve error messages

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

parents: 839

385 throw new MCLException("SSL error: " + e.getMessage(), e);

a2b1ae53565e Improve error messages

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

parents: 839

386 } catch (IOException e) {

a2b1ae53565e Improve error messages

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

parents: 839

387 throw new MCLException("Could not connect to " + tcpHost + ":" + port + ": " + e.getMessage(), e);

850

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

388 } finally {

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

389 if (sock != null)

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

390 try {

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

391 sock.close();

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

392 } catch (IOException e) {

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

393 // ignore

9f200daffa35 Ensure sock is closed on errors

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

parents: 848

394 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

395 }

5bfe3357fb1c Use the new url parser

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

parents: 768

396 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

397

800

09f463444dde TLS support in its most basic form

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

parents: 799

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

399 if (validated.getTls())

f2689a3e9a95 convert space indents to tabs

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

parents: 843

400 return SecureSocket.wrap(validated, sock);

f2689a3e9a95 convert space indents to tabs

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

parents: 843

401 else {

ac56897d3452 comments

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

parents: 847

402 // Send an even number of NUL bytes to avoid a deadlock if

ac56897d3452 comments

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

parents: 847

403 // we're accidentally connecting to a TLS-protected server.

ac56897d3452 comments

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

parents: 847

404 // The cause of the deadlock is that we speak MAPI and we wait

ac56897d3452 comments

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

parents: 847

405 // for the server to send a MAPI challenge.

ac56897d3452 comments

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

parents: 847

406 // However, if the server is trying to set up TLS, it will be

ac56897d3452 comments

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

parents: 847

407 // waiting for us to send a TLS 'Client Hello' packet.

ac56897d3452 comments

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

parents: 847

408 // Hence, deadlock.

ac56897d3452 comments

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

parents: 847

409 // NUL NUL is a no-op in MAPI and will hopefully force an error

ac56897d3452 comments

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

parents: 847

410 // in the TLS server. This does not always work, some

ac56897d3452 comments

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

parents: 847

411 // TLS implementations abort on the first NUL, some need more NULs

ac56897d3452 comments

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

parents: 847

412 // than we are prepared to send here. 8 seems to be a good number.

803

1671f2eb130b Send NUL bytes on non-TLS connect

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

parents: 801

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

1671f2eb130b Send NUL bytes on non-TLS connect

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

parents: 801

414 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

415 return sock;

f2689a3e9a95 convert space indents to tabs

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

parents: 843

416 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

417

5bfe3357fb1c Use the new url parser

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

parents: 768

418 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

419 String challenge = reader.getLine();

700

940e266eeccd Refactor BufferedMCLReader

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

parents: 698

420 reader.advance();

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

422 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

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

5bfe3357fb1c Use the new url parser

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

parents: 768

424 writer.writeLine(response);

5bfe3357fb1c Use the new url parser

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

parents: 768

425 reader.advance();

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

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

parents: 281

426

5bfe3357fb1c Use the new url parser

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

parents: 768

427 // Process the response lines.

5bfe3357fb1c Use the new url parser

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

parents: 768

428 String redirect = null;

5bfe3357fb1c Use the new url parser

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

parents: 768

429 StringBuilder errors = new StringBuilder();

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

431 switch (reader.getLineType()) {

5bfe3357fb1c Use the new url parser

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

parents: 768

432 case REDIRECT:

5bfe3357fb1c Use the new url parser

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

parents: 768

433 if (redirect == null)

5bfe3357fb1c Use the new url parser

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

parents: 768

434 redirect = reader.getLine(1);

5bfe3357fb1c Use the new url parser

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

parents: 768

435 break;

5bfe3357fb1c Use the new url parser

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

parents: 768

436 case ERROR:

5bfe3357fb1c Use the new url parser

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

parents: 768

437 if (errors.length() > 0)

5bfe3357fb1c Use the new url parser

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

parents: 768

438 errors.append("\n");

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

440 break;

5bfe3357fb1c Use the new url parser

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

parents: 768

441 case INFO:

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

443 break;

5bfe3357fb1c Use the new url parser

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

parents: 768

444 default:

5bfe3357fb1c Use the new url parser

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

parents: 768

445 // ignore??!!

5bfe3357fb1c Use the new url parser

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

parents: 768

446 break;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

447 }

700

940e266eeccd Refactor BufferedMCLReader

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

parents: 698

448 reader.advance();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

449 }

5bfe3357fb1c Use the new url parser

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

parents: 768

450 if (errors.length() > 0)

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

452

5bfe3357fb1c Use the new url parser

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

parents: 768

453 if (redirect == null)

5bfe3357fb1c Use the new url parser

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

parents: 768

454 return true; // we're happy

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

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

parents: 276

455

5bfe3357fb1c Use the new url parser

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

parents: 768

456 // process redirect

5bfe3357fb1c Use the new url parser

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

parents: 768

457 try {

5bfe3357fb1c Use the new url parser

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

parents: 768

458 MonetUrlParser.parse(target, redirect);

5bfe3357fb1c Use the new url parser

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

parents: 768

459 } catch (URISyntaxException | ValidationError e) {

5bfe3357fb1c Use the new url parser

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

parents: 768

460 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

461 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

464 // next challenge is already there.

f2689a3e9a95 convert space indents to tabs

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

parents: 843

465 reader.resetLineType();

5bfe3357fb1c Use the new url parser

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

parents: 768

466 reader.advance();

f2689a3e9a95 convert space indents to tabs

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

parents: 843

467 } else {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

468 close();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

469 }

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

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

parents: 276

470

f2689a3e9a95 convert space indents to tabs

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

parents: 843

471 return false; // we need another go

f2689a3e9a95 convert space indents to tabs

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

parents: 843

472 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

473

4d80fd66541d formatting

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

parents: 846

474 private String challengeResponse(Target.Validated validated, final String challengeLine, OptionsCallback callback) throws MCLException {

5bfe3357fb1c Use the new url parser

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

parents: 768

475 // The challengeLine looks like this:

5bfe3357fb1c Use the new url parser

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

parents: 768

476 //

5bfe3357fb1c Use the new url parser

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

parents: 768

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

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

479 // 0 1 2 3 4 5 6 7

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

480

4d80fd66541d formatting

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

parents: 846

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

5bfe3357fb1c Use the new url parser

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

parents: 768

482 if (parts.length < 3)

5bfe3357fb1c Use the new url parser

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

parents: 768

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

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

484 String saltPart = parts[0];

5bfe3357fb1c Use the new url parser

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

parents: 768

485 String serverTypePart = parts[1];

5bfe3357fb1c Use the new url parser

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

parents: 768

486 String versionPart = parts[2];

5bfe3357fb1c Use the new url parser

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

parents: 768

487 int version;

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

489 version = 9;

5bfe3357fb1c Use the new url parser

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

parents: 768

490 else

5bfe3357fb1c Use the new url parser

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

parents: 768

491 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

492 if (parts.length < 6)

5bfe3357fb1c Use the new url parser

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

parents: 768

493 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

494 String serverHashesPart = parts[3];

5bfe3357fb1c Use the new url parser

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

parents: 768

495 // String endianPart = parts[4];

5bfe3357fb1c Use the new url parser

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

parents: 768

496 String passwordHashPart = parts[5];

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

499

5bfe3357fb1c Use the new url parser

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

parents: 768

500 String userResponse;

5bfe3357fb1c Use the new url parser

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

parents: 768

501 String password = target.getPassword();

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

503 userResponse = "merovingian";

5bfe3357fb1c Use the new url parser

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

parents: 768

504 password = "merovingian";

5bfe3357fb1c Use the new url parser

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

parents: 768

505 } else {

5bfe3357fb1c Use the new url parser

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

parents: 768

506 userResponse = target.getUser();

5bfe3357fb1c Use the new url parser

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

parents: 768

507 }

5bfe3357fb1c Use the new url parser

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

parents: 768

508 String optionsResponse = handleOptions(callback, optionsPart);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

5bfe3357fb1c Use the new url parser

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

parents: 768

510 // Response looks like this:

5bfe3357fb1c Use the new url parser

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

parents: 768

511 //

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

514 StringBuilder response = new StringBuilder(80);

5bfe3357fb1c Use the new url parser

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

parents: 768

515 response.append("BIG:");

5bfe3357fb1c Use the new url parser

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

parents: 768

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

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

517 hashPassword(response, saltPart, password, passwordHashPart, validated.getHash(), serverHashesPart);

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

518 response.append(":");

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

521 response.append("FILETRANS:");

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

523

5bfe3357fb1c Use the new url parser

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

parents: 768

524 return response.toString();

5bfe3357fb1c Use the new url parser

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

parents: 768

525 }

5bfe3357fb1c Use the new url parser

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

parents: 768

526

839

33fadeb034a7 fix comments

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

parents: 838

527 private String hashPassword(StringBuilder responseBuffer, String salt, String password, String passwordAlgo, String configuredHashes, String serverSupportedAlgos) throws MCLException {

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

528 // First determine which hash algorithms we can choose from for the challenge response.

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

529 // This defaults to whatever the server offers but may be restricted by the user.

4d80fd66541d formatting

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

parents: 846

530 Set<String> algoSet = new HashSet<>(Arrays.asList(serverSupportedAlgos.split(",")));

5bfe3357fb1c Use the new url parser

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

parents: 768

531 if (!configuredHashes.isEmpty()) {

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

532 String[] allowedList = configuredHashes.toUpperCase().split("[, ]");

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

533 Set<String> allowedSet = new HashSet<>(Arrays.asList(allowedList));

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

534 algoSet.retainAll(allowedSet);

5bfe3357fb1c Use the new url parser

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

parents: 768

535 if (algoSet.isEmpty()) {

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

537 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

538 }

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

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

parents: 276

539

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

540 int maxHashDigits = 512 / 4;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

541

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

542 // We'll collect the result in the responseBuffer.

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

543 // It will start with '{' HASHNAME '}' followed by hexdigits

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

544

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

545 // This is where we accumulate what will eventually be hashed into the hexdigits above.

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

546 // It consists of the hexadecimal pre-hash of the password,

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

547 // followed by the salt from the server

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

548 StringBuilder intermediate = new StringBuilder(maxHashDigits + salt.length());

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

549

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

550 MessageDigest passwordDigest = pickBestAlgorithm(Collections.singleton(passwordAlgo), null);

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

551 // Here's the password..

5bfe3357fb1c Use the new url parser

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

parents: 768

552 hexhash(intermediate, passwordDigest, password);

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

553 // .. and here's the salt

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

554 intermediate.append(salt);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

ac56897d3452 comments

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

parents: 847

556 responseBuffer.append('{');

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

557 MessageDigest responseDigest = pickBestAlgorithm(algoSet, responseBuffer);

ac56897d3452 comments

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

parents: 847

558 // the call above has appended the HASHNAME, now add '}'

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

559 responseBuffer.append('}');

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

560 // pickBestAlgorithm has appended HASHNAME, buffer now contains '{' HASHNAME '}'

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

561 hexhash(responseBuffer, responseDigest, intermediate.toString());

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

562 // response buffer now contains '{' HASHNAME '}' HEX_DIGITS_OF_INTERMEDIATE_BUFFER

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

563

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

564 return responseBuffer.toString();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

565 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

566

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

567 /**

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

568 * Pick the most preferred digest algorithm and return a MessageDigest instance for that.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

569 *

4d80fd66541d formatting

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

parents: 846

570 * @param algos the MAPI names of permitted algorithms

ac56897d3452 comments

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

parents: 847

571 * @param appendMapiName if not null, append MAPI name of chose algorithm to this buffer

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

572 * @return instance of the chosen digester

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

573 * @throws MCLException if none of the options is supported

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

574 */

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

575 private MessageDigest pickBestAlgorithm(Set<String> algos, StringBuilder appendMapiName) throws MCLException {

4d80fd66541d formatting

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

parents: 846

576 for (String[] choice : KNOWN_ALGORITHMS) {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

577 String mapiName = choice[0];

f2689a3e9a95 convert space indents to tabs

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

parents: 843

578 String algoName = choice[1];

f2689a3e9a95 convert space indents to tabs

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

parents: 843

579 MessageDigest digest;

f2689a3e9a95 convert space indents to tabs

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

parents: 843

580 if (!algos.contains(mapiName))

f2689a3e9a95 convert space indents to tabs

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

parents: 843

581 continue;

f2689a3e9a95 convert space indents to tabs

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

parents: 843

582 try {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

583 digest = MessageDigest.getInstance(algoName);

f2689a3e9a95 convert space indents to tabs

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

parents: 843

584 } catch (NoSuchAlgorithmException e) {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

585 continue;

f2689a3e9a95 convert space indents to tabs

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

parents: 843

586 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

587 // we found a match

f2689a3e9a95 convert space indents to tabs

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

parents: 843

588 if (appendMapiName != null) {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

589 appendMapiName.append(mapiName);

f2689a3e9a95 convert space indents to tabs

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

parents: 843

590 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

591 return digest;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

592 }

5aa19bbed0d6 Comments and formatting

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

parents: 811

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

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

595 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

596

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

597 /**

ac56897d3452 comments

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

parents: 847

598 * Hash the text into the MessageDigest and append the hexadecimal form of the

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

599 * resulting digest to buffer.

4d80fd66541d formatting

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

parents: 846

600 *

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

601 * @param buffer where the hex digits are appended

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

602 * @param digest where the hex digits come from after the text has been digested

4d80fd66541d formatting

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

parents: 846

603 * @param text text to digest

3a477cf520f6 Debug and clarify pasword hashing code

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

parents: 836

604 */

5bfe3357fb1c Use the new url parser

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

parents: 768

605 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

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

5bfe3357fb1c Use the new url parser

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

parents: 768

607 digest.update(bytes);

5bfe3357fb1c Use the new url parser

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

parents: 768

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

4d80fd66541d formatting

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

parents: 846

609 for (byte b : output) {

5bfe3357fb1c Use the new url parser

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

parents: 768

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

5bfe3357fb1c Use the new url parser

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

parents: 768

611 int lo = b & 0x0F;

5bfe3357fb1c Use the new url parser

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

parents: 768

612 buffer.append(HEXDIGITS[hi]);

5bfe3357fb1c Use the new url parser

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

parents: 768

613 buffer.append(HEXDIGITS[lo]);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

614 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

615 }

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

5bfe3357fb1c Use the new url parser

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

parents: 768

617 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

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

5bfe3357fb1c Use the new url parser

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

parents: 768

619 return "";

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

620

5bfe3357fb1c Use the new url parser

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

parents: 768

621 StringBuilder buffer = new StringBuilder();

5bfe3357fb1c Use the new url parser

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

parents: 768

622 callback.setBuffer(buffer);

4d80fd66541d formatting

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

parents: 846

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

625 if (eqindex < 0)

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

628 int level;

f2689a3e9a95 convert space indents to tabs

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

parents: 843

629 try {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

631 } catch (NumberFormatException e) {

f2689a3e9a95 convert space indents to tabs

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

parents: 843

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

f2689a3e9a95 convert space indents to tabs

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

parents: 843

633 }

f2689a3e9a95 convert space indents to tabs

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

parents: 843

634 callback.addOptions(lang, level);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

635 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

636

5bfe3357fb1c Use the new url parser

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

parents: 768

637 return buffer.toString();

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

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

parents: 276

638 }

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

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

parents: 276

639

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

640 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

642 * the MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

643 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

645 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

646 public InputStream getInputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

647 return fromMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

648 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

649

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

650 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

651 * Returns an output stream for this MapiSocket.

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 * @return an output stream for writing bytes to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

654 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

655 public OutputStream getOutputStream() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

656 return toMonet;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

657 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

658

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

659 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

661 * BufferedMCLReader which does protocol interpretation of the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

662 * BlockInputStream produced by this MapiSocket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

663 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

664 * @return a BufferedMCLReader connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

665 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

666 public BufferedMCLReader getReader() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

667 return reader;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

668 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

669

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

670 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

672 * BufferedMCLWriter which produces protocol compatible data blocks

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

673 * that the BlockOutputStream can properly translate into blocks.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

674 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

675 * @return a BufferedMCLWriter connected to this MapiSocket

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

676 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

677 public BufferedMCLWriter getWriter() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

678 return writer;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

679 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

680

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

681 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

684 * MapiSocket should check this version to act appropriately.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

685 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

686 * @return the mapi protocol version

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

687 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

688 public int getProtocolVersion() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

689 return version;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

690 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

691

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

692 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

695 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

696 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

697 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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 public void debug(final String filename) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

702 debug(new FileWriter(filename));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

703 }

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

704

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

705 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

708 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

709 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

710 *

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

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

parents: 276

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

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

713 */

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

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

parents: 276

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

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

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

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

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

parents: 276

717 // }

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

718

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

719 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

722 * encouraged to start debugging before actually connecting the

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

723 * socket.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

724 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

725 * @param out to write the log to

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

726 */

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

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

parents: 281

727 public void debug(final Writer out) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

728 log = out;

5bfe3357fb1c Use the new url parser

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

parents: 768

729 setDebug(true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

730 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

731

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

732 /**

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

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

parents: 276

733 * Get the log Writer.

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

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

parents: 276

734 *

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

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

parents: 276

735 * @return the log writer

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

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

parents: 276

736 */

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

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

parents: 276

737 public Writer getLogWriter() {

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

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

parents: 276

738 return log;

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

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

parents: 276

739 }

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

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

parents: 276

740

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

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

parents: 276

741 /**

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

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

parents: 281

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

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

744 *

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

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

parents: 281

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

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

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

748 *

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

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

parents: 281

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

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

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

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

753 */

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

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

parents: 281

754 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

755 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

756 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

757 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

758 }

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

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

parents: 281

759

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

760 /**

c9d88af06d35 Javadoc and some minor changes

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

parents: 533

761 * For internal use

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

762 *

06d69b82d409 Resolve javadoc error and warnings :

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

parents: 616

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

764 * @return previous setting

c9d88af06d35 Javadoc and some minor changes

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

parents: 533

765 */

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

766 public boolean setInsertFakePrompts(boolean b) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

767 return fromMonet.setInsertFakePrompts(b);

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

768 }

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

769

5bfe3357fb1c Use the new url parser

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

parents: 768

770 public boolean isDebug() {

5bfe3357fb1c Use the new url parser

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

parents: 768

771 return target.isDebug();

5bfe3357fb1c Use the new url parser

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

parents: 768

772 }

095e896f9d7a Updated comments. Improved code. Added final keywords

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

parents: 573

773

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

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

parents: 281

774 /**

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

781 * being written to the stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

782 */

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

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

parents: 281

783 final class BlockOutputStream extends FilterOutputStream {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

784 private int writePos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

785 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

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

0

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

791 * @param out an OutputStream

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

792 */

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

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

parents: 281

793 public BlockOutputStream(final OutputStream out) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

796 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

797 super(new BufferedOutputStream(out));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

798 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

799

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

800 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

801 public void flush() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

803 writeBlock(true);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

804 out.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

805

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

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

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

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

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

812 if (isDebug()) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

813 log.flush();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

814 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

815 }

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

821 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

822 * @param last whether this is the last block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

823 * @throws IOException if writing to the stream failed

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

824 */

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

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

826 if (last) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

828 blocksize = (short)writePos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

833 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

835 blocksize = (short)BLOCK;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

836 // another block will follow, encode least

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

840 }

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 out.write(blklen);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

843 // write the actual block

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

845

5bfe3357fb1c Use the new url parser

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

parents: 768

846 if (isDebug()) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

847 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

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

849 } else {

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

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

851 }

90c346571eb4 Use StandardCharsets.UTF_8 where possible

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

parents: 554

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

853 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

854

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

855 writePos = 0;

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

858 @Override

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

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

860 if (writePos == BLOCK) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

861 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

862 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

864 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

865

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

866 @Override

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

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

869 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

870

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

871 @Override

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

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

parents: 281

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

873 while (len > 0) {

556

87feb93330a6 Misc. changes suggested by analysis tool

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

parents: 555

874 int t = BLOCK - writePos;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

875 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

877 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

878 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

879 writePos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

880 writeBlock(false);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

881 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

883 writePos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

884 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

885 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

886 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

887 }

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 close() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

893 out.close();

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 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

896

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

897

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

898 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

900 * available as a normal stream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

901 */

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

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

parents: 281

902 final class BlockInputStream extends FilterInputStream {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

903 private int readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

904 private int blockLen = 0;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

905 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

906 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

907 private boolean insertFakePrompts = true;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

908

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

909 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

910 * Constructs this BlockInputStream, backed by the given

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

912 * @param in an InputStream

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

913 */

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

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

parents: 281

914 public BlockInputStream(final InputStream in) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

917 // some reason

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

918 super(new BufferedInputStream(in));

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

919 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

920

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

921 public boolean setInsertFakePrompts(boolean doFake) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

922 boolean old = insertFakePrompts;

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

923 insertFakePrompts = doFake;

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

924 return old;

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

925 }

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

926

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

927 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

928 public int available() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

929 return blockLen - readPos;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

930 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

931

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

932 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

933 public boolean markSupported() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

934 return false;

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

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

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

parents: 281

938 public void mark(final int readlimit) {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

942 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

943 public void reset() {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

945 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

946

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

947 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

952 * data will greatly complicate matters, while a performance

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

953 * improvement is debatable given the relatively small size of

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

956 *

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

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

958 * @param len number of bytes to read

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

960 * @throws IOException if an IO error occurs while reading

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

961 */

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

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

parents: 281

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

963 int s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

964 int off = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

965 while (len > 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

967 if (s == -1) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

970 if (off > 0) {

5bfe3357fb1c Use the new url parser

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

parents: 768

971 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

972 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

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

974 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

975 throw new IOException("Read from " +

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

978 }

5bfe3357fb1c Use the new url parser

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

parents: 768

979 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

980 log("RD ", "server closed the connection (EOF)", true);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

981 return false;

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 len -= s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

984 off += s;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

985 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

986

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

987 return true;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

988 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

989

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

990 /**

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

992 * or writes the prompt in the buffer.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

993 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1001 * read methods.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1002 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

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

1008 * Reader that is possibly chained to this InputStream.

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1009 *

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1011 * loose.

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1012 *

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1013 * @return blockLen

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1014 * @throws IOException if an IO error occurs while reading

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 private int readBlock() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1017 // read next two bytes (short)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1018 if (!_read(blklen, 2))

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1019 return(-1);

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1020

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1022 blockLen = (short)(

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1025 );

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1026 wasEndBlock = (blklen[0] & 0x1) == 1;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1027

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1028 readPos = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1029

5bfe3357fb1c Use the new url parser

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

parents: 768

1030 if (isDebug()) {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1031 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

1032 log("RD ", "read final block: " + blockLen + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1033 } else {

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

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

parents: 281

1034 log("RD ", "read new block: " + blockLen + " bytes", false);

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1035 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1036 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1037

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1039 // stack trace

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1040 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

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

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1043 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

1044 return -1;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1045

5bfe3357fb1c Use the new url parser

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

parents: 768

1046 if (isDebug())

90c346571eb4 Use StandardCharsets.UTF_8 where possible

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

parents: 554

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

1048

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

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

parents: 281

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

1050 if (wasEndBlock) {

537

242debd7e866 Fix mistake in comment

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

parents: 535

1051 // insert 'fake' newline and prompt

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

1052 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

1053 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

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

1055 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

1056 }

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

1057 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

1058 block[blockLen++] = b;

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

1059 }

eaad79c3235f Make the fake prompts at block ends optional

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

parents: 498

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

5bfe3357fb1c Use the new url parser

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

parents: 768

1061 if (isDebug()) {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

1062 log("RD ", "inserting prompt", true);

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

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

parents: 509

1063 }

498

4cfe4991ee63 Use the prompt characters from mapi_prompt.h

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

parents: 497

1064 }

0

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

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

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

parents: 281

1067 return blockLen;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1068 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1069

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1070 @Override

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1071 public int read() throws IOException {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1072 if (available() == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1073 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

1074 return -1;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1075 }

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

1076

5bfe3357fb1c Use the new url parser

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

parents: 768

1077 if (isDebug())

90c346571eb4 Use StandardCharsets.UTF_8 where possible

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

parents: 554

1078 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

1079

816

9188263368cc InputStream.read must return the byte UNSIGNED!

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

parents: 768

1080 return block[readPos++] & 0xFF;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1081 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1082

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1083 @Override

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

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

parents: 281

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

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1086 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1087

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1088 @Override

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

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

parents: 281

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

1090 int t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1091 int size = 0;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1092 while (size < len) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1093 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1094 if (t == 0) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1095 if (size != 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1096 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1098 if (size == 0)

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1099 size = -1;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1100 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1101 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1102 t = available();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1103 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1104 if (len > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1106 off += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1107 len -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1108 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1109 size += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1110 } else {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1112 readPos += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1113 size += len;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1114 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1115 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1116 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1117 return size;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1118 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1119

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1120 @Override

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

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

parents: 281

1121 public long skip(final long n) throws IOException {

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1122 long skip = n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1123 while (skip > 0) {

556

87feb93330a6 Misc. changes suggested by analysis tool

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

parents: 555

1124 int t = available();

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1125 if (skip > t) {

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1126 skip -= t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1127 readPos += t;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1128 readBlock();

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

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

1130 readPos += (int)skip;

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1131 break;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1132 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1133 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1134 return n;

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1135 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1136

c9d88af06d35 Javadoc and some minor changes

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

parents: 533

1137 /**

c9d88af06d35 Javadoc and some minor changes

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

parents: 533

1138 * For internal use

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

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

parents: 700

1139 * @return new Raw object

c9d88af06d35 Javadoc and some minor changes

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

parents: 533

1140 */

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1141 Raw getRaw() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1142 return new Raw();

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1143 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1144

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

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

1146 final class Raw {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1147 byte[] getBytes() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1148 return block;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1149 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1150

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1151 int getLength() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1152 return blockLen;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1153 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1154

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

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

parents: 507

1155 int getPosition() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1156 return readPos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1157 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1158

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1159 int consume(int delta) {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1160 int pos = readPos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1161 readPos += delta;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1162 return pos;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1163 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1164

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1165 int readBlock() throws IOException {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1166 boolean wasFaking = setInsertFakePrompts(false);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1167 try {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1168 return BlockInputStream.this.readBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1169 } finally {

bd860e850fe1 rename insertFakeFlushes to insertFakePrompts

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 509

1170 setInsertFakePrompts(wasFaking);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1171 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1172 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1173

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1174 boolean wasEndBlock() {

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1175 return wasEndBlock;

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1176 }

7730d65dfd55 Add MapiSocket.BlockInputStream.Raw

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 507

1177 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1178 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1179

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1180 /**

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 276

1181 * 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

1182 * 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

1183 * resources as possible are closed.

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1184 */

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1185 public synchronized void close() {

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1186 if (writer != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1187 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1188 writer.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1189 writer = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1190 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1191 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1192 if (reader != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1193 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1194 reader.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1195 reader = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1196 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1197 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1198 if (toMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1199 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1200 toMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1201 toMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1202 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1203 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1204 if (fromMonet != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1205 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1206 fromMonet.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1207 fromMonet = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1208 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1209 }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1210 if (con != null) {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1211 try {

b58c1b245ede Correct and improve implementation of getChallengeResponse() for protocol 9

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 276

1212 con.close(); // close the socket

53

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1213 con = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1214 } catch (IOException e) { /* ignore it */ }

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1215 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1216 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

1217 try {

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1218 log.close();

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1219 log = null;

6cc63d6cb224 Implemented fix as suggested in Bug 3973

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 0

1220 } catch (IOException e) { /* ignore it */ }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1221 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1222 }

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents:

1223

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1224 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1225 * 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

1226 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1227 * 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

1228 *

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1229 * @param chunkSize chunk size for the upload stream

06d69b82d409 Resolve javadoc error and warnings :

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 616

1230 * @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

1231 */

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1232 public UploadStream uploadStream(int chunkSize) {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1233 return new UploadStream(chunkSize);

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1234 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1235

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1236 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1237 * 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

1238 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1239 * 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

1240 *

06d69b82d409 Resolve javadoc error and warnings :

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 616

1241 * @return UploadStream new upload stream

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1242 */

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1243 public UploadStream uploadStream() {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1244 return new UploadStream();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1245 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1246

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1247 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1248 * 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

1249 *

552

7b320303b579 Doc comment improvements

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 547

1250 * 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

1251 *

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1252 * @param prependCr convert \n to \r\n

06d69b82d409 Resolve javadoc error and warnings :

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 616

1253 * @return DownloadStream new download stream

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1254 */

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1255 public DownloadStream downloadStream(boolean prependCr) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1256 return new DownloadStream(fromMonet.getRaw(), toMonet, prependCr);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1257 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1258

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1259

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1260 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1261 * 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

1262 *

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1263 * 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

1264 *

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1265 * 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

1266 * the opportunity to abort the upload.

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1267 */

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1268 public class UploadStream extends FilterOutputStream {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1269 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

1270 private final int chunkSize;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1271 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

1272 private boolean serverCancelled = false;

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1273 private int chunkLeft;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1274 private byte[] promptBuffer;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1275 private Runnable cancellationCallback = null;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1276

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 700

1277 /**

bdeabbd46ec6 Resolve javac and javadoc warnings when compiled with JDK19.

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 700

1278 * 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

1279 * @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

1280 */

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1281 UploadStream(final int chunkSize) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1282 super(toMonet);

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1283 if (chunkSize <= 0) {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1284 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

1285 }

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1286 this.chunkSize = chunkSize;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1287 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

1288 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

1289 promptBuffer = new byte[promptLen + 1];

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1290 chunkLeft = this.chunkSize;

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1291 }

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1292

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1293 /** 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

1294 UploadStream() {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1295 this(DEFAULT_CHUNK_SIZE);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1296 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1297

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1298 /** 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

1299 *

06d69b82d409 Resolve javadoc error and warnings :

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 616

1300 * @param cancellationCallback callback to call

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1301 */

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1302 public void setCancellationCallback(final Runnable cancellationCallback) {

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1303 this.cancellationCallback = cancellationCallback;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1304 }

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1305

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1306 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1307 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

1308 if (serverCancelled) {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1309 // 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

1310 // 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

1311 // 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

1312 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

1313 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1314 handleChunking();

612

1d44b8a577ca write to out, not to super when implementing FilterOutputStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 610

1315 out.write(b);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1316 wrote(1);

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 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1320 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

1321 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

1322 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1323

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1324 @Override

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1325 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

1326 if (serverCancelled) {

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1327 // 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

1328 // 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

1329 // 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

1330 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

1331 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1332 while (len > 0) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1333 handleChunking();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1334 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

1335 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

1336 off += toWrite;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1337 len -= toWrite;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1338 wrote(toWrite);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1339 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1340 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1341

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1342 @Override

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1343 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

1344 // suppress flushes

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1345 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1346

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1347 @Override

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1348 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

1349 if (closed) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1350 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1351 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1352 closed = true;

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1353

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1354 if (serverCancelled)

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1355 closeAfterServerCancelled();

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1356 else

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1357 closeAfterSuccesfulUpload();

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1358 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1359

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1360 private void closeAfterSuccesfulUpload() throws IOException {

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1361 if (chunkLeft != chunkSize) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1362 // flush pending data

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1363 flushAndReadPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1364 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1365 // send empty block

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1366 out.flush();

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1367 final LineType acknowledgement = readPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1368 if (acknowledgement != LineType.FILETRANSFER) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1369 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

1370 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1371 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1372

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1373 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

1374 // 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

1375 }

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1376

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1377 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

1378 chunkLeft -= i;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1379 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1380

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1381 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

1382 if (chunkLeft > 0) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1383 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1384 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1385 flushAndReadPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1386 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1387

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1388 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

1389 out.flush();

72007c4f8f8a Allow MonetUploadHandler to configure the chunk size

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 512

1390 chunkLeft = chunkSize;

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1391 final LineType lineType = readPrompt();

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1392 switch (lineType) {

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1393 case MORE:

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1394 return;

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1395 case FILETRANSFER:

b75464874130 Keep better track of whether the server has cancelled the upload

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 521

1396 // 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

1397 // 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

1398 serverCancelled = true;

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1399 if (cancellationCallback != null) {

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1400 cancellationCallback.run();

ce2b616ed22e Add a cancellation callback to UploadHandler

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 556

1401 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1402 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

1403 default:

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1404 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

1405 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1406 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1407

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1408 private LineType readPrompt() throws IOException {

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1409 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

1410 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

1411 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

1412 }

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1413 return LineType.classify(promptBuffer);

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1414 }

83354bd21320 Upload fake data when an upload request is received

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 501

1415 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1416

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1417

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1418 /**

c9d88af06d35 Javadoc and some minor changes

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 533

1419 * 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

1420 *

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1421 * 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

1422 */

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1423 public static class DownloadStream extends InputStream {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1424 private final BlockInputStream.Raw rawIn;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1425 private final OutputStream out;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1426 private final boolean prependCr;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1427 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

1428 private boolean closed = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1429 private boolean newlinePending = false; // used for crlf conversion

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1430

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1431 DownloadStream(BlockInputStream.Raw rawIn, OutputStream out, boolean prependCr) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1432 this.rawIn = rawIn;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1433 this.out = out;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1434 this.prependCr = prependCr;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1435 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1436

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1437 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

1438 if (endBlockSeen || closed)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1439 return;

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1440 final int ret = rawIn.readBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1441 if (ret < 0 || rawIn.wasEndBlock()) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1442 endBlockSeen = true;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1443 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1444 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1445

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1446 @Override

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1447 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

1448 if (closed)

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1449 return;

8029d7368b5a Make sure the download stream isn't closed twice

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 541

1450 closed = true;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1451 while (!endBlockSeen) {

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1452 nextBlock();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1453 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1454 // Send acknowledgement to server

512

a4000e374a43 Fix silly mistake

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 511

1455 out.write('\n');

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1456 out.flush();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1457 // Do whatever super has to do

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1458 super.close();

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

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 @Override

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1462 public int read() throws IOException {

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1463 final byte[] buf = { 0 };

095e896f9d7a Updated comments. Improved code. Added final keywords

Martin van Dinther <martin.van.dinther@monetdbsolutions.com>

parents: 573

1464 final int nread = read(buf, 0, 1);

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1465 if (nread == 1)

816

9188263368cc InputStream.read must return the byte UNSIGNED!

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1466 return buf[0] & 0xFF;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1467 else

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1468 return -1;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1469 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1470

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1471 @Override

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1472 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

1473 final int origOff = off;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1474 int end = off + len;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1475

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1476 while (off < end) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1477 // 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

1478 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

1479 assert chunk >= 0;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1480 if (chunk == 0) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1481 // make progress by fetching more data

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1482 if (endBlockSeen)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1483 break;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1484 nextBlock();

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1485 continue;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1486 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1487 // make progress copying some bytes

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1488 if (!prependCr) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1489 // no conversion needed, use arraycopy

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1490 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

1491 off += chunk;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1492 rawIn.consume(chunk);

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1493 } else {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1494 int chunkEnd = off + chunk;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1495 if (newlinePending && off < chunkEnd) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1496 // 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

1497 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1498 newlinePending = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1499 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1500 while (off < chunkEnd) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1501 byte b = rawIn.getBytes()[rawIn.consume(1)];

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1502 if (b != '\n') {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1503 dest[off++] = b;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1504 } else if (chunkEnd - off >= 2) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1505 dest[off++] = '\r';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1506 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1507 } else {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1508 dest[off++] = '\r';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1509 newlinePending = true;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1510 break;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1511 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1512 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1513 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1514 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1515

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1516 if (off < end && newlinePending) {

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1517 dest[off++] = '\n';

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1518 newlinePending = false;

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1519 }

65641a7cea31 Implement line ending conversion for downloads

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 612

1520

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1521 if (off == origOff && endBlockSeen)

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1522 return -1;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1523 else

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1524 return off - origOff;

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1525 }

455497783026 Add MapiSocket.DownloadStream

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 508

1526 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1527

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1528 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1529 * Callback used during the initial MAPI handshake.

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1530 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1531 * Newer MonetDB versions allow setting some options during the handshake.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1532 * The options are language-specific and each has a 'level'. The server

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1533 * advertises up to which level options are supported for a given language.

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1534 * For each language/option combination, {@link #addOptions} will be invoked

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1535 * during the handshake. This method should call {@link #contribute} for each

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1536 * option it wants to set.

ac56897d3452 comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 847

1537 *

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1538 * 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

1539 * 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

1540 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1541 public static abstract class OptionsCallback {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1542 private StringBuilder buffer;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1543

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1544 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1545 * Callback called for each language/level combination supported by the

839

33fadeb034a7 fix comments

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 838

1546 * 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

1547 * LOWER than the level passed as a parameter.

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1548 * @param lang language advertised by the server

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1549 * @param level one higher than the maximum supported option

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1550 */

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1551 public abstract void addOptions(String lang, int level);

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1552

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1553 /**

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1554 * Pass option=value during the handshake

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1555 * @param field

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1556 * @param value

5aa19bbed0d6 Comments and formatting

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 811

1557 */

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1558 protected void contribute(String field, int value) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1559 if (buffer.length() > 0)

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1560 buffer.append(',');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1561 buffer.append(field);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1562 buffer.append('=');

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1563 buffer.append(value);

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1564 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1565

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1566

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1567 void setBuffer(StringBuilder buf) {

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1568 buffer = buf;

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1569 }

5bfe3357fb1c Use the new url parser

Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>

parents: 768

1570 }

0

a5a898f6886c Copy of MonetDB java directory changeset e6e32756ad31.

Sjoerd Mullender <sjoerd@acm.org>

parents: