Mercurial > hg > monetdb-java
changeset 943:ff075ed5ce81
Spell check.
line wrap: on
line diff
--- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -126,7 +126,7 @@ We also provide a utility class: public class org.monetdb.util.FileTransferHandler which provides an example implementation of the MonetConnection.UploadHandler - and MonetConnection.DownloadHandler interfaces useable for reading files + and MonetConnection.DownloadHandler interfaces usable for reading files from or writing files to a local file system. * Mon Jun 14 2021 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> @@ -140,7 +140,7 @@ each column of the ResultSet. Now these metadata queries are combined into one query fetching this meta data for up to 50 columns in one query. This reduces the number of queries sent to the server significantly. - This is noticable for instance when using generic JDBC query tools + This is noticeable for instance when using generic JDBC query tools such as SQuirreL, DBeaver, which now respond much faster. * Wed Mar 3 2021 Martin van Dinther <martin.van.dinther@monetdbsolutions.com> @@ -181,7 +181,7 @@ functionality to validate the integrity of the system tables (\vsci) or to validate the integrity of data in tables of a specific schema (\vsi xyz) based on defined declarative constraints (pkey, fkey, not null, etc.). - This will be usefull to find and report inconsistencies in your database. + This will be useful to find and report inconsistencies in your database. This functionality is a beta release. Please let us know if you encounter any issues running it. See below for more information. @@ -257,7 +257,7 @@ - Column NOT NULL constraint - Varchar(n) max length constraint - Idem for char(n), clob(n), blob(n), json(n) and url(n). - It can be usefull to run \vsci before and after an upgrade of MonetDB server. + It can be useful to run \vsci before and after an upgrade of MonetDB server. Use \vsi my_schema to validate data in all tables of a specific schema. Use \vdbi to validate integrity of data in all user schemas in the database. Note: this can take a while, depending on your number @@ -913,7 +913,7 @@ * Tue Nov 9 2010 Fabian Groffen <fabian@cwi.nl> - 1.40.1-20101110 - Fix SQL syntax of inserting BLOB code, using setBytes() -- Added propery 'treat_blob_as_binary' to simulate BINARY types based on +- Added property 'treat_blob_as_binary' to simulate BINARY types based on BLOBs for applications, (e.g. Hibernate-based) that rely on BINARY's byte array mapping - Added code to handle BINARY types
--- a/SQLSTATEs +++ b/SQLSTATEs @@ -2,7 +2,7 @@ Following SQLStates are MonetDB JDBC dri 01M02 redirect warning 01M03 illegal arguments (invalid call of internal function) 01M07 unrecognised clientinfo property -01M08 read-only conection mode not supported +01M08 read-only connection mode not supported 01M09 transaction mode not supported 01M10 unexpected server output 01M11 server-client autocommit state mismatch
--- a/example/SQLImport.java +++ b/example/SQLImport.java @@ -22,7 +22,7 @@ import java.io.*; * continues reading and executing lines. * A very lousy way of implementing options is used to somewhat configure the * behaviour of the program in order to be a bit more verbose or commit after - * each (sucessfully) executed line. + * each (successfully) executed line. * * The program uses a debuglog in which the exact conversation between the * JDBC driver and Mserver is reported. The log file is put in the current
--- a/src/main/java/org/monetdb/client/JdbcClient.java +++ b/src/main/java/org/monetdb/client/JdbcClient.java @@ -108,7 +108,7 @@ public final class JdbcClient { * -e --echo Also outputs the contents of the input file, if any. * -q --quiet Suppress printing the welcome header. * -D --dump Dumps the given table(s), or the complete database if none given. - * --csvdir The directory path where csv data files wil be read from or + * --csvdir The directory path where csv data files will be read from or * written to when COPY ... ON CLIENT commands are executed. * -Xoutput The output mode when dumping. Default is sql, xml may be used for * an experimental XML output. @@ -1072,7 +1072,7 @@ public final class JdbcClient { * @param query the query to execute * @param stmt the Statement to execute the query on * @param out the PrintWriter to write to - * @param showTiming flag to specify if timing information nees to be printed + * @param showTiming flag to specify if timing information needs to be printed * @throws SQLException if a database related error occurs */ private static void executeQuery(final String query, @@ -1155,7 +1155,7 @@ public final class JdbcClient { // if there were warnings for this connection show them! warn = con.getWarnings(); while (warn != null) { - // suppress warning when issueing a "set schema xyz;" command + // suppress warning when issuing a "set schema xyz;" command // if ( !(warn.getMessage()).equals("Server enabled auto commit mode while local state already was auto commit.") ) System.err.println("Connection warning: " + warn.getMessage()); warn = warn.getNextWarning();
--- a/src/main/java/org/monetdb/jdbc/MonetBlob.java +++ b/src/main/java/org/monetdb/jdbc/MonetBlob.java @@ -231,7 +231,7 @@ public final class MonetBlob implements * pos. The bytes written to the stream will overwrite the existing * bytes in the Blob object starting at the position pos. If the end * of the Blob value is reached while writing to the stream, then - * the length of the Blob value will be increased to accomodate the + * the length of the Blob value will be increased to accommodate the * extra bytes. * * @param pos the position in the BLOB value at which to start
--- a/src/main/java/org/monetdb/jdbc/MonetClob.java +++ b/src/main/java/org/monetdb/jdbc/MonetClob.java @@ -211,7 +211,7 @@ public final class MonetClob implements * Clob object represents, starting at position pos. Characters written to the stream * will overwrite the existing characters in the Clob object starting at the position pos. * If the end of the Clob value is reached while writing characters to the stream, - * then the length of the Clob value will be increased to accomodate the extra characters. + * then the length of the Clob value will be increased to accommodate the extra characters. * * Note: If the value specified for pos is greater then the length+1 of the CLOB value * then the behavior is undefined. Some JDBC drivers may throw a SQLException while @@ -232,7 +232,7 @@ public final class MonetClob implements * this Clob object represents, starting at position pos. Characters written to the stream * will overwrite the existing characters in the Clob object starting at the position pos. * If the end of the Clob value is reached while writing characters to the stream, - * then the length of the Clob value will be increased to accomodate the extra characters. + * then the length of the Clob value will be increased to accommodate the extra characters. * * Note: If the value specified for pos is greater then the length+1 of the CLOB value * then the behavior is undefined. Some JDBC drivers may throw a SQLException while @@ -252,7 +252,7 @@ public final class MonetClob implements * Writes the given Java String to the CLOB value that this Clob object designates at the position pos. * The string will overwrite the existing characters in the Clob object starting at the position pos. * If the end of the Clob value is reached while writing the given string, - * then the length of the Clob value will be increased to accomodate the extra characters. + * then the length of the Clob value will be increased to accommodate the extra characters. * * @param pos the position at which to start writing to the CLOB value that this Clob object represents * @param str the string to be written to the CLOB value that this Clob designates @@ -270,7 +270,7 @@ public final class MonetClob implements * Writes len characters of str, starting at character offset, to the CLOB value that this Clob represents. * The string will overwrite the existing characters in the Clob object starting at the position pos. * If the end of the Clob value is reached while writing the given string, - * then the length of the Clob value will be increased to accomodate the extra characters. + * then the length of the Clob value will be increased to accommodate the extra characters. * * @param pos the position at which to start writing to this CLOB object * @param str the string to be written to the CLOB value that this Clob object represents
--- a/src/main/java/org/monetdb/jdbc/MonetConnection.java +++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java @@ -1652,9 +1652,9 @@ public class MonetConnection } /** - * Get the currently registerered {@link UploadHandler}, or null + * Get the currently registered {@link UploadHandler}, or null * - * @return the currently registerered UploadHandler, or null + * @return the currently registered UploadHandler, or null */ public UploadHandler getUploadHandler() { return uploadHandler; @@ -1670,9 +1670,9 @@ public class MonetConnection } /** - * Get the currently registerered {@link DownloadHandler} handler, or null + * Get the currently registered {@link DownloadHandler} handler, or null * - * @return the currently registerered DownloadHandler handler, or null + * @return the currently registered DownloadHandler handler, or null */ public DownloadHandler getDownloadHandler() { return downloadHandler; @@ -2298,7 +2298,7 @@ public class MonetConnection /** The Connection that we should use when requesting a new block */ private final MonetConnection.ResponseList parent; - /** Whether the fetchSize was explitly set by the user */ + /** Whether the fetchSize was explicitly set by the user */ private final boolean cacheSizeSetExplicitly; /** Whether we should send an Xclose command to the server * if we close this Response */ @@ -2531,7 +2531,7 @@ public class MonetConnection * needs to be consistent with regard to its internal data. * * @throws SQLException if the data currently in this Response is not - * sufficient to be consistant + * sufficient to be consistent */ /* MvD: disabled not used/needed code @Override @@ -2936,7 +2936,7 @@ public class MonetConnection * The SchemaResponse represents an schema modification response. * It is issued on statements like CREATE, DROP or ALTER TABLE. * This response keeps a field that represents the success state, as - * defined by JDBC, which is currently in MonetDB's case alwats + * defined by JDBC, which is currently in MonetDB's case always * SUCCESS_NO_INFO. Note that this state is not sent by the * server.<br /> * <samp>&3</samp>
--- a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java +++ b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java @@ -1290,7 +1290,7 @@ public final class MonetDatabaseMetaData /** * Can statements remain open across commits? They may, but - * this driver cannot guarentee that. In further reflection. + * this driver cannot guarantee that. In further reflection. * we are taking a Statement object here, so the answer is * yes, since the Statement is only a vehicle to execute some SQL * @@ -1303,7 +1303,7 @@ public final class MonetDatabaseMetaData /** * Can statements remain open across rollbacks? They may, but - * this driver cannot guarentee that. In further contemplation, + * this driver cannot guarantee that. In further contemplation, * we are taking a Statement object here, so the answer is yes again. * * @return true if they always remain open; false otherwise @@ -1334,7 +1334,7 @@ public final class MonetDatabaseMetaData } /** - * Whats the limit on column name length. + * What's the limit on column name length. * I take some safety here, but it's just a varchar in MonetDB * * @return the maximum column name length @@ -1543,7 +1543,7 @@ public final class MonetDatabaseMetaData /** * What is the database's default transaction isolation level? - * We only see commited data, nonrepeatable reads and phantom + * We only see committed data, nonrepeatable reads and phantom * reads can occur. * * @return the default isolation level @@ -2208,7 +2208,7 @@ public final class MonetDatabaseMetaData * <P>Only privileges matching the column name criteria are * returned. They are ordered by COLUMN_NAME and PRIVILEGE. * - * <P>Each privilige description has the following columns: + * <P>Each privilege description has the following columns: * <OL> * <LI><B>TABLE_CAT</B> String => table catalog (may be null) * <LI><B>TABLE_SCHEM</B> String => table schema (may be null) @@ -2217,7 +2217,7 @@ public final class MonetDatabaseMetaData * <LI><B>GRANTOR</B> => grantor of access (may be null) * <LI><B>GRANTEE</B> String => grantee of access * <LI><B>PRIVILEGE</B> String => name of access (SELECT, - * INSERT, UPDATE, REFRENCES, ...) + * INSERT, UPDATE, REFERENCES, ...) * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted * to grant to others; "NO" if not; null if unknown * </OL> @@ -2315,7 +2315,7 @@ public final class MonetDatabaseMetaData * <LI><B>GRANTOR</B> => grantor of access (may be null) * <LI><B>GRANTEE</B> String => grantee of access * <LI><B>PRIVILEGE</B> String => name of access (SELECT, - * INSERT, UPDATE, REFRENCES, ...) + * INSERT, UPDATE, REFERENCES, ...) * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted * to grant to others; "NO" if not; null if unknown * </OL> @@ -3145,7 +3145,7 @@ public final class MonetDatabaseMetaData * <LI><B>TYPE</B> short => index type: * <UL> * <LI> tableIndexStatistic - this identifies table statistics that are - * returned in conjuction with a table's index descriptions + * returned in conjunction with a table's index descriptions * <LI> tableIndexClustered - this is a clustered index * <LI> tableIndexHashed - this is a hashed index * <LI> tableIndexOther - this is some other style of index @@ -3883,7 +3883,7 @@ public final class MonetDatabaseMetaData /** * Retrieves whether a SQLException while autoCommit is true - * inidcates that all open ResultSets are closed, even ones that are + * indicates that all open ResultSets are closed, even ones that are * holdable. When a SQLException occurs while autocommit is true, it * is vendor specific whether the JDBC driver responds with a commit * operation, a rollback operation, or by doing neither a commit nor
--- a/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java +++ b/src/main/java/org/monetdb/jdbc/MonetPreparedStatement.java @@ -144,7 +144,7 @@ public class MonetPreparedStatement * parameterized query. This result set however needs to be * read in one DataBlockResponse due to protocol limitations. * This requires the fetchSize needs to be set large enough - * to retrieve all rows in one go, else we get eror: + * to retrieve all rows in one go, else we get error: * <pre>resultBlocks[1] should have been fetched by now</pre> * See also: https://github.com/MonetDB/MonetDB/issues/7337 */ @@ -1123,7 +1123,7 @@ public class MonetPreparedStatement } /** - * Sets the designated paramter to the given String object. The + * Sets the designated parameter to the given String object. The * driver converts this to a SQL NCHAR or NVARCHAR or LONGNVARCHAR * value (depending on the argument's size relative to the driver's * limits on NVARCHAR values) when it sends it to the database.
--- a/src/main/java/org/monetdb/jdbc/MonetResultSet.java +++ b/src/main/java/org/monetdb/jdbc/MonetResultSet.java @@ -1173,7 +1173,7 @@ public class MonetResultSet return Integer.parseInt(val); } catch (NumberFormatException e) { // The oid datatype values (as string) have a @0 suffix in the string value. - // To allow succesful parsing and conversion to int, we need to remove the suffix first + // To allow successful parsing and conversion to int, we need to remove the suffix first if ("oid".equals(types[columnIndex - 1])) { if (val.endsWith("@0")) { try { @@ -1224,7 +1224,7 @@ public class MonetResultSet return Long.parseLong(val); } catch (NumberFormatException e) { // The oid datatype values (as string) have a @0 suffix in the string value. - // To allow succesful parsing and conversion to long, we need to remove the suffix first + // To allow successful parsing and conversion to long, we need to remove the suffix first if ("oid".equals(types[columnIndex - 1])) { if (val.endsWith("@0")) { try { @@ -1997,7 +1997,7 @@ public class MonetResultSet * Helper method which parses the date/time value for columns of type * TIME, DATE and TIMESTAMP. For the types CHAR, VARCHAR and * LONGVARCHAR an attempt is made to parse the date according to the - * given type. The given Calender object is filled with the parsed + * given type. The given Calendar object is filled with the parsed * data. Optional fractional seconds (nanos) are returned by this * method. If the underlying type of the column is none of the * mentioned six, January 1st 1970 0:00:00 GMT is returned.<br />
--- a/src/main/java/org/monetdb/jdbc/MonetResultSetMetaData.java +++ b/src/main/java/org/monetdb/jdbc/MonetResultSetMetaData.java @@ -368,7 +368,7 @@ final class MonetResultSetMetaData */ @Override public boolean isSigned(final int column) throws SQLException { - // we can hardcode this, based on the colum type + // we can hardcode this, based on the column type switch (getColumnType(column)) { case Types.TINYINT: case Types.SMALLINT:
--- a/src/main/java/org/monetdb/jdbc/MonetStatement.java +++ b/src/main/java/org/monetdb/jdbc/MonetStatement.java @@ -134,7 +134,7 @@ public class MonetStatement //== methods of interface Statement /** - * Adds the given SQL command to the current list of commmands for this + * Adds the given SQL command to the current list of commands for this * Statement object. The commands in this list can be executed as a * batch by calling the method executeBatch. * @@ -358,7 +358,7 @@ public class MonetStatement * getResultSet or getUpdateCount to retrieve the result, and * getMoreResults to move to any subsequent result(s). * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated @@ -402,7 +402,7 @@ public class MonetStatement * getResultSet or getUpdateCount to retrieve the result, and * getMoreResults to move to any subsequent result(s). * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated @@ -544,7 +544,7 @@ public class MonetStatement * available for retrieval. The driver will ignore the array if the * SQL statement is not an INSERT statement. * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated @@ -575,7 +575,7 @@ public class MonetStatement * available for retrieval. The driver will ignore the array if the * SQL statement is not an INSERT statement. * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated @@ -748,7 +748,7 @@ public class MonetStatement */ @Override public boolean getMoreResults(final int current) throws SQLException { - // protect against people calling this on an unitialised state + // protect against people calling this on an uninitialized state if (lastResponseList == null) { header = null; return false; @@ -1052,7 +1052,7 @@ public class MonetStatement /** * Requests that a Statement be pooled or not pooled. The value * specified is a hint to the statement pool implementation - * indicating whether the applicaiton wants the statement to be + * indicating whether the application wants the statement to be * pooled. It is up to the statement pool manager as to whether the * hint is used. * @@ -1413,7 +1413,7 @@ public class MonetStatement * Note: This method cannot be called on a PreparedStatement or CallableStatement. * The default implementation will throw SQLFeatureNotSupportedException * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated @@ -1450,7 +1450,7 @@ public class MonetStatement * Note: This method cannot be called on a PreparedStatement or CallableStatement. * The default implementation will throw SQLFeatureNotSupportedException * - * MonetDB only supports returing the generated key for one column, + * MonetDB only supports returning the generated key for one column, * which will be the first column that has a serial. Hence, this * method cannot work as required and the driver will fall back to * executing with request to the database to return the generated
--- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java +++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java @@ -182,7 +182,7 @@ public final class MapiSocket { /** * Sets whether MCL redirections should be followed or not. If set * to false, an MCLException will be thrown when a redirect is - * encountered during connect. The default bahaviour is to + * encountered during connect. The default behavior is to * automatically follow redirects. * * @param r whether to follow redirects (true) or not (false)
--- a/src/main/java/org/monetdb/mcl/parser/MCLParser.java +++ b/src/main/java/org/monetdb/mcl/parser/MCLParser.java @@ -33,7 +33,7 @@ public abstract class MCLParser { protected int colnr = 0; /** - * Creates an MCLParser targetted at a given number of field values. + * Creates an MCLParser targeted at a given number of field values. * The lines parsed by an instance of this MCLParser should have * exactly capacity field values. *
--- a/src/main/java/org/monetdb/mcl/parser/StartOfHeaderParser.java +++ b/src/main/java/org/monetdb/mcl/parser/StartOfHeaderParser.java @@ -42,7 +42,7 @@ public final class StartOfHeaderParser { public final static int Q_UPDATE = '2'; /** A response to a schema update */ public final static int Q_SCHEMA = '3'; - /** A response to a transation statement (start, rollback, abort, + /** A response to a transaction statement (start, rollback, abort, * commit) */ public final static int Q_TRANS = '4'; /** A tabular response in response to a PREPARE statement containing
--- a/src/main/java/org/monetdb/merovingian/Control.java +++ b/src/main/java/org/monetdb/merovingian/Control.java @@ -87,7 +87,7 @@ public class Control { /** * Instructs to write a MCL protocol debug log to the given file. * This affects any newly performed command, and can be changed - * inbetween commands. Passing null to this method disables the + * in between commands. Passing null to this method disables the * debug log. * * @param filename the filename to write debug information to, or null
--- a/src/main/java/org/monetdb/util/Exporter.java +++ b/src/main/java/org/monetdb/util/Exporter.java @@ -89,7 +89,7 @@ public abstract class Exporter { * The "query" column value contains the original SQL view creation text or the ON clause text when it is a REMOTE TABLE * * @param con the JDBC connection, may not be null - * @param schema the schem name, may not be null or empty + * @param schema the schema name, may not be null or empty * @param name the view or table name, may not be null or empty * @return the value of the "query" field for the specified view/table name and schema. It can return null. */
--- a/tests/JDBC_API_Tester.java +++ b/tests/JDBC_API_Tester.java @@ -3168,7 +3168,7 @@ public final class JDBC_API_Tester { private void Test_PStimezone() { sb.setLength(0); // clear the output log buffer - // make sure this test is reproducable regardless timezone + // make sure this test is reproducible regardless timezone // setting, by overriding the VM's default // we have to make sure that one doesn't have daylight // savings corrections @@ -4827,7 +4827,7 @@ public final class JDBC_API_Tester { stmt = con.createStatement(); sb.append("1. more results?..."); if (stmt.getMoreResults() != false || stmt.getUpdateCount() != -1) - sb.append("more results on an unitialised Statement, how can that be?\n"); + sb.append("more results on an uninitialized Statement, how can that be?\n"); sb.append(" nope :)\n"); sb.append("2. SELECT 1..."); @@ -6723,7 +6723,7 @@ public final class JDBC_API_Tester { private void testTimeout_3357(Statement st, int secs) throws SQLException { sb.append("setQueryTimeout = ").append(secs).append(". "); st.setQueryTimeout(secs); - // as the call to set the timeout is delayed till a statement is executed, issue a select statment + // as the call to set the timeout is delayed till a statement is executed, issue a select statement ResultSet rs = st.executeQuery("SELECT " + secs); if (rs != null) rs.close();
--- a/tests/OnClientTester.java +++ b/tests/OnClientTester.java @@ -662,7 +662,7 @@ public final class OnClientTester { (int)sub.charAt(0), (int)sub.charAt(1), (int)sub.charAt(2))); } } - // only to show some succesful output if the above succeeds + // only to show some successful output if the above succeeds assertEq("Every 3-byte normalized chunk", "|\\r\\n", "|\\r\\n"); exitTest();
--- a/tests/TLSTester.java +++ b/tests/TLSTester.java @@ -299,7 +299,7 @@ public final class TLSTester { if (e.getMessage().startsWith("Sorry, this is not a real MonetDB instance")) { // it looks like a failure but this is actually our success scenario // because this is what the TLS Tester does when the connection succeeds. - endVerbose("succesful MAPI handshake, as expected"); + endVerbose("successful MAPI handshake, as expected"); return; } // other exceptions ARE errors and should be reported.