DERBY-6856: Fix javadoc warnings raised when compiling Derby javadoc with build 124 of JDK 9: commit derby-6856-09-aa-javadocEntities.diff.
git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1753091 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java b/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
index 489bc35..51f79d8 100644
--- a/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
+++ b/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
@@ -409,7 +409,7 @@
* @param forLength the number of consecutive bytes to be copied; the value
* for length must be 0 or greater. Specifying a length that goes
* beyond the end of the BLOB (i.e., <code>fromPosition + forLength
- * > blob.length()</code>), will result in an error.
+ * > blob.length()</code>), will result in an error.
* @return a byte array containing up to <code>forLength</code> consecutive
* bytes from the <code>BLOB</code> value designated by
* <code>sourceLocator</code>, starting with the byte at position
@@ -484,7 +484,7 @@
* @param forLength the number of bytes to be written to the
* <code>BLOB</code> value from the array of bytes
* <code>bytes</code>. Specifying a length that goes beyond the end
- * of the BLOB (i.e., <code>fromPosition + forLength >
+ * of the BLOB (i.e., <code>fromPosition + forLength >
* blob.length()</code>, will result in an error.
* @param bytes the array of bytes to be written
*/
@@ -876,7 +876,7 @@
* @param forLength the number of consecutive characters to be copied; the
* value for length must be 0 or greater. Specifying a length that
* goes beyond the end of the CLOB (i.e., <code>fromPosition +
- * forLength > clob.length()</code>, will result in an error.
+ * forLength > clob.length()</code>, will result in an error.
* @return a string containing up to <code>forLength</code> consecutive
* characters from the <code>CLOB</code> value designated by
* <code>sourceLocator</code>, starting with the character at
@@ -954,7 +954,7 @@
* @param forLength the number of characters to be written to the
* <code>CLOB</code> value from the string <code>string</code>.
* Specifying a length that goes beyond the end of the CLOB (i.e.,
- * <code>fromPosition + forLength > clob.length()</code>, will
+ * <code>fromPosition + forLength > clob.length()</code>, will
* result in an error.
* @param string the string to be written
*/
diff --git a/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java b/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
index f983bd9..1de62f2 100644
--- a/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
+++ b/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
@@ -1159,7 +1159,7 @@
* will in turn call
* <code>EmbedDatabaseMetaData.getFunctions(String,String,String)</code><p>
* Compatibility: Only available if both server and client version
- * > 10.1, and JDK version >= 1.6. Older clients will not have
+ * < 10.1, and JDK version >= 1.6. Older clients will not have
* this method available. Newer clients will be able to call this
* method when connected to an older server, but this will be
* trigger an exception in
@@ -1235,7 +1235,7 @@
* server. This procedure will in turn call
* <code>EmbedDatabaseMetaData.getFunctionColumns(String,String,
* String,String)</code><p> Compatibility: Only available if both
- * server and client version > 10.1, and JDK version >= 1.6. Older
+ * server and client version > 10.1, and JDK version >= 1.6. Older
* clients will not have this method available. Newer clients will
* be able to call this method when connected to an older server,
* but this will be trigger an exception in
diff --git a/java/client/org/apache/derby/client/am/FailedProperties40.java b/java/client/org/apache/derby/client/am/FailedProperties40.java
index b2d4d5c..5170883 100644
--- a/java/client/org/apache/derby/client/am/FailedProperties40.java
+++ b/java/client/org/apache/derby/client/am/FailedProperties40.java
@@ -85,11 +85,11 @@
/**
* <code>getProperties</code> provides a
- * <code>Map<String,ClientInfoStatus></code> object describing the
+ * <code>Map<String,ClientInfoStatus></code> object describing the
* failed properties (as specified in the javadoc for
* java.sql.SQLClientInfoException).
*
- * @return a <code>Map<String,ClientInfoStatus></code> object with
+ * @return a <code>Map&glt;String,ClientInfoStatus></code> object with
* the failed property keys and the reason why each failed
*/
public Map<String,ClientInfoStatus> getProperties() { return failedProps_; }
diff --git a/java/client/org/apache/derby/client/am/FloatingPoint.java b/java/client/org/apache/derby/client/am/FloatingPoint.java
index 2dbfe77..c8ac5bf 100644
--- a/java/client/org/apache/derby/client/am/FloatingPoint.java
+++ b/java/client/org/apache/derby/client/am/FloatingPoint.java
@@ -64,9 +64,15 @@
//--------------entry points for runtime representation-----------------------
/**
+ * <p>
* Build a Java float from a 4-byte floating point representation.
- * <p/>
- * This includes DERBY types: <ul> <li> REAL <li> FLOAT(1<=n<=24) </ul>
+ * </p>
+ *
+ * <p>
+ * This includes DERBY types:
+ * </p>
+ *
+ * <ul> <li> REAL <li> FLOAT(1<=n<=24) </ul>
*
* @throws IllegalArgumentException if the specified representation is not recognized.
*/
diff --git a/java/client/org/apache/derby/client/am/Lob.java b/java/client/org/apache/derby/client/am/Lob.java
index 9d04d28..bcc3745 100644
--- a/java/client/org/apache/derby/client/am/Lob.java
+++ b/java/client/org/apache/derby/client/am/Lob.java
@@ -301,10 +301,10 @@
* @param pos a long that contains the position that needs to be checked
* @param length a long that contains the length that needs to be checked
* @throws SQLException if
- * a) pos <= 0
- * b) pos > (length of LOB)
- * c) length < 0
- * d) (pos -1) + length > (length of LOB)
+ * a) pos <= 0
+ * b) pos > (length of LOB)
+ * c) length < 0
+ * d) (pos -1) + length > (length of LOB)
*/
protected void checkPosAndLength(long pos, long length)
throws SQLException {
diff --git a/java/client/org/apache/derby/client/net/NetConnectionRequest.java b/java/client/org/apache/derby/client/net/NetConnectionRequest.java
index 4cfdbc4..e53be7a 100644
--- a/java/client/org/apache/derby/client/net/NetConnectionRequest.java
+++ b/java/client/org/apache/derby/client/net/NetConnectionRequest.java
@@ -469,10 +469,10 @@
*
* Relational Database Name specifies the name of a relational database
* of the server.
- * if length of RDB name <= 18 characters, there is not change to the format
+ * if length of RDB name <= 18 characters, there is not change to the format
* of the RDB name. The length of the RDBNAM remains fixed at 18 which includes
* any right bland padding if necessary.
- * if length of the RDB name is > 18 characters, the length of the RDB name is
+ * if length of the RDB name is > 18 characters, the length of the RDB name is
* identical to the length of the RDB name. No right blank padding is required.
* @param rdbnam name of the database.
* @param dontSendOnConversionError omit sending the RDBNAM if there is an
diff --git a/java/drda/org/apache/derby/drda/NetworkServerControl.java b/java/drda/org/apache/derby/drda/NetworkServerControl.java
index 9b7edb2..73a925b 100644
--- a/java/drda/org/apache/derby/drda/NetworkServerControl.java
+++ b/java/drda/org/apache/derby/drda/NetworkServerControl.java
@@ -44,24 +44,24 @@
<P>
<UL>
- <LI>start [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This starts the Network
+ <LI>start [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This starts the Network
Server on the port/host specified or on localhost, port 1527 if no
host/port is specified and no properties are set to override the
defaults. By default a security manager with a default security policy will
be installed. The default security policy file is called server.policy.
By default the Network Server will only listen for
connections from the machine on which it is running.
- Use -h 0.0.0.0 to listen on all interfaces or -h <hostname> to listen
+ Use -h 0.0.0.0 to listen on all interfaces or -h <hostname> to listen
on a specific interface on a multiple IP machine.
For documentation on <sslmode>, consult the Server and Administration Guide.</LI>
<LI>shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]: This shutdowns the Network Server with given user credentials on the host and port specified or on the local host and port 1527(default) if no host or port is specified. </LI>
- <LI>ping [-h <host>] [-p <portnumber>] [-ssl <sslmode>]
+ <LI>ping [-h <host>] [-p <portnumber>] [-ssl <sslmode>]
This will test whether the Network Server is up.
</LI>
- <LI>sysinfo [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This prints
+ <LI>sysinfo [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This prints
classpath and version information about the Network Server,
the JVM and the Derby engine.
</LI>
@@ -71,28 +71,28 @@
prepared statements, and memory usage for the running Network Server.
</LI>
- <LI>logconnections {on | off} [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>logconnections {on | off} [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This turns logging of connections on or off.
Connections are logged to derby.log.
Default is off.</LI>
- <LI>maxthreads <max> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
+ <LI>maxthreads <max> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
This sets the maximum number of threads that can be used for connections.
Default 0 (unlimitted).
</LI>
- <LI>timeslice <milliseconds> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
+ <LI>timeslice <milliseconds> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
This sets the time each session can have using a connection thread
before yielding to a waiting session. Default is 0 (no yeild).
</LI>
- <LI>trace {on | off} [-s <session id>] [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>trace {on | off} [-s <session id>] [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This turns drda tracing on or off for the specified session or if no
session is specified for all sessions. Default is off</LI>
- <LI>tracedirectory <tracedirectory> [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>tracedirectory <tracedirectory> [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This changes where new trace files will be placed.
For sessions with tracing already turned on,
trace files remain in the previous location.
@@ -108,13 +108,13 @@
The following is a list of properties that can be set for
NetworkServerControl:
- <UL><LI>derby.drda.portNumber=<port number>: This property
+ <UL><LI>derby.drda.portNumber=<port number>: This property
indicates which port should be used for the Network Server. </LI>
- <LI>derby.drda.host=<host name or ip address >: This property
+ <LI>derby.drda.host=<host name or ip address >: This property
indicates the ip address to which NetworkServerControl should connect. </LI>
- <LI>derby.drda.traceDirectory=<trace directory>: This property
+ <LI>derby.drda.traceDirectory=<trace directory>: This property
indicates where to put trace files. </LI>
<LI>derby.drda.traceAll=true: This property turns on tracing for
@@ -123,23 +123,23 @@
<LI>derby.drda.logConnections=true: This property turns on logging
of connections. Default is connections are not logged.</LI>
- <LI>derby.drda.minThreads=<value>: If this property
- is set, the <value> number of threads will be created when the Network Server is
+ <LI>derby.drda.minThreads=<value>: If this property
+ is set, the <value> number of threads will be created when the Network Server is
booted. </LI>
- <LI>derby.drda.maxThreads=<value>: If this property
- is set, the <value> is the maximum number of connection threads that will be
+ <LI>derby.drda.maxThreads=<value>: If this property
+ is set, the <value> is the maximum number of connection threads that will be
created. If a session starts when there are no connection threads available
and the maximum number of threads has been reached, it will wait until a
conection thread becomes available. </LI>
- <LI>derby.drda.timeSlice=<milliseconds>: If this property
+ <LI>derby.drda.timeSlice=<milliseconds>: If this property
is set, the connection threads will not check for waiting sessions until the
- current session has been working for <milliseconds>.
+ current session has been working for <milliseconds>.
A value of 0 causes the thread to work on the current session until the
session exits. If this property is not set, the default value is 0. </LI>
- <LI>derby.drda.sslMode=<sslmode>: This property sets the SSL
+ <LI>derby.drda.sslMode=<sslmode> This property sets the SSL
mode of the server.
</LI>
@@ -206,7 +206,7 @@
* @param address The IP address of the Network Server host.
* address cannot be null.
*
- * @param portNumber port number server is to used. If <= 0,
+ * @param portNumber port number server is to used. If <= 0,
* default port number is used
*
* @param userName The user name for actions requiring authorization.
@@ -258,7 +258,7 @@
* @param address The IP address of the Network Server host.
* address cannot be null.
- * @param portNumber port number server is to used. If <= 0,
+ * @param portNumber port number server is to used. If <= 0,
* default port number is used
*
* @throws Exception on error
@@ -523,7 +523,7 @@
* should also be set so that clients will yield appropriately.
*
* @param max maximum number of connection threads.
- * If <= 0, connection threads will be created when
+ * If <= 0, connection threads will be created when
* there are no free connection threads.
*
* @exception Exception throws an exception if an error occurs
@@ -551,10 +551,10 @@
/**
* Set Network Server connection time slice parameter.
- * This should be set and is only relevant if setMaxThreads > 0.
+ * This should be set and is only relevant if setMaxThreads > 0.
*
* @param timeslice number of milliseconds given to each session before yielding to
- * another session, if <=0, never yield.
+ * another session, if <=0, never yield.
*
* @exception Exception throws an exception if an error occurs
* @see #setMaxThreads
diff --git a/java/drda/org/apache/derby/impl/drda/AppRequester.java b/java/drda/org/apache/derby/impl/drda/AppRequester.java
index 91f3485..572bcc2 100644
--- a/java/drda/org/apache/derby/impl/drda/AppRequester.java
+++ b/java/drda/org/apache/derby/impl/drda/AppRequester.java
@@ -267,7 +267,7 @@
/**
* Is this an AppRequester that supports XA
*
- * return true if XAMGR >= 7, false otherwise
+ * return true if XAMGR >= 7, false otherwise
**/
protected boolean isXARequester()
diff --git a/java/drda/org/apache/derby/impl/drda/DDMReader.java b/java/drda/org/apache/derby/impl/drda/DDMReader.java
index c377aa8..8a90c6b 100644
--- a/java/drda/org/apache/derby/impl/drda/DDMReader.java
+++ b/java/drda/org/apache/derby/impl/drda/DDMReader.java
@@ -61,9 +61,9 @@
Collections consist of a set of objects in which the entries in the collection
are nested within the length/ code point of the collection.
<P>
- Layer B objects with data >=32763 bytes long format is
+ Layer B objects with data >=32763 bytes long format is
2 bytes Length - length of class, length, and extended total length fields
- (high order bit set, indicating >=32763)
+ (high order bit set, indicating >=32763)
2 bytes Type of the object (code point)
n bytes Extended total length - length of the object
(n = Length - 4)
@@ -261,7 +261,7 @@
/**
* Is there more in this DDM object
*
- * @return true if DDM length is > 0
+ * @return true if DDM length is > 0
*/
protected boolean moreDdmData()
{
@@ -271,7 +271,7 @@
/**
* Is there more in this DDS object
*
- * @return true if DDS length is > 0
+ * @return true if DDS length is > 0
*/
protected boolean moreDssData()
{
diff --git a/java/drda/org/apache/derby/impl/drda/DDMWriter.java b/java/drda/org/apache/derby/impl/drda/DDMWriter.java
index 2efd253..cce0815 100644
--- a/java/drda/org/apache/derby/impl/drda/DDMWriter.java
+++ b/java/drda/org/apache/derby/impl/drda/DDMWriter.java
@@ -1593,7 +1593,7 @@
* @param precision Precision of decimal or numeric type
* @param scale declared scale
*
- * @exception SQLException Thrown if # digits > 31
+ * @exception SQLException Thrown if # digits > 31
*/
void writeBigDecimal(BigDecimal b, int precision, int scale)
throws SQLException
diff --git a/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java b/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
index a6e6a68..d1c2983 100644
--- a/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
+++ b/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
@@ -6283,13 +6283,13 @@
* SQLCAGRP : FDOCA EARLY GROUP
* SQL Communcations Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
* SQLCAXGRP; DRDA TYPE N-GDA; ENVLID 0x52; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
@@ -6353,13 +6353,13 @@
* SQLCAGRP : FDOCA EARLY GROUP
* SQL Communcations Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
* SQLCAXGRP; DRDA TYPE N-GDA; ENVLID 0x52; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
@@ -6561,7 +6561,7 @@
* SQLCAXGRP : EARLY FDOCA GROUP
* SQL Communications Area Exceptions Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLRDBNME; DRDA TYPE FCS; ENVLID 0x30; Length Override 18
* SQLERRD1; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD2; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -6583,7 +6583,7 @@
* SQLERRMSG_m; DRDA TYPE VCM; ENVLID 0x3E; Length Override 70
* SQLERRMSG_s; DRDA TYPE VCS; ENVLID 0x32; Length Override 70
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLERRD1; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD2; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD3; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -6859,12 +6859,12 @@
* SQLDARD : FDOCA EARLY ARRAY
* SQL Descriptor Area Row Description with SQL Communications Area
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCARD; ROW LID 0x64; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLDAROW; ROW LID 0x60; ELEMENT TAKEN 0(all); REP FACTOR 0(all)
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCARD; ROW LID 0x64; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLDHROW; ROW LID 0xE0; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1
@@ -7315,7 +7315,7 @@
* - the outer "do ... while ... " loop processes a ROWSET, one row
* at a time. For non-ROWSET cursors, and for callable statements,
* this loop executes only once.
- * - the inner "for ... i < numCols ..." loop processes each column
+ * - the inner "for ... i < numCols ..." loop processes each column
* in the current row, or each output parmeter in the procedure.
*
* Most column data is written directly inline in the QRYDTA block.
@@ -7909,7 +7909,7 @@
* SQLDAGRP : EARLY FDOCA GROUP
* SQL Data Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLPRECISION; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLSCALE; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLLENGTH; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -7936,7 +7936,7 @@
* SQLCOMMENTS_m; DRDA TYPE VCS; ENVLID 0x32; Length Override 254
* SQLUDTGRP; DRDA TYPE N-GDA; ENVLID 0x51; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLPRECISION; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLSCALE; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLLENGTH; DRDA TYPE I8; ENVLID 0x16; Length Override 8
diff --git a/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java b/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
index 409f044..1eaf2ba 100644
--- a/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
+++ b/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
@@ -173,18 +173,18 @@
/**
* parse SYNCTYPE for XAMGR lvl 7
* return synctype value
- * CodePoint.SYNCTYPE_NEW_UOW -> XAResource.start()
- * CodePoint.SYNCTYPE_END_UOW -> XAResource.end()
- * CodePoint.SYNCTYPE_PREPARE -> XAResource.prepare()
- * CodePoint.SYNCTYPE_MIGRATE -> not supported //SYNCPT MGR LEVEL 5
- * CodePoint.SYNCTYPE_REQ_COMMIT -> not supported //SYNCPT MGR LEVEL 5
- * CodePoint.SYNCTYPE_COMMITTED -> XAResource.commit()
+ * CodePoint.SYNCTYPE_NEW_UOW -> XAResource.start()
+ * CodePoint.SYNCTYPE_END_UOW -> XAResource.end()
+ * CodePoint.SYNCTYPE_PREPARE -> XAResource.prepare()
+ * CodePoint.SYNCTYPE_MIGRATE -> not supported //SYNCPT MGR LEVEL 5
+ * CodePoint.SYNCTYPE_REQ_COMMIT -> not supported //SYNCPT MGR LEVEL 5
+ * CodePoint.SYNCTYPE_COMMITTED -> XAResource.commit()
* or local commit for null XID
- * CodePoint.SYNCTYPE_REQ_LOG -> not supported
- * CodePoint.SYNCTYPE_REQ_FORGET -> XAResource.forget()
- * CodePoint.SYNCTYPE_ROLLBACK -> XAResource.rollback()
- * CodePoint.SYNCTYPE_MIGRATED -> not supported
- * CodePoint.SYNCTYPE_INDOUBT -> XAResource.recover();
+ * CodePoint.SYNCTYPE_REQ_LOG -> not supported
+ * CodePoint.SYNCTYPE_REQ_FORGET -> XAResource.forget()
+ * CodePoint.SYNCTYPE_ROLLBACK -> XAResource.rollback()
+ * CodePoint.SYNCTYPE_MIGRATED -> not supported
+ * CodePoint.SYNCTYPE_INDOUBT -> XAResource.recover();
*
*/
protected int parseSYNCTYPE() throws DRDAProtocolException
diff --git a/java/drda/org/apache/derby/impl/drda/Database.java b/java/drda/org/apache/derby/impl/drda/Database.java
index 605e295..c948362 100644
--- a/java/drda/org/apache/derby/impl/drda/Database.java
+++ b/java/drda/org/apache/derby/impl/drda/Database.java
@@ -443,7 +443,7 @@
*
* @throws SQLException if metadata call fails
* @return <code>true</code> if locators are supported,
- * <code>false</code otherwise
+ * <code>false</code> otherwise
*/
boolean supportsLocator() throws SQLException
{
diff --git a/java/drda/org/apache/derby/impl/drda/DecryptionManager.java b/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
index 74a8448..778253b 100644
--- a/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
+++ b/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
@@ -439,8 +439,8 @@
The String may be converted back to a byte array using fromHexString.
<BR>
For each byte (b) two characaters are generated, the first character
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
- the second character represents the low nibble (<code>b & 0x0f</code>).
+ represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
+ the second character represents the low nibble (<code>b & 0x0f</code>).
<BR>
The byte at <code>data[offset]</code> is represented by the first two characters in the returned String.
@@ -471,9 +471,9 @@
Convert a string into a byte array in hex format.
<BR>
For each character (b) two bytes are generated, the first byte
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
+ represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
the second byte
- represents the low nibble (<code>b & 0x0f</code>).
+ represents the low nibble (<code>b & 0x0f</code>).
<BR>
The character at <code>str.charAt(0)</code> is represented by the first two bytes
in the returned String.
diff --git a/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java b/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
index 9c85de1..fc62427 100644
--- a/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
+++ b/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
@@ -3799,7 +3799,7 @@
* Set the current value of time slice
*
* @param value time slice value
- * @exception Exception if value is < 0
+ * @exception Exception if value is < 0
*/
private void setTimeSlice(int value)
throws Exception
diff --git a/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java b/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
index 5f1b1da..ba70823 100644
--- a/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
+++ b/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
@@ -289,13 +289,13 @@
* active if the DrdaMaxThreads attribute (<code>derby.drda.maxThreads</code>
* property) is 0.</p>
* <p>
- * If DrdaMaxThreads is > 0 and DrdaTimeSlice is 0, connections remain
+ * If DrdaMaxThreads is > 0 and DrdaTimeSlice is 0, connections remain
* active until they are closed. If there are more than DrdaMaxThreads
* connections, inactive connections will be waiting for some active
* connection to close. The connection request will return when the
* connection becomes active.</p>
* <p>
- * If DrdaMaxThreads is > 0 and DrdaTimeSlice > 0, connections will be
+ * If DrdaMaxThreads is > 0 and DrdaTimeSlice > 0, connections will be
* alternating beetween active and waiting according to Derby's time
* slicing algorithm.</p>
* <p>
diff --git a/java/engine/org/apache/derby/catalog/GetProcedureColumns.java b/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
index 17e57e2..b5b8b13 100644
--- a/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
+++ b/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
@@ -46,11 +46,11 @@
METHOD_ID is returned to distinguish between overloaded methods.
<OL>
- <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
- <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
- <LI><B>PROCEDURE_NAME</B> String => procedure name
- <LI><B>COLUMN_NAME</B> String => column/parameter name
- <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
+ <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
+ <LI><B>PROCEDURE_NAME</B> String => procedure name
+ <LI><B>COLUMN_NAME</B> String => column/parameter name
+ <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
<UL>
<LI> procedureColumnUnknown - nobody knows
<LI> procedureColumnIn - IN parameter
@@ -59,22 +59,22 @@
<LI> procedureColumnReturn - procedure return value
<LI> procedureColumnResult - result column in ResultSet
</UL>
- <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
type name is fully qualified
- <LI><B>PRECISION</B> int => precision
- <LI><B>LENGTH</B> int => length in bytes of data
- <LI><B>SCALE</B> short => scale
- <LI><B>RADIX</B> short => radix
- <LI><B>NULLABLE</B> short => can it contain NULL?
+ <LI><B>PRECISION</B> int => precision
+ <LI><B>LENGTH</B> int => length in bytes of data
+ <LI><B>SCALE</B> short => scale
+ <LI><B>RADIX</B> short => radix
+ <LI><B>NULLABLE</B> short => can it contain NULL?
<UL>
<LI> procedureNoNulls - does not allow NULL values
<LI> procedureNullable - allows NULL values
<LI> procedureNullableUnknown - nullability unknown
</UL>
- <LI><B>REMARKS</B> String => comment describing parameter/column
- <LI><B>METHOD_ID</B> Short => Derby extra column (overloading)
- <LI><B>PARAMETER_ID</B> Short => Derby extra column (output order)
+ <LI><B>REMARKS</B> String => comment describing parameter/column
+ <LI><B>METHOD_ID</B> Short => Derby extra column (overloading)
+ <LI><B>PARAMETER_ID</B> Short => Derby extra column (output order)
</OL>
*/
diff --git a/java/engine/org/apache/derby/catalog/SystemProcedures.java b/java/engine/org/apache/derby/catalog/SystemProcedures.java
index f2863b2..12af441 100644
--- a/java/engine/org/apache/derby/catalog/SystemProcedures.java
+++ b/java/engine/org/apache/derby/catalog/SystemProcedures.java
@@ -2157,7 +2157,7 @@
/**
* this procedure switches between the different xplain modes
- * @param mode either 0 for explain only, or 1 for explain & execute (default)
+ * @param mode either 0 for explain only, or 1 for explain and execute (default)
* @throws SQLException
*/
public static void SYSCS_SET_XPLAIN_MODE(int mode)
diff --git a/java/engine/org/apache/derby/diag/ErrorLogReader.java b/java/engine/org/apache/derby/diag/ErrorLogReader.java
index 1edd807..6eaa25e 100644
--- a/java/engine/org/apache/derby/diag/ErrorLogReader.java
+++ b/java/engine/org/apache/derby/diag/ErrorLogReader.java
@@ -56,13 +56,13 @@
<PRE>SELECT vti.ts, threadid, cast(xid as int) as xid_int, cast(lccid as int) as lccid_int, logtext
FROM new org.apache.derby.diag.ErrorLogReader() vti,
(VALUES timestampConstant) t(ts)
- WHERE vti.ts <= t.ts AND
- vti.ts >
+ WHERE vti.ts <= t.ts AND
+ vti.ts >
(SELECT MAX(ts) IS NULL ? '2000-01-01 00:00:00.1' : MAX(ts)
FROM new org.apache.derby.diag.ErrorLogReader() vti_i
WHERE (logtext LIKE 'Committing%' OR
logtext LIKE 'Rolling%') AND
- vti.xid = vti_i.xid AND ts < t.ts)
+ vti.xid = vti_i.xid AND ts < t.ts)
ORDER BY xid_int, vti.ts
</PRE>
diff --git a/java/engine/org/apache/derby/diag/LockTable.java b/java/engine/org/apache/derby/diag/LockTable.java
index bd74211..f50f0c6 100644
--- a/java/engine/org/apache/derby/diag/LockTable.java
+++ b/java/engine/org/apache/derby/diag/LockTable.java
@@ -106,7 +106,7 @@
/**
The normal way of instantiating a LockTable, equivalent to
- LockTable(org.apache.derby.diag.LockTable->TABLE_AND_ROWLOCK).
+ LockTable(org.apache.derby.diag.LockTable->TABLE_AND_ROWLOCK).
Only shows row and table lock and not latches. Latches are generally
held for very short duration and are not of interest to Derby
users. Only under abnormal circumstances will one be interested in
diff --git a/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java b/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
index 5e2cfd6..2c54535 100644
--- a/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
+++ b/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
@@ -136,7 +136,7 @@
* The result is returned as a string, ready to print.
*
* If the JVM doesn't have the method Thread.getAllStackTraces
- * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
+ * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
* java.lang.RuntimePermission "getStackTrace" and "modifyThreadGroup",
* a message saying so is returned instead.
*
diff --git a/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java b/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
index 0cfeca5..0095c0e 100644
--- a/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
+++ b/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
@@ -290,7 +290,7 @@
* this result is a ResultSet. getMoreResults also implicitly
* closes any current ResultSet obtained with getResultSet.
*
- * There are no more results when (!getMoreResults() &&
+ * There are no more results when (!getMoreResults() &&
* (getUpdateCount() == -1)
*
* @return true if the next result is a ResultSet; false if it is
@@ -345,7 +345,7 @@
*
* @param rows the number of rows to fetch
* @exception SQLException if a database-access error occurs, or the
- * condition 0 <= rows <= this.getMaxRows() is not satisfied.
+ * condition 0 <= rows <= this.getMaxRows() is not satisfied.
*/
public final void setFetchSize(int rows) throws SQLException
{
diff --git a/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java b/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
index 34a086c..abc37f3 100644
--- a/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
+++ b/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
@@ -83,11 +83,11 @@
/**
* <code>getProperties</code> provides a
- * <code>Map<String,ClientInfoStatus></code> object describing the
+ * <code>Map&glt;String,ClientInfoStatus></code> object describing the
* failed properties (as specified in the javadoc for
* java.sql.SQLClientInfoException).
*
- * @return a <code>Map<String,ClientInfoStatus></code> object with
+ * @return a <code>Map<String,ClientInfoStatus></code> object with
* the failed property keys and the reason why each failed
*/
public Map<String,ClientInfoStatus> getProperties() { return failedProps_; }
diff --git a/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java b/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
index 13088a7..b4f680f 100644
--- a/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
+++ b/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
@@ -171,7 +171,7 @@
* <BR>
*
* |-------------|
-* |======= produces=>| <B>XAResource</B> |
+* |======= produces=>| <B>XAResource</B> |
* || |-------------|
* || |
* || has A
@@ -179,13 +179,13 @@
* || |---------------------
* || V
* |--------------| produces |--------------|
-* | <B>XADataSource</B> |=========>| <B>XAConnection</B>
+* | <B>XADataSource</B> |=========>| <B>XAConnection</B>
* |--------------| |--------------|
* | |
* extends extends
* | |
* | |-----------------------| |----------------------|
-* | | DB2jPooledConnection |==>| BrokeredConnection |
+* | | DB2jPooledConnection |==>| BrokeredConnection |
* | |-----------------------| |----------------------|
* | | ^ |
* | has A | has A
@@ -198,7 +198,7 @@
* | |
* V V
* |------------| |----------------------| |-----------------------|
-* | JDBCDriver |=produces=>| DetachableConnection |==>| XATransactionResource |
+* | JDBCDriver |=produces=>| DetachableConnection |==>| XATransactionResource |
* | LocalDriver| |----------------------| | |
* |------------| | | points to : |
* | |XATransactionController|
@@ -210,7 +210,7 @@
* extends extends
* | |
* |-----------------| |-----------------------|
-* | EmbedConnection |-- ?-->| TransactionResource |
+* | EmbedConnection |-- ?-->| TransactionResource |
* |-----------------| |-----------------------|
*
*
@@ -227,7 +227,7 @@
* | ||
* | \/
* | |-----------------------| |----------------------|
-* | | <B>DB2jPooledConnection</B> |==>| <B>BrokeredConnection</B> |
+* | | <B>DB2jPooledConnection</B> |==>| <B>BrokeredConnection</B> |
* | |-----------------------| |----------------------|
* | | ^ |
* | has A | has A
@@ -240,7 +240,7 @@
* | |
* V V
* |------------| |----------------------| |-----------------------|
-* | JDBCDriver |=produces=>| EmbedConnection |==>| TransactionResource |
+* | JDBCDriver |=produces=>| EmbedConnection |==>| TransactionResource |
* | LocalDriver| |----------------------| |-----------------------|
* |------------|
*
@@ -258,7 +258,7 @@
* |
* V
* |------------| |-----------------| |-----------------------|
-* | JDBCDriver |==produces=>| <B>EmbedConnection</B> |- ?->| TransactionResource |
+* | JDBCDriver |==produces=>| <B>EmbedConnection</B> |- ?->| TransactionResource |
* | LocalDriver| |-----------------| |-----------------------|
* |------------|
diff --git a/java/engine/org/apache/derby/iapi/reference/Attribute.java b/java/engine/org/apache/derby/iapi/reference/Attribute.java
index d0deb79..a653a2d 100644
--- a/java/engine/org/apache/derby/iapi/reference/Attribute.java
+++ b/java/engine/org/apache/derby/iapi/reference/Attribute.java
@@ -311,7 +311,7 @@
* database owner power before proceeding. The purpose is to
* avoid failing soft upgrade due to a feature being set but not
* supported until after hard upgrade has taken place (e.g. during
- * hard upgrade from 10.1 -> 10.3 or higher if
+ * hard upgrade from 10.1 -> 10.3 or higher if
* derby.database.sqlAuthorization is set,
* cf. DD_Version#checkVersion).
*/
diff --git a/java/engine/org/apache/derby/iapi/reference/Property.java b/java/engine/org/apache/derby/iapi/reference/Property.java
index 3b501f7..bda0456 100644
--- a/java/engine/org/apache/derby/iapi/reference/Property.java
+++ b/java/engine/org/apache/derby/iapi/reference/Property.java
@@ -123,7 +123,7 @@
/**
derby.stream.error.field=
- <className>.<fieldName> returning an OutputStream or Writer object>
+ className.fieldName returning an OutputStream or Writer object
*/
String ERRORLOG_FIELD_PROPERTY = "derby.stream.error.field";
@@ -1318,16 +1318,20 @@
/**
+ * <p>
* derby.storage.useDefaultFilePermissions = {false,true}
- * <p/>
+ * </p>
+ * <p>
* When set to true, the store system will not limit file permissions of
* files created by Derby to owner, but rely on the current OS default. On
- * Unix, this is determined by {@code umask(1)}. Only relevant for JVM >=
+ * Unix, this is determined by {@code umask(1)}. Only relevant for JVM >=
* 6.
- * <p/>
+ * </p>
+ * <p>
* The default value is {@code true} on embedded, but {@code false} on the
* Network server if started from command line, otherwise it is true for
* the server, too (i.e. started via API).
+ * </p>
*/
String STORAGE_USE_DEFAULT_FILE_PERMISSIONS =
"derby.storage.useDefaultFilePermissions";
diff --git a/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java b/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
index 10e35e6..69d1b16 100644
--- a/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
+++ b/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
@@ -62,7 +62,7 @@
/**
Push a parameter value.
<PRE>
- Stack ... =>
+ Stack ... =>
...,param_value
</PRE>
@param id position of the parameter (zero based).
@@ -72,7 +72,7 @@
/**
Push a byte constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,byte_value
</PRE>
*/
@@ -81,7 +81,7 @@
/**
Push a boolean constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,boolean_value
</PRE>
*/
@@ -90,7 +90,7 @@
/**
Push a short constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,short_value
</PRE>
*/
@@ -99,7 +99,7 @@
/**
Push a int constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,int_value
</PRE>
*/
@@ -108,7 +108,7 @@
/**
Push a long constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,long_value
</PRE>
*/
@@ -117,7 +117,7 @@
/**
Push a float constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,float_value
</PRE>
*/
@@ -126,7 +126,7 @@
/**
Push a double constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,double_value
</PRE>
*/
@@ -135,7 +135,7 @@
/**
Push a String constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,String_value
</PRE>
*/
@@ -144,7 +144,7 @@
/**
Push a typed null onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,null
</PRE>
*/
@@ -154,7 +154,7 @@
Push the contents of the local field onto the stack.
This call pushes the this instance required to access the field itself.
<PRE>
- Stack ... =>
+ Stack ... =>
...,field_value
</PRE>
@@ -166,7 +166,7 @@
This call requires the instance (reference) to be pushed by the caller.
<PRE>
- Stack ...,field_ref =>
+ Stack ...,field_ref =>
...,field_value
</PRE>
@@ -176,7 +176,7 @@
/**
Push the contents of the described static field onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,field_value
</PRE>
*/
@@ -188,7 +188,7 @@
This call does not leave any value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...
</PRE>
*/
@@ -200,7 +200,7 @@
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value
</PRE>
*/
@@ -212,7 +212,7 @@
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value
</PRE>
*/
@@ -224,7 +224,7 @@
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,field_ref,value =>
+ Stack ...,field_ref,value =>
...,value
</PRE>
*/
@@ -238,7 +238,7 @@
calls.
<PRE>
- Stack ... => [unchanged]
+ Stack ... => [unchanged]
...
</PRE>
@@ -253,7 +253,7 @@
to the newly created object.
<PRE>
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,new_ref
</PRE>
@@ -265,7 +265,7 @@
Create an instance of an array and push it onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,array_ref
</PRE>
@@ -278,7 +278,7 @@
/**
Push this onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,this_ref
</PRE>
*/
@@ -289,7 +289,7 @@
by upcasting method parameters. It does not put any casting code into the
byte code stream. Can only be used for refrences.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...,ref
</PRE>
*/
@@ -299,7 +299,7 @@
Cast the top stack value. Correctly down-casts a reference or casts
a primitive type (e.g. int to short).
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,cast_value
</PRE>
@@ -311,7 +311,7 @@
Pop the top stack value and push a boolean that is the result of
an instanceof check on the popped reference.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...,boolean_value
</PRE>.
*/
@@ -320,7 +320,7 @@
/**
* Pop the top value off the stack
<PRE>
- Stack ..., value =>
+ Stack ..., value =>
...
</PRE>.
*/
@@ -332,11 +332,11 @@
Must only be called if zero or one item exists
on the stack.
<PRE>
- Stack value =>
+ Stack value =>
:empty:
or
- Stack :empty: =>
+ Stack :empty: =>
:empty:
</PRE>.
@@ -349,11 +349,11 @@
on the stack. If the stack contains a single
value then that is popped and used as the returned value.
<PRE>
- Stack value =>
+ Stack value =>
:empty:
or
- Stack :empty: =>
+ Stack :empty: =>
:empty:
</PRE>.
@@ -386,7 +386,7 @@
value, then they must use the same number of values from the stack.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...
</PRE>.
@@ -403,7 +403,7 @@
and restrictions.
<PRE>
- Stack ...,boolean_value =>
+ Stack ...,boolean_value =>
...
</PRE>.
*/
@@ -435,12 +435,12 @@
<PRE>
static methods
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
non-static methods
- Stack ...,ref,value* => [numArgs number of values will be popped]
+ Stack ...,ref,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
</PRE>
@@ -477,12 +477,12 @@
<PRE>
static methods
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
non-static methods
- Stack ...,ref,value* => [numArgs number of values will be popped]
+ Stack ...,ref,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
</PRE>
@@ -493,7 +493,7 @@
Call super(). Caller must only add this to a constructor.
<PRE>
- Stack ... =>
+ Stack ... =>
...
</PRE>
@@ -503,7 +503,7 @@
/**
Pop an array refrence off the stack and push an element from that array.
<PRE>
- Stack ...,array_ref =>
+ Stack ...,array_ref =>
...,value
</PRE>
@@ -514,7 +514,7 @@
/**
Pop an array reference off the stack, store a value in the array at the passed in offset.
<PRE>
- Stack ...,array_ref, value =>
+ Stack ...,array_ref, value =>
...
</PRE>
@@ -526,7 +526,7 @@
/**
Swap the top two values on the stack.
<PRE>
- Stack ...,valueA,valueB =>
+ Stack ...,valueA,valueB =>
...,valueB,valueA
</PRE>
*/
@@ -535,7 +535,7 @@
/**
Duplicate the top value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value,value
</PRE>
*/
diff --git a/java/engine/org/apache/derby/iapi/services/context/ContextService.java b/java/engine/org/apache/derby/iapi/services/context/ContextService.java
index a4312e1..7fc1e82 100644
--- a/java/engine/org/apache/derby/iapi/services/context/ContextService.java
+++ b/java/engine/org/apache/derby/iapi/services/context/ContextService.java
@@ -70,7 +70,7 @@
set to -1. This is because nesting is solely represented by
the stack, with the current context manager on top of the stack.
This supports multiple levels of nesting across two stacks, e.g.
- C1->C2->C2->C1->C2.
+ C1->C2->C2->C1->C2.
</UL>
This thread local is used to find the current context manager. Basically it provides
diff --git a/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java b/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
index 49bd12e..dc9b0c5 100644
--- a/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
+++ b/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
@@ -58,7 +58,7 @@
is represented by a int (2G values) we have plenty of room for encoding. If we assign a given
majorVersion.minorVersion.fixPack a 10 year life, then we about the maximum number of individual releases
it can have is 10 years * 365 days/year = 3650. Thus with the pre 5.2 scheme we would not expect a
- 5.1.x to have an x > 3650 (approximately). Usually the rate of point releases has been much less than
+ 5.1.x to have an x > 3650 (approximately). Usually the rate of point releases has been much less than
one per day, 5.1.31 is released about 225 days after GA which makes around a point release every 7 days.
But in the encoding we need to be conservative. With fix packs the maximum is about 2 per year and fix
packs are only made to the current release, thus with a yearly minor release cycle we would imagine
@@ -80,9 +80,9 @@
The encoding number must continue to increase so that the
- encodedMaintB > encodedMaintA
+ encodedMaintB > encodedMaintA
- if (fixPackB > fixPackA) || ((fixPackB == fixPackA) && (bugB > bugA))
+ if (fixPackB > fixPackA) || ((fixPackB == fixPackA) && (bugB > bugA))
Selected encoding
@@ -368,10 +368,10 @@
/**
* Return the build number as an integer if possible,
* mapping from the SVN number.
- * nnnnn -> returns nnnnn
- * nnnnnM -> returns -nnnnn indicates a modified code base
- * nnnnn:mmmmm -> returns -nnnnn
- * anything else -> returns -1
+ * nnnnn -> returns nnnnn
+ * nnnnnM -> returns -nnnnn indicates a modified code base
+ * nnnnn:mmmmm -> returns -nnnnn
+ * anything else -> returns -1
*/
public int getBuildNumberAsInt(){
if (buildNumber == null)
diff --git a/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java b/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
index 4947d08..9cb37eb 100644
--- a/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
+++ b/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
@@ -549,9 +549,9 @@
*
* Formats are (with x representing value bits):
* <PRE>
- * 1 Byte- 00xxxxxx val <= 63 (0x3f)
- * 2 Byte- 01xxxxxx xxxxxxxx val > 63 && <= 16383 (0x3fff)
- * 4 byte- 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx val > 16383 && <= MAX_INT
+ * 1 Byte- 00xxxxxx val <= 63 (0x3f)
+ * 2 Byte- 01xxxxxx xxxxxxxx val > 63 && <= 16383 (0x3fff)
+ * 4 byte- 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx val > 16383 && <= MAX_INT
* </PRE>
*
* @exception IOException if an I/O error happens
@@ -637,13 +637,13 @@
*
* Formats are (with x representing value bits):
* <PRE>
- * value <= 16383 (0x3fff):
+ * value ≷= 16383 (0x3fff):
* 2 byte - 00xxxxxx xxxxxxxx
*
- * value > 16383 && <= 0x3fffffff:
+ * value > 16383 && <= 0x3fffffff:
* 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
*
- * value > 0x3fffffff && <= MAX_LONG:
+ * value < 0x3fffffff &< <= MAX_LONG:
* 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
* </PRE>
*
diff --git a/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java b/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
index ee082df..aa57934 100644
--- a/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
+++ b/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
@@ -54,9 +54,9 @@
Write a compressed integer only supporting signed values.
Formats are (with x representing value bits):
<PRE>
- 1 Byte - 00xxxxxx Represents the value <= 63 (0x3f)
- 2 Byte - 01xxxxxx xxxxxxxx Represents the value > 63 && <= 16383 (0x3fff)
- 4 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= MAX_INT
+ 1 Byte - 00xxxxxx Represents the value <= 63 (0x3f)
+ 2 Byte - 01xxxxxx xxxxxxxx Represents the value > 63 && <= 16383 (0x3fff)
+ 4 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= MAX_INT
</PRE>
@@ -281,9 +281,9 @@
Formats are (with x representing value bits):
<PRE>
- 2 byte - 00xxxxxx xxxxxxxx Represents the value <= 16383 (0x3fff)
- 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= 0x3fffffff
- 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 0x3fffffff && <= MAX_LONG
+ 2 byte - 00xxxxxx xxxxxxxx Represents the value <= 16383 (0x3fff)
+ 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= 0x3fffffff
+ 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 0x3fffffff && <= MAX_LONG
</PRE>
diff --git a/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java b/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
index 582e6c3..7ef0d0f 100644
--- a/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
+++ b/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
@@ -35,7 +35,7 @@
* @param in
* DataInput to be skipped.
* @param skippedBytes
- * number of bytes to skip. if skippedBytes <= zero, do nothing.
+ * number of bytes to skip. if skippedBytes <= zero, do nothing.
* @throws java.io.EOFException
* if EOF meets before requested number of bytes are skipped.
* @throws IOException
diff --git a/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java b/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
index 46f251d..3de5e7c 100644
--- a/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
+++ b/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
@@ -217,8 +217,8 @@
expansion.
<UL>
- <LI> buf.length < 128k - increase by 4k
- <LI> buf.length < 1Mb - increase by 128k
+ <LI> buf.length < 128k - increase by 4k
+ <LI> buf.length < 1Mb - increase by 128k
<LI> otherwise increase by 1Mb.
</UL>
diff --git a/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java b/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
index a7a4d02..cd21fe3 100644
--- a/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
+++ b/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
@@ -221,7 +221,7 @@
** @return The length in bits for this value
**
** NOTE: could possibly be changed to a long. As is
- ** we are restricted to 2^(31-3) -> 256meg instead
+ ** we are restricted to 2^(31-3) -> 256meg instead
** of 2^31 (Integer.MAX_VALUE) like other datatypes
** (or 2 gig). If it is ever changed to a long
** be sure to change read/writeExternal which write
@@ -392,18 +392,18 @@
* Will always do a byte by byte compare.
*
* Given 2 similar bits of unequal lengths (x and y),
- * where x.getLength() < y.getLength() but where:
+ * where x.getLength() < y.getLength() but where:
*
* x[0..x.getLength()] == y[0..x.getLength()]
*
- * then x < y.
+ * then x < y.
*
*
* @param other the other bit to compare to
*
- * @return -1 - if other < this
+ * @return -1 - if other < this
* 0 - if other == this
- * 1 - if other > this
+ * 1 - if other > this
*
*/
public int compare(FormatableBitSet other)
diff --git a/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java b/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
index fa00cd7..86e3081 100644
--- a/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
+++ b/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
@@ -128,7 +128,7 @@
* @param is
* InputStream to be skipped.
* @param skippedBytes
- * number of bytes to skip. if skippedBytes <= zero, do nothing.
+ * number of bytes to skip. if skippedBytes ≷= zero, do nothing.
* @throws EOFException
* if EOF meets before requested number of bytes are skipped.
* @throws IOException
diff --git a/java/engine/org/apache/derby/iapi/services/locks/Lockable.java b/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
index f792ffa..177c2b2 100644
--- a/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
+++ b/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
@@ -42,7 +42,7 @@
<LI>Otherwise the request is granted if the following expression evaluates
to true for every other lock <TT>{ CSn, Qn}</TT> held on <TT> L </TT>
<UL>
- <LI> <PRE> ( ( CSn == CS1 ) && L.lockerAlwaysCompatible() ) </PRE>
+ <LI> <PRE> ( ( CSn == CS1 ) && L.lockerAlwaysCompatible() ) </PRE>
<LI> <PRE> || (L.reqestCompatible(Q1, Qn)) </PRE>
</UL>
</OL>
diff --git a/java/engine/org/apache/derby/iapi/sql/ResultSet.java b/java/engine/org/apache/derby/iapi/sql/ResultSet.java
index 8e0537a..8a0ba85 100644
--- a/java/engine/org/apache/derby/iapi/sql/ResultSet.java
+++ b/java/engine/org/apache/derby/iapi/sql/ResultSet.java
@@ -43,13 +43,13 @@
* <p>
* Although ExecRow is used on the interface, it is not available to
* users of the API. They should use Row, the exposed super-interface
- * of ExecRow. <<I couldn't find another way to perform this mapping...>>
+ * of ExecRow. [I couldn't find another way to perform this mapping...]
* <p>
* Valid transitions: <ul>
- * <li> open->close</li>
- * <li> close->open</li>
- * <li> close->finished</li>
- * <li> finished->open</li>
+ * <li> open->close</li>
+ * <li> close->open</li>
+ * <li> close->finished</li>
+ * <li> finished->open</li>
* </ul>
*
*/
diff --git a/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java b/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
index b8dc988..28a2501 100644
--- a/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
+++ b/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
@@ -248,7 +248,7 @@
static final int FINAL_VALUE = NEXT_SEQUENCE_NODE;
/**
- * Extensions to this interface can use nodetypes > MAX_NODE_TYPE with out fear of collision
+ * Extensions to this interface can use nodetypes > MAX_NODE_TYPE with out fear of collision
* with C_NodeTypes
*/
static final int MAX_NODE_TYPE = 999;
diff --git a/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java b/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
index c86a6bf..05481b3 100644
--- a/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
+++ b/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
@@ -324,7 +324,7 @@
* in execution constructs. Execution code will have to generate:
* <pre>
* (#objectType) (this.getPreparedStatement().getSavedObject(#int))
- * <\pre>
+ * </pre>
*
* @param o object to add to the pool of saved objects
* @return the entry # for the object
diff --git a/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java b/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
index 1234e63..46e4f44 100644
--- a/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
+++ b/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
@@ -52,7 +52,7 @@
*
* @param other The cost estimate to compare this one with
*
- * @return < 0 if this < other, 0 if this == other, > 0 if this > other
+ * @return < 0 if this < other, 0 if this == other, > 0 if this > other
*/
double compare(CostEstimate other);
diff --git a/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java b/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
index a2bb7d2..72511b4 100644
--- a/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
+++ b/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
@@ -445,8 +445,8 @@
*
* @param predList The predicate list to check
*
- * @return <= 0 means there is no uniqueness condition
- * > 0 means there is a uniqueness condition,
+ * @return <= 0 means there is no uniqueness condition
+ * > 0 means there is a uniqueness condition,
* and the return value is the number of rows per scan.
*
* @exception StandardException Thrown on error
diff --git a/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java b/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
index f0946ef..6512403 100644
--- a/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
+++ b/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
@@ -254,8 +254,8 @@
*
* @param predList The predicate list to check
*
- * @return <= 0 means there is no uniqueness condition
- * > 0 means there is a uniqueness condition on an
+ * @return <= 0 means there is no uniqueness condition
+ * > 0 means there is a uniqueness condition on an
* outer table, and the return value is the reciprocal of
* the maximum number of times the optimizer estimates that each
* unique key will be returned. For example, 0.5 means the
diff --git a/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java b/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
index 21b497e..1f1931b 100644
--- a/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
+++ b/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
@@ -786,7 +786,7 @@
/**
* Reports how many statement levels deep we are.
*
- * @return a statement level >= OUTERMOST_STATEMENT
+ * @return a statement level >= OUTERMOST_STATEMENT
*/
public int getStatementDepth();
@@ -1050,7 +1050,7 @@
public String getDbname();
/**
- * Check if in SQL standard mode, with support for Grant & Revoke
+ * Check if in SQL standard mode, with support for Grant and Revoke
*
* @return True if SQL standard permissions are being used
*/
diff --git a/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java b/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
index 521db29..2aea5c8 100644
--- a/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
+++ b/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
@@ -342,7 +342,7 @@
public static final int DROP_AGGREGATE = 51;
/**
- * Extensions to this interface may use action codes > MAX_ACTION_CODE without fear of
+ * Extensions to this interface may use action codes > MAX_ACTION_CODE without fear of
* clashing with action codes in this base interface.
*/
public static final int MAX_ACTION_CODE = 0XFFFF;
diff --git a/java/engine/org/apache/derby/iapi/sql/dictionary/RoleClosureIterator.java b/java/engine/org/apache/derby/iapi/sql/dictionary/RoleClosureIterator.java
index dd4c01a..8e6c58c 100644
--- a/java/engine/org/apache/derby/iapi/sql/dictionary/RoleClosureIterator.java
+++ b/java/engine/org/apache/derby/iapi/sql/dictionary/RoleClosureIterator.java
@@ -51,7 +51,7 @@
*
* a1 a2 a3
* / | \ | |
- * / b +--------> c d
+ * / b +--------> c d
* j | \ /
* e---+ \ /
* \ \ \ /
diff --git a/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java b/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
index 8a51c7b..dc63b7c 100644
--- a/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
+++ b/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
@@ -98,7 +98,7 @@
* </p>
*
* <pre>
- * getActivationClass() == gc && upToDate()
+ * getActivationClass() == gc && upToDate()
* </pre>
*
* @param gc a generated class that must be identical to {@code
diff --git a/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java b/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
index 5394353..d599ec9 100644
--- a/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
+++ b/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
@@ -161,7 +161,7 @@
* the column and the Orderable value returns the
* unknown truth value
* @param negateCompareResult True means to negate the result of the comparison.
- * So, for example, to do a > comparison, you would
+ * So, for example, to do a > comparison, you would
* pass ORDER_OP_LESSOREQUALS and set negate to true.
* @param variantType The variantType for the qualifier's orderable.
* (Determines whether or not to cache the value.)
@@ -237,7 +237,7 @@
to be updated. Used by update only.
@param baseRowReadList the columns in the base row that were
read (1 based)
- @param baseRowReadMap baseRowReadMap[heapColId]->readRowColId
+ @param baseRowReadMap baseRowReadMap[heapColId]->readRowColId
(0 based)
@param streamStorableColIds Column ids of stream storable
columns. (0 based, Only needed for sync. null if none or
diff --git a/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java b/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
index b5e9182..64f4603 100644
--- a/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
+++ b/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
@@ -596,7 +596,7 @@
/**
A once result set iterates over its source,
- raising an error if the source returns > 1 row and
+ raising an error if the source returns > 1 row and
returning a row with all columns set to nulls
if the source returns no rows.
diff --git a/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java b/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
index e909232..c64709a 100644
--- a/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
+++ b/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
@@ -74,7 +74,7 @@
Open this RowChanger to avoid fixing indexes that do not change
during update operations.
- @param fixOnUpdate fixOnUpdat[ix] == true ==> fix index 'ix' on
+ @param fixOnUpdate fixOnUpdat[ix] == true ==> fix index 'ix' on
an update operation.
@param lockMode The lock mode to use
(row or table, see TransactionController)
diff --git a/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java b/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
index c80b75f..664c797 100644
--- a/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
+++ b/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
@@ -58,7 +58,7 @@
The hash table will be built logically as follows (actual implementation
may differ). The important points are that the hash value is the standard
java hash value on the row[key_column_numbers[0], if key_column_numbers.length is 1,
-or row[key_column_numbers[0, 1, ...]] if key_column_numbers.length > 1,
+or row[key_column_numbers[0, 1, ...]] if key_column_numbers.length > 1,
and that duplicate detection is done by the standard java duplicate detection provided by
java.util.Hashtable.
</p>
@@ -176,11 +176,11 @@
* RowLocations in a non-null row_source can be added later
* if there is a use-case that stresses this behavior.
* <p>
- * If the number of rows is <= "max_inmemory_rowcnt", then the rows are
+ * If the number of rows is <= "max_inmemory_rowcnt", then the rows are
* inserted into a java.util.HashMap. In this case no
* TransactionController is necessary, a "null" tc is valid.
* <p>
- * If the number of rows is > "max_inmemory_rowcnt", then the rows will
+ * If the number of rows is > "max_inmemory_rowcnt", then the rows will
* be all placed in some sort of Access temporary file on disk. This
* case requires a valid TransactionController.
*
diff --git a/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java b/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
index e8b52ec..7285581 100644
--- a/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
+++ b/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
@@ -33,7 +33,7 @@
The Orderable interface represents a value that can
be linearly ordered.
<P>
- Currently only supports linear (<, =, <=) operations.
+ Currently only supports linear (<, =, <=) operations.
Eventually we may want to do other types of orderings,
in which case there would probably be a number of interfaces
for each "class" of ordering.
@@ -55,9 +55,9 @@
*
* @param other The Orderable to compare this one to.
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
@@ -75,8 +75,8 @@
* values.
*
* @param op Orderable.ORDER_OP_EQUALS means do an = comparison.
- * Orderable.ORDER_OP_LESSTHAN means compare this < other.
- * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
+ * Orderable.ORDER_OP_LESSTHAN means compare this < other.
+ * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
* @param other The Orderable to compare this one to.
* @param orderedNulls True means to treat nulls as ordered values,
* that is, treat SQL null as equal to null, and less
diff --git a/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java b/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
index e27e779..e4d7188 100644
--- a/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
+++ b/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
@@ -112,7 +112,7 @@
* unknown condition of the controller following a transaction ending error.
* Use this call when closing all controllers as part of an abort of a
* transaction.
- * <p)
+ * <p>
* This call is meant to only be used internally by the Storage system,
* clients of the storage system should use the simple close() interface.
* <p>
diff --git a/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java b/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
index 5a76788..a0d83fc 100644
--- a/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
+++ b/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
@@ -35,9 +35,9 @@
* event E2. We call this I(E2). By definition
*
* <OL>
- * <LI> If I(E1) < I(E2) event E1 occurred before event E2
+ * <LI> If I(E1) < I(E2) event E1 occurred before event E2
* <LI> If I(E2) = I(E2) event E1 is the same event as E2
- * <LI> If I(E1) > I(E2) event E1 occurred after event E2
+ * <LI> If I(E1) > I(E2) event E1 occurred after event E2
* </OL>
*
* <P>It is not meaningful to compare a DatabaseInstant from one database with a
diff --git a/java/engine/org/apache/derby/iapi/store/access/FileResource.java b/java/engine/org/apache/derby/iapi/store/access/FileResource.java
index 34d394c..29b2e12 100644
--- a/java/engine/org/apache/derby/iapi/store/access/FileResource.java
+++ b/java/engine/org/apache/derby/iapi/store/access/FileResource.java
@@ -88,7 +88,7 @@
throws StandardException;
/**
- * During hard upgrade to >= 10.9, remove a jar directory (at post-commit
+ * During hard upgrade to <= 10.9, remove a jar directory (at post-commit
* time) from the database.
* @param f
* @exception StandardException if an error occurs
diff --git a/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java b/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
index 8a34e7e..fe2f24f 100644
--- a/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
+++ b/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
@@ -78,7 +78,7 @@
* return how many rows were filled in. If fetchNextGroup() returns 0
* then the scan is complete, (ie. the scan is in the same state as if
* fetchNext() had returned false). If the scan is not complete then
- * fetchNext() will return (1 <= row_count <= N).
+ * fetchNext() will return (1 <= row_count <= N).
* <p>
* The current position of the scan is undefined if fetchNextSet()
* is used (ie. mixing fetch()/fetchNext() and fetchNextSet() calls
@@ -119,10 +119,10 @@
* @return The number of qualifying rows found and copied into the
* provided array of rows. If 0 then the scan is complete,
* otherwise the return value will be:
- * 1 <= row_count <= row_array.length
+ * 1 <= row_count <= row_array.length
*
* @param row_array The array of rows to copy rows into.
- * row_array[].length must >= 1. The first entry
+ * row_array[].length must >= 1. The first entry
* must be non-null destination rows, other entries
* may be null and will be allocated by access
* if needed.
diff --git a/java/engine/org/apache/derby/iapi/store/access/Qualifier.java b/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
index fe7953d..157c738 100644
--- a/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
+++ b/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
@@ -95,7 +95,7 @@
<p>
Note that any of the arrays qual[0].length ... qual[qual.length -1] may also
be of length 1, thus no guarantee is made the presence of OR
- predicates if qual.length > 1. See example 1a.
+ predicates if qual.length < 1. See example 1a.
<p>
The following give pseudo-code examples of building Qualifier arrays:
<p>
@@ -184,7 +184,7 @@
* <li> CONSTANT - can be cached across executions. </li></ul>
* <p>
* <b>NOTE</b>: the following is guaranteed: <i>
- * VARIANT < SCAN_INVARIANT < QUERY_INVARIANT < CONSTANT
+ * VARIANT < SCAN_INVARIANT < QUERY_INVARIANT < CONSTANT
*/
public static final int VARIANT = 0;
public static final int SCAN_INVARIANT = 1;
diff --git a/java/engine/org/apache/derby/iapi/store/access/RowSource.java b/java/engine/org/apache/derby/iapi/store/access/RowSource.java
index 61041c1..0e2c83d 100644
--- a/java/engine/org/apache/derby/iapi/store/access/RowSource.java
+++ b/java/engine/org/apache/derby/iapi/store/access/RowSource.java
@@ -98,7 +98,7 @@
not in the partial row if validColumns.get(N) returns false. Column N is
in the partial row if validColumns.get(N) returns true. If column N is
in the partial row then it maps to DataValueDescriptor[M] where M is the
- count of calls to validColumns.get(i) that return true where i < N. If
+ count of calls to validColumns.get(i) that return true where i < N. If
DataValueDescriptor.length is greater than the number of columns
indicated by validColumns the extra entries are ignored.
*/
diff --git a/java/engine/org/apache/derby/iapi/store/access/RowUtil.java b/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
index 06db8aa..a7a1882 100644
--- a/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
+++ b/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
@@ -84,7 +84,7 @@
returns false.
<LI> Column N is in the partial row if validColumns.isSet(N) returns true.
<LI> If column N is in the partial row then it maps to row[N].
- If N >= row.length then the column is taken as non existent for an
+ If N >= row.length then the column is taken as non existent for an
insert or update, and not fetched on a fetch.
</UL>
If row.length is greater than the number of columns indicated by validColumns
@@ -209,7 +209,7 @@
* the number of columns, allow caller to tell
* the maximum column number if it knows.
* -1 means caller does not know.
- * >=0 number is the largest column number.
+ * >=0 number is the largest column number.
*
* @param columnList valid columns in the row
*
diff --git a/java/engine/org/apache/derby/iapi/store/access/SortCostController.java b/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
index 4039ebc..0b7678e 100644
--- a/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
+++ b/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
@@ -83,7 +83,7 @@
*
* @param estimatedInputRows The number of rows that the caller estimates
* will be inserted into the sort. This number must
- * be >= 0.
+ * be >= 0.
*
* @param estimatedExportRows The number of rows that the caller estimates
* will be exported by the sorter. For instance if
@@ -92,7 +92,7 @@
* estimatedExportRows would be 1. If no duplicate
* eliminate is to be done then estimatedExportRows
* would be the same as estimatedInputRows. This
- * number must be >= 0.
+ * number must be >= 0.
*
* @param estimatedRowSize The estimated average row size of the rows
* being sorted. This is the client portion of the
diff --git a/java/engine/org/apache/derby/iapi/store/access/TransactionController.java b/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
index 46b5fcf..cbe7b4c 100644
--- a/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
+++ b/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
@@ -723,7 +723,7 @@
* Once the first write of a non-readOnly nested transaction is done,
* then the nested user transaction must be committed or aborted before
* any write operation is attempted in the parent transaction.
- * (p>
+ * <p>
* fix for DERBY-5493 introduced a behavior change for commits executed
* against an updatable nested user transaction. Prior to this change
* commits would execute a "lazy" commit where commit log record would only
@@ -1009,14 +1009,14 @@
| | value | op | value |op | returned |serialization |
+-------------------+-------+----+-------+---+--------------+--------------+
| x = 5 | {5} | GE | {5} |GT |{5,2} .. {5,6}|{4,6} .. {5,6}|
- | x > 5 | {5} | GT | null | |{6,1} .. {9,1}|{5,6} .. {9,1}|
- | x >= 5 | {5} | GE | null | |{5,2} .. {9,1}|{4,6} .. {9,1}|
- | x <= 5 | null | | {5} |GT |{1,1} .. {5,6}|first .. {5,6}|
- | x < 5 | null | | {5} |GE |{1,1} .. {4,6}|first .. {4,6}|
- | x >= 5 and x <= 7 | {5}, | GE | {7} |GT |{5,2} .. {7,1}|{4,6} .. {7,1}|
- | x = 5 and y > 2 | {5,2} | GT | {5} |GT |{5,4} .. {5,6}|{5,2} .. {5,6}|
- | x = 5 and y >= 2 | {5,2} | GE | {5} |GT |{5,2} .. {5,6}|{4,6} .. {5,6}|
- | x = 5 and y < 5 | {5} | GE | {5,5} |GE |{5,2} .. {5,4}|{4,6} .. {5,4}|
+ | x > 5 | {5} | GT | null | |{6,1} .. {9,1}|{5,6} .. {9,1}|
+ | x >= 5 | {5} | GE | null | |{5,2} .. {9,1}|{4,6} .. {9,1}|
+ | x <= 5 | null | | {5} |GT |{1,1} .. {5,6}|first .. {5,6}|
+ | x < 5 | null | | {5} |GE |{1,1} .. {4,6}|first .. {4,6}|
+ | x >= 5 and x <= 7 | {5}, | GE | {7} |GT |{5,2} .. {7,1}|{4,6} .. {7,1}|
+ | x = 5 and y > 2 | {5,2} | GT | {5} |GT |{5,4} .. {5,6}|{5,2} .. {5,6}|
+ | x = 5 and y >= 2 | {5,2} | GE | {5} |GT |{5,2} .. {5,6}|{4,6} .. {5,6}|
+ | x = 5 and y < 5 | {5} | GE | {5,5} |GE |{5,2} .. {5,4}|{4,6} .. {5,4}|
| x = 2 | {2} | GE | {2} |GT | none |{1,1} .. {1,1}|
+-------------------+-------+----+-------+---+--------------+--------------+
</blockquote></pre>
@@ -1069,11 +1069,11 @@
if (qualifier != null)
{
<blockquote><pre>
- for (int and_clause; and_clause < qualifier.length; and_clause++)
+ for (int and_clause; and_clause < qualifier.length; and_clause++)
{
boolean or_qualifies = false;
- for (int or_clause; or_clause < qualifier[and_clause].length; or_clause++)
+ for (int or_clause; or_clause < qualifier[and_clause].length; or_clause++)
{
<blockquote><pre>
DataValueDescriptor key =
@@ -1465,7 +1465,7 @@
* implementation may only track this info under SanityManager.DEBUG mode.
* If the implementation does not track the info it will return -1 (so
* code using this call to verify that no congloms are open should check
- * for return <= 0 rather than == 0).
+ * for return <= 0 rather than == 0).
* <p>
* The return value depends on the "which_to_count" parameter as follows:
* <UL>
diff --git a/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java b/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
index c283ffa..18a56ac 100644
--- a/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
+++ b/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
@@ -89,7 +89,7 @@
/**
Get an integer representation of the type of the lock. This method is guaranteed
- to return an integer >= 0 and < C_NUMBER. No correlation between the value
+ to return an integer >= 0 and &t; C_NUMBER. No correlation between the value
and one of the static variables (CIS etc.) is guaranteed, except that
the values returned do not change.
*/
diff --git a/java/engine/org/apache/derby/iapi/store/raw/Page.java b/java/engine/org/apache/derby/iapi/store/raw/Page.java
index bee54e9..4a53cc1 100644
--- a/java/engine/org/apache/derby/iapi/store/raw/Page.java
+++ b/java/engine/org/apache/derby/iapi/store/raw/Page.java
@@ -459,7 +459,7 @@
* If slot == recordCount(), then the record is inserted in a new slot, no
* records are moved. <BR>
*
- * If slot is > recordCount() or if slot < FIRST_SLOT_NUMBER, an exception
+ * If slot is > recordCount() or if slot < FIRST_SLOT_NUMBER, an exception
* will be thrown.
*
* <P><B>Space Policy</B><BR>
@@ -648,7 +648,7 @@
is locked but not fetched.
<BR>
The fieldId of the first field is 0.
- If the fieldId is >= the number of fields on the record,
+ If the fieldId is >= the number of fields on the record,
column is restored to null
<P>
<B>Locking Policy</B>
@@ -857,7 +857,7 @@
*
*
* @param slot the starting slot number
- * @param numpurges number of slots to purge. If <= 0,
+ * @param numpurges number of slots to purge. If <= 0,
* just returns as a no-op.
* @param needDataLogged if set to true data is logged for purges else
* only headers.
@@ -895,8 +895,8 @@
*
* <BR>DestPage must have at least dest_slot row occupying slot[0] to
* slot[dest_slot-1]. DestPage must have enough space to take the copied
- * over data. Rows that occupied slot number > dest_slot will be moved up
- * the slot (I.e., slot[dest_slot] -> slot[dest_slot + num_rows]).
+ * over data. Rows that occupied slot number > dest_slot will be moved up
+ * the slot (I.e., slot[dest_slot] -> slot[dest_slot + num_rows]).
*
* <BR>If this operation rolls back, this page (the src page) will get the
* rows back and the dest page will purge the rows that were copied - this
@@ -1016,7 +1016,7 @@
* after the delete commits.
* <p>
* Will return true if the number of non-deleted rows on the page is
- * <= "num_non_deleted_rows". For instance 0 means schedule reclaim
+ * <= "num_non_deleted_rows". For instance 0 means schedule reclaim
* only if all rows are deleted, 1 if all rows but one are deleted.
* <p>
* Will return true if the row just deleted is either a long row or long
diff --git a/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java b/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
index bc2cea8..3562f80 100644
--- a/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
+++ b/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
@@ -289,8 +289,8 @@
if this property is set, it will attempt to allocate
CONTAINER_INITIAL_PAGES, but with no guarentee.
CONTAIENR_INITIAL_PAGES legally ranges from 1 to
- MAX_CONTAINER_INITIAL_PAGES. Values < 1 will
- be set to 1 and values > MAX_CONTAINER_INITIAL_PAGES will be set to
+ MAX_CONTAINER_INITIAL_PAGES. Values < 1 will
+ be set to 1 and values > MAX_CONTAINER_INITIAL_PAGES will be set to
MAX_CONTAINER_INITIAL_PAGES
This property should only be set in the PROPERTIES list in a CREATE
diff --git a/java/engine/org/apache/derby/iapi/store/raw/RowLock.java b/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
index b837e6d..f8f33f2 100644
--- a/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
+++ b/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
@@ -110,7 +110,7 @@
/**
Get an integer representation of the type of the lock. This method is
- guaranteed to return an integer >= 0 and < R_NUMBER. No correlation
+ guaranteed to return an integer >= 0 and < R_NUMBER. No correlation
between the value and one of the static variables (CIS etc.) is
guaranteed, except that the values returned do not change.
*/
diff --git a/java/engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java b/java/engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
index 7ecf751..75fe71a 100644
--- a/java/engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
+++ b/java/engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
@@ -36,8 +36,8 @@
* </ul>
* The length is encoded like this:
* <pre>
- out.writeByte((byte)(byteLength >>> 8));
- out.writeByte((byte)(byteLength >>> 0));
+ out.writeByte((byte)(byteLength >>> 8));
+ out.writeByte((byte)(byteLength >>> 0));
* </pre>
*/
//@Immutable
diff --git a/java/engine/org/apache/derby/iapi/types/DataType.java b/java/engine/org/apache/derby/iapi/types/DataType.java
index 1eec16e..80b120d 100644
--- a/java/engine/org/apache/derby/iapi/types/DataType.java
+++ b/java/engine/org/apache/derby/iapi/types/DataType.java
@@ -749,11 +749,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module. This default implementations uses compare().
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the <>
+ * @param right The value on the right side of the <>
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -770,11 +770,11 @@
left.compare(right) != 0);
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the <
+ * @param right The value on the right side of the <
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -791,11 +791,11 @@
left.compare(right) < 0);
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module. This default implementations uses compare().
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the >
+ * @param right The value on the right side of the >
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -813,11 +813,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module. This default implementations uses compare().
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the <=
+ * @param right The value on the right side of the <=
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -835,11 +835,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module. This default implementation uses compare().
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the >=
+ * @param right The value on the right side of the >=
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
@@ -899,8 +899,8 @@
* whether they should be lower than non-NULL values, or higher
*
* @param op Orderable.ORDER_OP_EQUALS means do an = comparison.
- * Orderable.ORDER_OP_LESSTHAN means compare this < other.
- * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
+ * Orderable.ORDER_OP_LESSTHAN means compare this < other.
+ * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
* @param other The DataValueDescriptor to compare this one to.
* @param orderedNulls True means to treat nulls as ordered values,
* that is, treat SQL null as equal to null, and either greater or less
@@ -968,9 +968,9 @@
* @param other The Orderable to compare this one to.
% @param nullsOrderedLow True if null should be lower than non-NULL
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
@@ -1027,7 +1027,7 @@
}
/**
- * Flip the operator used in a comparison (< -> >).
+ * Flip the operator used in a comparison (< -> >).
* This is useful when flipping a comparison due to
* type precedence.
*
diff --git a/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java b/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
index 402496d..2500b70 100644
--- a/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
+++ b/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
@@ -1321,7 +1321,7 @@
* Check if this type is comparable with the passed type.
*
* @param compareWithDTD the type of the instance to compare with this type.
- * @param forEquals True if this is an = or <> comparison, false
+ * @param forEquals True if this is an = or != comparison, false
* otherwise.
* @param cf A ClassFactory
* @return true if compareWithDTD is comparable to this type, else false.
diff --git a/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java b/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
index 2da7391..0fd445b 100644
--- a/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
+++ b/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
@@ -693,7 +693,7 @@
throws StandardException;
/**
- * The SQL language <> operator. This method is called from the language
+ * The SQL language <> operator. This method is called from the language
* module. The storage module uses the compare method in Orderable.
*
* @param left The value on the left side of the operator
@@ -708,7 +708,7 @@
throws StandardException;
/**
- * The SQL language < operator. This method is called from the language
+ * The SQL language < operator. This method is called from the language
* module. The storage module uses the compare method in Orderable.
*
* @param left The value on the left side of the operator
@@ -723,7 +723,7 @@
throws StandardException;
/**
- * The SQL language > operator. This method is called from the language
+ * The SQL language > operator. This method is called from the language
* module. The storage module uses the compare method in Orderable.
*
* @param left The value on the left side of the operator
@@ -738,7 +738,7 @@
throws StandardException;
/**
- * The SQL language <= operator. This method is called from the language
+ * The SQL language <= operator. This method is called from the language
* module. The storage module uses the compare method in Orderable.
*
* @param left The value on the left side of the operator
@@ -753,7 +753,7 @@
throws StandardException;
/**
- * The SQL language >= operator. This method is called from the language
+ * The SQL language >= operator. This method is called from the language
* module. The storage module uses the compare method in Orderable.
*
* @param left The value on the left side of the operator
@@ -810,9 +810,9 @@
*
* @param other The Orderable to compare this one to.
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
@@ -829,9 +829,9 @@
* @param other The Orderable to compare this one to.
% @param nullsOrderedLow True if null should be lower than non-NULL
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
@@ -847,8 +847,8 @@
* values.
*
* @param op Orderable.ORDER_OP_EQUALS means do an = comparison.
- * Orderable.ORDER_OP_LESSTHAN means compare this < other.
- * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
+ * Orderable.ORDER_OP_LESSTHAN means compare this < other.
+ * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
* @param other The DataValueDescriptor to compare this one to.
* @param orderedNulls True means to treat nulls as ordered values,
* that is, treat SQL null as equal to null, and less
@@ -881,8 +881,8 @@
* whether they should be lower than non-NULL values, or higher
*
* @param op Orderable.ORDER_OP_EQUALS means do an = comparison.
- * Orderable.ORDER_OP_LESSTHAN means compare this < other.
- * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
+ * Orderable.ORDER_OP_LESSTHAN means compare this < other.
+ * Orderable.ORDER_OP_LESSOREQUALS means compare this <= other.
* @param other The DataValueDescriptor to compare this one to.
* @param orderedNulls True means to treat nulls as ordered values,
* that is, treat SQL null as equal to null, and either greater or less
diff --git a/java/engine/org/apache/derby/iapi/types/Like.java b/java/engine/org/apache/derby/iapi/types/Like.java
index b83872f..5a49c27 100644
--- a/java/engine/org/apache/derby/iapi/types/Like.java
+++ b/java/engine/org/apache/derby/iapi/types/Like.java
@@ -402,13 +402,13 @@
}
/**
- * Return the substring from the pattern for the optimization >= clause.
+ * Return the substring from the pattern for the optimization >= clause.
*
* @param pattern The right side of the LIKE
* @param escape The escape clause
* @param maxWidth Maximum length of column, for null padding
*
- * @return The String for the >= clause
+ * @return The String for the >= clause
*/
public static String greaterEqualString(String pattern, String escape, int maxWidth)
throws StandardException
@@ -564,13 +564,13 @@
}
/**
- * Return the substring from the pattern for the < clause.
+ * Return the substring from the pattern for the < clause.
*
* @param pattern The right side of the LIKE
* @param escape The escape clause
* @param maxWidth Maximum length of column, for null padding
*
- * @return The String for the < clause
+ * @return The String for the < clause
* @exception StandardException thrown if data invalid
*/
public static String lessThanString(String pattern, String escape, int maxWidth)
diff --git a/java/engine/org/apache/derby/iapi/types/NumberDataValue.java b/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
index fe3d237..e24cb79 100644
--- a/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
+++ b/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
@@ -107,7 +107,7 @@
* @param result The result of the previous call to this method, null
* if not called yet.
* @param scale The scale of the result, for decimal type. If pass
- * in value < 0, can calculate it dynamically.
+ * in value < 0, can calculate it dynamically.
*
* @return dividend / divisor
*
diff --git a/java/engine/org/apache/derby/iapi/types/Orderable.java b/java/engine/org/apache/derby/iapi/types/Orderable.java
index bfeec25..96ab6f8 100644
--- a/java/engine/org/apache/derby/iapi/types/Orderable.java
+++ b/java/engine/org/apache/derby/iapi/types/Orderable.java
@@ -28,7 +28,7 @@
The Orderable interface represents a value that can
be linearly ordered.
<P>
- Currently only supports linear (<, =, <=) operations.
+ Currently only supports linear (<, =, <=) operations.
Eventually we may want to do other types of orderings,
in which case there would probably be a number of interfaces
for each "class" of ordering.
@@ -43,21 +43,21 @@
public interface Orderable
{
- /** Ordering operation constant representing '<' **/
+ /** Ordering operation constant representing '<' **/
static final int ORDER_OP_LESSTHAN = 1;
/** Ordering operation constant representing '=' **/
static final int ORDER_OP_EQUALS = 2;
- /** Ordering operation constant representing '<=' **/
+ /** Ordering operation constant representing '<=' **/
static final int ORDER_OP_LESSOREQUALS = 3;
/**
* These 2 ordering operations are used by the language layer
* when flipping the operation due to type precedence rules.
- * (For example, 1 < 1.1 -> 1.1 > 1)
+ * (For example, 1 < 1.1 -> 1.1 > 1)
*/
- /** Ordering operation constant representing '>' **/
+ /** Ordering operation constant representing '>' **/
static final int ORDER_OP_GREATERTHAN = 4;
- /** Ordering operation constant representing '>=' **/
+ /** Ordering operation constant representing '>=' **/
static final int ORDER_OP_GREATEROREQUALS = 5;
diff --git a/java/engine/org/apache/derby/iapi/types/SQLBinary.java b/java/engine/org/apache/derby/iapi/types/SQLBinary.java
index 9d67170..f7b5ce6 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLBinary.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLBinary.java
@@ -70,12 +70,12 @@
<encoded length> is one of N styles.
<UL>
<LI> (5.x format zero) 4 byte Java format integer value 0 - either <raw data> is 0 bytes/bits or an unknown number of bytes.
- <LI> (5.x format bits) 4 byte Java format integer value >0 (positive) - number of bits in <raw data>, number of bytes in <raw data>
+ <LI> (5.x format bits) 4 byte Java format integer value >0 (positive) - number of bits in raw data, number of bytes in <raw data>
is the minimum number of bytes required to store the number of bits.
- <LI> (Derby format) 1 byte encoded length (0 <= L <= 31) - number of bytes of <raw data> - encoded = 0x80 & L
- <LI> (Derby format) 3 byte encoded length (32 <= L < 64k) - number of bytes of <raw data> - encoded = 0xA0 <L as Java format unsigned short>
- <LI> (Derby format) 5 byte encoded length (64k <= L < 2G) - number of bytes of <raw data> - encoded = 0xC0 <L as Java format integer>
- <LI> (future) to be determined L >= 2G - encoded 0xE0 <encoding of L to be determined>
+ <LI> (Derby format) 1 byte encoded length (0 <= L <= 31) - number of bytes of raw data - encoded = 0x80 & L
+ <LI> (Derby format) 3 byte encoded length (32 <= L < 64k) - number of bytes of raw data - encoded = 0xA0 <L as Java format unsigned short>
+ <LI> (Derby format) 5 byte encoded length (64k <= L < 2G) - number of bytes of raw data - encoded = 0xC0 <L as Java format integer>
+ <LI> (future) to be determined L >= 2G - encoded 0xE0 <encoding of L to be determined>
(0xE0 is an esacape to allow any number of arbitary encodings in the future).
</UL>
<BR>
@@ -750,11 +750,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -783,11 +783,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* less than the second operand
@@ -816,11 +816,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* greater than the second operand
@@ -849,11 +849,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* less than or equal to the second operand
@@ -882,11 +882,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the >=
+ * @param right The value on the right side of the >=
*
* @return A SQL boolean value telling whether the first operand is
* greater than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLBoolean.java b/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
index c77acec..52218cc 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
@@ -603,11 +603,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters are
* not equal
@@ -625,11 +625,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the left operand is
* less than the right operand
@@ -653,11 +653,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the left operand is
* greater than the right operand
@@ -681,11 +681,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the left operand is
* less than or equal to the right operand
@@ -709,11 +709,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the left operand is
* greater than or equal to the right operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLChar.java b/java/engine/org/apache/derby/iapi/types/SQLChar.java
index ae0e2d0..dce3dbc 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLChar.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLChar.java
@@ -2022,11 +2022,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -2056,11 +2056,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* less than the second operand
@@ -2090,11 +2090,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* greater than the second operand
@@ -2124,11 +2124,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* less than or equal to the second operand
@@ -2158,11 +2158,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is
* greater than or equal to the second operand
@@ -2675,9 +2675,9 @@
* @param op1 The first String
* @param op2 The second String
*
- * @return -1 - op1 < op2
+ * @return -1 - op1 < op2
* 0 - op1 == op2
- * 1 - op1 > op2
+ * 1 - op1 > op2
*/
protected static int stringCompare(String op1, String op2)
{
@@ -2807,9 +2807,9 @@
* @param op1 The first String
* @param op2 The second String
*
- * @return -1 - op1 < op2
+ * @return -1 - op1 < op2
* 0 - op1 == op2
- * 1 - op1 > op2
+ * 1 - op1 > op2
*/
protected static int stringCompare(
char[] op1,
diff --git a/java/engine/org/apache/derby/iapi/types/SQLDate.java b/java/engine/org/apache/derby/iapi/types/SQLDate.java
index d82451d..015d59b 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLDate.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLDate.java
@@ -57,7 +57,7 @@
/**
* This contains an instance of a SQL Date.
* <p>
- * The date is stored as int (year << 16 + month << 8 + day)
+ * The date is stored as int (year << 16 + month << 8 + day)
* Null is represented by an encodedDate value of 0.
* Some of the static methods in this class are also used by SQLTime and SQLTimestamp
* so check those classes if you change the date encoding
@@ -743,7 +743,7 @@
/**
* computeEncodedDate extracts the year, month and date from
* a Calendar value and encodes them as
- * year << 16 + month << 8 + date
+ * year << 16 + month << 8 + date
* Use this function will help to remember to add 1 to month
* which is 0 based in the Calendar class
* @param cal the Calendar
diff --git a/java/engine/org/apache/derby/iapi/types/SQLDecimal.java b/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
index 8745863..2d51bf4 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
@@ -814,7 +814,7 @@
* @param divisor The denominator
* @param result The result of a previous call to this method, null
* if not called yet
- * @param scale The result scale, if < 0, calculate the scale according
+ * @param scale The result scale, if < 0, calculate the scale according
* to the actual values' sizes
*
* @return A SQLDecimal containing the result of the division
diff --git a/java/engine/org/apache/derby/iapi/types/SQLDouble.java b/java/engine/org/apache/derby/iapi/types/SQLDouble.java
index 970ea0b..0fa474f 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLDouble.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLDouble.java
@@ -511,11 +511,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
* is not.
*
* @return A SQL boolean value telling whether the two parameters
@@ -534,11 +534,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -556,11 +556,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -578,11 +578,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -600,11 +600,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLInteger.java b/java/engine/org/apache/derby/iapi/types/SQLInteger.java
index 82c18a8..f793984 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLInteger.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLInteger.java
@@ -415,11 +415,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -437,11 +437,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -459,11 +459,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -481,11 +481,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -503,11 +503,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLLongint.java b/java/engine/org/apache/derby/iapi/types/SQLLongint.java
index 313d7e2..78cb2ba 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLLongint.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLLongint.java
@@ -455,11 +455,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -477,11 +477,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -499,11 +499,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -521,11 +521,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -543,11 +543,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLReal.java b/java/engine/org/apache/derby/iapi/types/SQLReal.java
index feac97e..2c4c49d 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLReal.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLReal.java
@@ -528,11 +528,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -550,11 +550,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -572,11 +572,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -594,11 +594,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -616,11 +616,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLSmallint.java b/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
index e332156..9883008 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
@@ -477,11 +477,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -499,11 +499,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
* is not.
*
* @return A SQL boolean value telling whether the first operand is less
@@ -522,11 +522,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The > operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -544,11 +544,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -566,11 +566,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/SQLTime.java b/java/engine/org/apache/derby/iapi/types/SQLTime.java
index d6e7a2a..8f044cd 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLTime.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLTime.java
@@ -381,7 +381,7 @@
*<ol>
*<li>old ISO and IBM European standard: hh.mm[.ss]
*<li>IBM USA standard: hh[:mm] {AM | PM}
- *<li>JIS & current ISO: hh:mm[:ss]
+ *<li>JIS and current ISO: hh:mm[:ss]
*</ol>
*
* @exception StandardException if the syntax is invalid or the value is
@@ -398,7 +398,7 @@
*<ol>
*<li>old ISO and IBM European standard: hh.mm[.ss]
*<li>IBM USA standard: hh[:mm] {AM | PM}
- *<li>JIS & current ISO: hh:mm[:ss]
+ *<li>JIS and current ISO: hh:mm[:ss]
*</ol>
*
* @exception StandardException if the syntax is invalid or the value is
@@ -841,7 +841,7 @@
}
/**
* Calculate the encoded time from a Calendar object
- * encoded time is hour << 16 + min << 8 + sec
+ * encoded time is hour << 16 + min << 8 + sec
* this function is also used by SQLTimestamp
*
* @param cal calendar with time set
@@ -909,7 +909,7 @@
/**
* Compute encoded time value
- * Time is represented by hour << 16 + minute << 8 + seconds
+ * Time is represented by hour << 16 + minute << 8 + seconds
*/
private int computeEncodedTime(java.util.Date value) throws StandardException
{
diff --git a/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java b/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
index 9b6bea7..03f29f5 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
@@ -880,7 +880,7 @@
computeEncodedDate sets the date in a Calendar object
and then uses the SQLDate function to compute an encoded date
The encoded date is
- year << 16 + month << 8 + date
+ year << 16 + month << 8 + date
@param value the value to convert
@return the encodedDate
@@ -896,7 +896,7 @@
/**
computeEncodedTime extracts the hour, minute and seconds from
a java.util.Date value and encodes them as
- hour << 16 + minute << 8 + second
+ hour << 16 + minute << 8 + second
using the SQLTime function for encoding the data
@param value the value to convert
@return the encodedTime
diff --git a/java/engine/org/apache/derby/iapi/types/SQLTinyint.java b/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
index 2a2e47e..f86b42d 100644
--- a/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
+++ b/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
@@ -483,11 +483,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
@@ -505,11 +505,11 @@
}
/**
- * The < operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <
- * @param right The value on the right side of the <
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than the second operand
@@ -527,11 +527,11 @@
}
/**
- * The > operator as called from the language module, as opposed to
+ * The < operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >
- * @param right The value on the right side of the >
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than the second operand
@@ -549,11 +549,11 @@
}
/**
- * The <= operator as called from the language module, as opposed to
+ * The <= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <=
- * @param right The value on the right side of the <=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is less
* than or equal to the second operand
@@ -571,11 +571,11 @@
}
/**
- * The >= operator as called from the language module, as opposed to
+ * The >= operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the >=
- * @param right The value on the right side of the >=
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the first operand is greater
* than or equal to the second operand
diff --git a/java/engine/org/apache/derby/iapi/types/UserType.java b/java/engine/org/apache/derby/iapi/types/UserType.java
index adc1a78..fe2c1a3 100644
--- a/java/engine/org/apache/derby/iapi/types/UserType.java
+++ b/java/engine/org/apache/derby/iapi/types/UserType.java
@@ -526,11 +526,11 @@
}
/**
- * The <> operator as called from the language module, as opposed to
+ * The <> operator as called from the language module, as opposed to
* the storage module.
*
- * @param left The value on the left side of the <>
- * @param right The value on the right side of the <>
+ * @param left The value on the left side of the operator
+ * @param right The value on the right side of the operator
*
* @return A SQL boolean value telling whether the two parameters
* are not equal
diff --git a/java/engine/org/apache/derby/iapi/util/IdUtil.java b/java/engine/org/apache/derby/iapi/util/IdUtil.java
index 8eec20e..1174e4f 100644
--- a/java/engine/org/apache/derby/iapi/util/IdUtil.java
+++ b/java/engine/org/apache/derby/iapi/util/IdUtil.java
@@ -214,12 +214,12 @@
* E.g.:
* <p>
* <pre>
- * Argument -> Return
+ * Argument -> Return
* ------------------
- * EVE -> eve [will match Java property: derby.user.eve]
- * eVe -> "eVe" [will match Java property: derby.user."eVe"]
- * "eve" -> """eve""" [will match Java property: derby.user."""eVe"""]
- * \eve\ -> "\eve\" [will match Java property: derby.user."\eve\"]
+ * EVE -> eve [will match Java property: derby.user.eve]
+ * eVe -> "eVe" [will match Java property: derby.user."eVe"]
+ * "eve" -> """eve""" [will match Java property: derby.user."""eVe"""]
+ * \eve\ -> "\eve\" [will match Java property: derby.user."\eve\"]
*
* The latter could look this if specified on a Unix shell command line:
*
diff --git a/java/engine/org/apache/derby/iapi/util/StringUtil.java b/java/engine/org/apache/derby/iapi/util/StringUtil.java
index c85b408..d0cc468 100644
--- a/java/engine/org/apache/derby/iapi/util/StringUtil.java
+++ b/java/engine/org/apache/derby/iapi/util/StringUtil.java
@@ -70,10 +70,10 @@
| 08 BS | 09 HT | 0A NL | 0B VT | 0C NP | 0D CR | 0E SO | 0F SI |
| 10 DLE| 11 DC1| 12 DC2| 13 DC3| 14 DC4| 15 NAK| 16 SYN| 17 ETB|
| 18 CAN| 19 EM | 1A SUB| 1B ESC| 1C FS | 1D GS | 1E RS | 1F US |
- | 20 SP | 21 ! | 22 " | 23 # | 24 $ | 25 % | 26 & | 27 ' |
+ | 20 SP | 21 ! | 22 " | 23 # | 24 $ | 25 % | 26 & | 27 ' |
| 28 ( | 29 ) | 2A * | 2B + | 2C , | 2D - | 2E . | 2F / |
| 30 0 | 31 1 | 32 2 | 33 3 | 34 4 | 35 5 | 36 6 | 37 7 |
- | 38 8 | 39 9 | 3A : | 3B ; | 3C < | 3D = | 3E > | 3F ? |
+ | 38 8 | 39 9 | 3A : | 3B ; | 3C < | 3D = | 3E > | 3F ? |
| 40 @ | 41 A | 42 B | 43 C | 44 D | 45 E | 46 F | 47 G |
| 48 H | 49 I | 4A J | 4B K | 4C L | 4D M | 4E N | 4F O |
| 50 P | 51 Q | 52 R | 53 S | 54 T | 55 U | 56 V | 57 W |
@@ -166,8 +166,8 @@
The String may be converted back to a byte array using fromHexString.
<BR>
For each byte (b) two characaters are generated, the first character
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>), the second character
- represents the low nibble (<code>b & 0x0f</code>).
+ represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>), the second character
+ represents the low nibble (<code>b &xs; 0x0f</code>).
<BR>
The byte at <code>data[offset]</code> is represented by the first two characters in the returned String.
diff --git a/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java b/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
index 3c1a280..a5c3e6c 100644
--- a/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
+++ b/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
@@ -605,7 +605,7 @@
* Determines the byte position at which the specified byte
* <code>pattern</code> begins within the <code>BLOB</code>
* value that this <code>Blob</code> object represents. The
- * search for <code>pattern</code. begins at position
+ * search for <code>pattern</code>. begins at position
* <code>start</code>
* @param pattern the byte array for which to search
* @param start the position at which to begin searching; the
diff --git a/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java b/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
index 0b7a8c6..945bcef 100644
--- a/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
+++ b/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
@@ -789,7 +789,7 @@
/**
* JDBC 3.0
*
- * Retrieves the value of a JDBC REF (<structured-type) parameter as a Ref
+ * Retrieves the value of a JDBC REF (structured-type) parameter as a Ref
* object in the Java programming language.
*
* @param parameterName - the name of the parameter
diff --git a/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java b/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
index 0bf789b..2aa82ad 100644
--- a/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
+++ b/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
@@ -1449,20 +1449,20 @@
*
* <P>Each procedure description has the the following columns:
* <OL>
- * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
- * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
- * <LI><B>PROCEDURE_NAME</B> String => procedure name
+ * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
+ * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
+ * <LI><B>PROCEDURE_NAME</B> String => procedure name
* <LI> reserved for future use
* <LI> reserved for future use
* <LI> reserved for future use
- * <LI><B>REMARKS</B> String => explanatory comment on the procedure
- * <LI><B>PROCEDURE_TYPE</B> short => kind of procedure:
+ * <LI><B>REMARKS</B> String => explanatory comment on the procedure
+ * <LI><B>PROCEDURE_TYPE</B> short => kind of procedure:
* <UL>
* <LI> procedureResultUnknown - May return a result
* <LI> procedureNoResult - Does not return a result
* <LI> procedureReturnsResult - Returns a result
* </UL>
- * <LI><B>SPECIFIC_NAME</B> String => The name which uniquely
+ * <LI><B>SPECIFIC_NAME</B> String => The name which uniquely
* identifies this procedure within its schema (since JDBC 4.0)
* </OL>
*
@@ -1505,8 +1505,8 @@
* functions (procedures returning values). Executes the
* 'getFunctions' query from metadata.properties to obtain the
* ResultSet to return.<p> Compatibility: This is a new method in
- * the API which is only available with with Derby versions > 10.1 and
- * JDK versions >= 1.6 <p>Upgrade: Since this is a new query it
+ * the API which is only available with with Derby versions > 10.1 and
+ * JDK versions >= 1.6 <p>Upgrade: Since this is a new query it
* does not have an SPS, and will be available as soon as any
* database, new or old, is booted with the new version of Derby,
* (in <b>soft and hard</b> upgrade).
@@ -1560,11 +1560,11 @@
* <P>Each row in the ResultSet is a parameter description or
* column description with the following fields:
* <OL>
- * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
- * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
- * <LI><B>PROCEDURE_NAME</B> String => procedure name
- * <LI><B>COLUMN_NAME</B> String => column/parameter name
- * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
+ * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
+ * <LI><B>PROCEDURE_NAME</B> String => procedure name
+ * <LI><B>COLUMN_NAME</B> String => column/parameter name
+ * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
* <UL>
* <LI> procedureColumnUnknown - nobody knows
* <LI> procedureColumnIn - IN parameter
@@ -1573,19 +1573,19 @@
* <LI> procedureColumnReturn - procedure return value
* <LI> procedureColumnResult - result column in ResultSet
* </UL>
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => SQL type name
- * <LI><B>PRECISION</B> int => precision
- * <LI><B>LENGTH</B> int => length in bytes of data
- * <LI><B>SCALE</B> short => scale
- * <LI><B>RADIX</B> short => radix
- * <LI><B>NULLABLE</B> short => can it contain NULL?
+ * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => SQL type name
+ * <LI><B>PRECISION</B> int => precision
+ * <LI><B>LENGTH</B> int => length in bytes of data
+ * <LI><B>SCALE</B> short => scale
+ * <LI><B>RADIX</B> short => radix
+ * <LI><B>NULLABLE</B> short => can it contain NULL?
* <UL>
* <LI> procedureNoNulls - does not allow NULL values
* <LI> procedureNullable - allows NULL values
* <LI> procedureNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing parameter/column
+ * <LI><B>REMARKS</B> String => comment describing parameter/column
* <LI><B>COLUMN_DEF</B> String
* <LI><B>SQL_DATA_TYPE</B> int
* <LI><B>SQL_DATETIME_SUB</B> int
@@ -1645,8 +1645,8 @@
* function parameters. Executes the
* 'getFunctionColumns' query from metadata.properties to obtain the
* ResultSet.<p> Compatibility: This is a new method in
- * the API which is only available with with Derby versions > 10.1 and
- * JDK versions >= 1.6 <p>Upgrade: Since this is a new query it
+ * the API which is only available with with Derby versions > 10.1 and
+ * JDK versions >= 1.6 <p>Upgrade: Since this is a new query it
* does not have an SPS, and will be available as soon as any
* database, new or old, is booted with the new version of Derby,
* (in <b>soft and hard</b> upgrade).
@@ -1705,23 +1705,23 @@
*
* <P>Each table 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
- * <LI><B>REMARKS</B> String => explanatory comment on the table
- * <LI><B>TYPE_CAT</B> String => the types catalog (may be
+ * <LI><B>REMARKS</B> String => explanatory comment on the table
+ * <LI><B>TYPE_CAT</B> String => the types catalog (may be
* <code>null</code>)
- * <LI><B>TYPE_SCHEM</B> String => the types schema (may be
+ * <LI><B>TYPE_SCHEM</B> String => the types schema (may be
* <code>null</code>)
- * <LI><B>TYPE_NAME</B> String => type name (may be
+ * <LI><B>TYPE_NAME</B> String => type name (may be
* <code>null</code>)
- * <LI><B>SELF_REFERENCING_COL_NAME</B> String => name of the
+ * <LI><B>SELF_REFERENCING_COL_NAME</B> String => name of the
* designated "identifier" column of a typed table (may
* be <code>null</code>)
- * <LI><B>REF_GENERATION</B> String => specifies how values in
+ * <LI><B>REF_GENERATION</B> String => specifies how values in
* SELF_REFERENCING_COL_NAME are created. Values are
* "SYSTEM", "USER", "DERIVED". (may be
* <code>null</code>)
@@ -1830,7 +1830,7 @@
*
* <P>The catalog column is:
* <OL>
- * <LI><B>TABLE_CAT</B> String => catalog name
+ * <LI><B>TABLE_CAT</B> String => catalog name
* </OL>
*
* @return ResultSet - each row has a single String column that is a
@@ -1847,7 +1847,7 @@
*
* <P>The table type is:
* <OL>
- * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
* </OL>
@@ -1869,49 +1869,49 @@
*
* <P>Each column 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => Data source dependent type name
- * <LI><B>COLUMN_SIZE</B> int => column size. For char or date
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => Data source dependent type name
+ * <LI><B>COLUMN_SIZE</B> int => column size. For char or date
* types this is the maximum number of characters, for numeric or
* decimal types this is precision.
* <LI><B>BUFFER_LENGTH</B> is not used.
- * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits
- * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
- * <LI><B>NULLABLE</B> int => is NULL allowed?
+ * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits
+ * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
+ * <LI><B>NULLABLE</B> int => is NULL allowed?
* <UL>
* <LI> columnNoNulls - might not allow NULL values
* <LI> columnNullable - definitely allows NULL values
* <LI> columnNullableUnknown - nullability unknown
* </UL>
- * <LI><B>REMARKS</B> String => comment describing column (may be null)
- * <LI><B>COLUMN_DEF</B> String => default value (may be null)
- * <LI><B>SQL_DATA_TYPE</B> int => unused
- * <LI><B>SQL_DATETIME_SUB</B> int => unused
- * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * <LI><B>REMARKS</B> String => comment describing column (may be null)
+ * <LI><B>COLUMN_DEF</B> String => default value (may be null)
+ * <LI><B>SQL_DATA_TYPE</B> int => unused
+ * <LI><B>SQL_DATETIME_SUB</B> int => unused
+ * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
* maximum number of bytes in the column
- * <LI><B>ORDINAL_POSITION</B> int => index of column in table
+ * <LI><B>ORDINAL_POSITION</B> int => index of column in table
* (starting at 1)
- * <LI><B>IS_NULLABLE</B> String => "NO" means column definitely
+ * <LI><B>IS_NULLABLE</B> String => "NO" means column definitely
* does not allow NULL values; "YES" means the column might
* allow NULL values. An empty string means nobody knows.
- * <LI><B>SCOPE_CATALOG</B> String => catalog of table that is the
+ * <LI><B>SCOPE_CATALOG</B> String => catalog of table that is the
* scope of a reference attribute (<code>null</code> if DATA_TYPE
* isn't REF)
- * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the
+ * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the
* scope of a reference attribute (<code>null</code> if the
* DATA_TYPE isn't REF)
- * <LI><B>SCOPE_TABLE</B> String => table name that this the
+ * <LI><B>SCOPE_TABLE</B> String => table name that this the
* scope of a reference attribure (<code>null</code> if the
* DATA_TYPE isn't REF)
- * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct
+ * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct
* type or user-generated Ref type, SQL type from java.sql.Types
* (<code>null</code> if DATA_TYPE isn't DISTINCT or
* user-generated REF)
- * <LI><B>IS_AUTOINCREMENT</B> String => Indicates whether this
+ * <LI><B>IS_AUTOINCREMENT</B> String => Indicates whether this
* column is auto incremented
* <UL>
* <LI> YES --- if the column is auto incremented
@@ -1982,15 +1982,15 @@
*
* <P>Each privilige 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <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,
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <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, ...)
- * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
* to grant to others; "NO" if not; null if unknown
* </OL>
*
@@ -2032,14 +2032,14 @@
*
* <P>Each privilige 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <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,
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <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, ...)
- * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
* to grant to others; "NO" if not; null if unknown
* </OL>
*
@@ -2067,19 +2067,19 @@
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>SCOPE</B> short => actual scope of result
+ * <LI><B>SCOPE</B> short => actual scope of result
* <UL>
* <LI> bestRowTemporary - very temporary, while using row
* <LI> bestRowTransaction - valid for remainder of current transaction
* <LI> bestRowSession - valid for remainder of current session
* </UL>
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => Data source dependent type name
- * <LI><B>COLUMN_SIZE</B> int => precision
- * <LI><B>BUFFER_LENGTH</B> int => not used
- * <LI><B>DECIMAL_DIGITS</B> short => scale
- * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => Data source dependent type name
+ * <LI><B>COLUMN_SIZE</B> int => precision
+ * <LI><B>BUFFER_LENGTH</B> int => not used
+ * <LI><B>DECIMAL_DIGITS</B> short => scale
+ * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
* like an Oracle ROWID
* <UL>
* <LI> bestRowUnknown - may or may not be pseudo column
@@ -2272,14 +2272,14 @@
*
* <P>Each column description has the following columns:
* <OL>
- * <LI><B>SCOPE</B> short => is not used
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
- * <LI><B>TYPE_NAME</B> String => Data source dependent type name
- * <LI><B>COLUMN_SIZE</B> int => precision
- * <LI><B>BUFFER_LENGTH</B> int => length of column value in bytes
- * <LI><B>DECIMAL_DIGITS</B> short => scale
- * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
+ * <LI><B>SCOPE</B> short => is not used
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => Data source dependent type name
+ * <LI><B>COLUMN_SIZE</B> int => precision
+ * <LI><B>BUFFER_LENGTH</B> int => length of column value in bytes
+ * <LI><B>DECIMAL_DIGITS</B> short => scale
+ * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
* like an Oracle ROWID
* <UL>
* <LI> versionColumnUnknown - may or may not be pseudo column
@@ -2372,12 +2372,12 @@
*
* <P>Each primary key column 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>COLUMN_NAME</B> String => column name
- * <LI><B>KEY_SEQ</B> short => sequence number within primary key
- * <LI><B>PK_NAME</B> String => primary key name (may be null)
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>KEY_SEQ</B> short => sequence number within primary key
+ * <LI><B>PK_NAME</B> String => primary key name (may be null)
* </OL>
*
* @param catalog a catalog name; "" retrieves those without a
@@ -2411,20 +2411,20 @@
*
* <P>Each primary key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => primary key table catalog
+ * <LI><B>PKTABLE_CAT</B> String => primary key table catalog
* being imported (may be null)
- * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema
+ * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema
* being imported (may be null)
- * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * <LI><B>PKTABLE_NAME</B> String => primary key table name
* being imported
- * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
* being imported
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
- * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
- * <LI><B>UPDATE_RULE</B> short => What happens to
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
+ * <LI><B>UPDATE_RULE</B> short => What happens to
* foreign key when primary is updated:
* <UL>
* <LI> importedNoAction - do not allow update of primary
@@ -2438,7 +2438,7 @@
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short => What happens to
* the foreign key when primary is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of primary
@@ -2451,9 +2451,9 @@
* <LI> importedKeySetDefault - change imported key to default if
* its primary key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be null)
- * <LI><B>PK_NAME</B> String => primary key name (may be null)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String => foreign key name (may be null)
+ * <LI><B>PK_NAME</B> String => primary key name (may be null)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2494,20 +2494,20 @@
*
* <P>Each foreign key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be null)
- * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be null)
- * <LI><B>PKTABLE_NAME</B> String => primary key table name
- * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
+ * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be null)
+ * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be null)
+ * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
* being exported (may be null)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
* being exported (may be null)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
* being exported
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
* being exported
- * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
- * <LI><B>UPDATE_RULE</B> short => What happens to
+ * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
+ * <LI><B>UPDATE_RULE</B> short => What happens to
* foreign key when primary is updated:
* <UL>
* <LI> importedNoAction - do not allow update of primary
@@ -2521,7 +2521,7 @@
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short => What happens to
* the foreign key when primary is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of primary
@@ -2534,9 +2534,9 @@
* <LI> importedKeySetDefault - change imported key to default if
* its primary key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be null)
- * <LI><B>PK_NAME</B> String => primary key name (may be null)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String => foreign key name (may be null)
+ * <LI><B>PK_NAME</B> String => primary key name (may be null)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2583,20 +2583,20 @@
*
* <P>Each foreign key column description has the following columns:
* <OL>
- * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be null)
- * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be null)
- * <LI><B>PKTABLE_NAME</B> String => primary key table name
- * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
- * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
+ * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be null)
+ * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be null)
+ * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be null)
* being exported (may be null)
- * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be null)
* being exported (may be null)
- * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
* being exported
- * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
* being exported
- * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
- * <LI><B>UPDATE_RULE</B> short => What happens to
+ * <LI><B>KEY_SEQ</B> short => sequence number within foreign key
+ * <LI><B>UPDATE_RULE</B> short => What happens to
* foreign key when primary is updated:
* <UL>
* <LI> importedNoAction - do not allow update of primary
@@ -2610,7 +2610,7 @@
* <LI> importedKeyRestrict - same as importedKeyNoAction
* (for ODBC 2.x compatibility)
* </UL>
- * <LI><B>DELETE_RULE</B> short => What happens to
+ * <LI><B>DELETE_RULE</B> short => What happens to
* the foreign key when primary is deleted.
* <UL>
* <LI> importedKeyNoAction - do not allow delete of primary
@@ -2623,9 +2623,9 @@
* <LI> importedKeySetDefault - change imported key to default if
* its primary key has been deleted
* </UL>
- * <LI><B>FK_NAME</B> String => foreign key name (may be null)
- * <LI><B>PK_NAME</B> String => primary key name (may be null)
- * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * <LI><B>FK_NAME</B> String => foreign key name (may be null)
+ * <LI><B>PK_NAME</B> String => primary key name (may be null)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
* constraints be deferred until commit
* <UL>
* <LI> importedKeyInitiallyDeferred - see SQL92 for definition
@@ -2694,40 +2694,40 @@
*
* <P>Each type description has the following columns:
* <OL>
- * <LI><B>TYPE_NAME</B> String => Type name
- * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
- * <LI><B>PRECISION</B> int => maximum precision
- * <LI><B>LITERAL_PREFIX</B> String => prefix used to quote a literal
+ * <LI><B>TYPE_NAME</B> String => Type name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
+ * <LI><B>PRECISION</B> int => maximum precision
+ * <LI><B>LITERAL_PREFIX</B> String => prefix used to quote a literal
* (may be null)
- * <LI><B>LITERAL_SUFFIX</B> String => suffix used to quote a literal
+ * <LI><B>LITERAL_SUFFIX</B> String => suffix used to quote a literal
(may be null)
- * <LI><B>CREATE_PARAMS</B> String => parameters used in creating
+ * <LI><B>CREATE_PARAMS</B> String => parameters used in creating
* the type (may be null)
- * <LI><B>NULLABLE</B> short => can you use NULL for this type?
+ * <LI><B>NULLABLE</B> short => can you use NULL for this type?
* <UL>
* <LI> typeNoNulls - does not allow NULL values
* <LI> typeNullable - allows NULL values
* <LI> typeNullableUnknown - nullability unknown
* </UL>
- * <LI><B>CASE_SENSITIVE</B> boolean=> is it case sensitive?
- * <LI><B>SEARCHABLE</B> short => can you use "WHERE" based on this type:
+ * <LI><B>CASE_SENSITIVE</B> boolean=> is it case sensitive?
+ * <LI><B>SEARCHABLE</B> short => can you use "WHERE" based on this type:
* <UL>
* <LI> typePredNone - No support
* <LI> typePredChar - Only supported with WHERE .. LIKE
* <LI> typePredBasic - Supported except for WHERE .. LIKE
* <LI> typeSearchable - Supported for all WHERE ..
* </UL>
- * <LI><B>UNSIGNED_ATTRIBUTE</B> boolean => is it unsigned?
- * <LI><B>FIXED_PREC_SCALE</B> boolean => can it be a money value?
- * <LI><B>AUTO_INCREMENT</B> boolean => can it be used for an
+ * <LI><B>UNSIGNED_ATTRIBUTE</B> boolean => is it unsigned?
+ * <LI><B>FIXED_PREC_SCALE</B> boolean => can it be a money value?
+ * <LI><B>AUTO_INCREMENT</B> boolean => can it be used for an
* auto-increment value?
- * <LI><B>LOCAL_TYPE_NAME</B> String => localized version of type name
+ * <LI><B>LOCAL_TYPE_NAME</B> String => localized version of type name
* (may be null)
- * <LI><B>MINIMUM_SCALE</B> short => minimum scale supported
- * <LI><B>MAXIMUM_SCALE</B> short => maximum scale supported
- * <LI><B>SQL_DATA_TYPE</B> int => unused
- * <LI><B>SQL_DATETIME_SUB</B> int => unused
- * <LI><B>NUM_PREC_RADIX</B> int => usually 2 or 10
+ * <LI><B>MINIMUM_SCALE</B> short => minimum scale supported
+ * <LI><B>MAXIMUM_SCALE</B> short => maximum scale supported
+ * <LI><B>SQL_DATA_TYPE</B> int => unused
+ * <LI><B>SQL_DATETIME_SUB</B> int => unused
+ * <LI><B>NUM_PREC_RADIX</B> int => usually 2 or 10
* </OL>
*
* @return ResultSet - each row is a SQL type description
@@ -2776,16 +2776,16 @@
*
* <P>Each index column 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)
- * <LI><B>TABLE_NAME</B> String => table name
- * <LI><B>NON_UNIQUE</B> boolean => Can index values be non-unique?
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be null)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be null)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>NON_UNIQUE</B> boolean => Can index values be non-unique?
* false when TYPE is tableIndexStatistic
- * <LI><B>INDEX_QUALIFIER</B> String => index catalog (may be null);
+ * <LI><B>INDEX_QUALIFIER</B> String => index catalog (may be null);
* null when TYPE is tableIndexStatistic
- * <LI><B>INDEX_NAME</B> String => index name; null when TYPE is
+ * <LI><B>INDEX_NAME</B> String => index name; null when TYPE is
* tableIndexStatistic
- * <LI><B>TYPE</B> short => index type:
+ * <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
@@ -2793,20 +2793,20 @@
* <LI> tableIndexHashed - this is a hashed index
* <LI> tableIndexOther - this is some other style of index
* </UL>
- * <LI><B>ORDINAL_POSITION</B> short => column sequence number
+ * <LI><B>ORDINAL_POSITION</B> short => column sequence number
* within index; zero when TYPE is tableIndexStatistic
- * <LI><B>COLUMN_NAME</B> String => column name; null when TYPE is
+ * <LI><B>COLUMN_NAME</B> String => column name; null when TYPE is
* tableIndexStatistic
- * <LI><B>ASC_OR_DESC</B> String => column sort sequence, "A" => ascending,
- * "D" => descending, may be null if sort sequence is not supported;
+ * <LI><B>ASC_OR_DESC</B> String => column sort sequence, "A" => ascending,
+ * "D" => descending, may be null if sort sequence is not supported;
* null when TYPE is tableIndexStatistic
- * <LI><B>CARDINALITY</B> int => When TYPE is tableIndexStatistic, then
+ * <LI><B>CARDINALITY</B> int => When TYPE is tableIndexStatistic, then
* this is the number of rows in the table; otherwise, it is the
* number of unique values in the index.
- * <LI><B>PAGES</B> int => When TYPE is tableIndexStatisic then
+ * <LI><B>PAGES</B> int => When TYPE is tableIndexStatisic then
* this is the number of pages used for the table, otherwise it
* is the number of pages used for the current index.
- * <LI><B>FILTER_CONDITION</B> String => Filter condition, if any.
+ * <LI><B>FILTER_CONDITION</B> String => Filter condition, if any.
* (may be null)
* </OL>
*
@@ -3085,14 +3085,14 @@
*
* <P>Each type description has the following columns:
* <OL>
- * <LI><B>TYPE_CAT</B> String => the type's catalog (may be null)
- * <LI><B>TYPE_SCHEM</B> String => type's schema (may be null)
- * <LI><B>TYPE_NAME</B> String => type name
- * <LI><B>CLASS_NAME</B> String => Java class name
- * <LI><B>DATA_TYPE</B> String => type value defined in java.sql.Types.
+ * <LI><B>TYPE_CAT</B> String => the type's catalog (may be null)
+ * <LI><B>TYPE_SCHEM</B> String => type's schema (may be null)
+ * <LI><B>TYPE_NAME</B> String => type name
+ * <LI><B>CLASS_NAME</B> String => Java class name
+ * <LI><B>DATA_TYPE</B> String => type value defined in java.sql.Types.
* One of JAVA_OBJECT, STRUCT, or DISTINCT
- * <LI><B>REMARKS</B> String => explanatory comment on the type
- * <LI><B>BASE_TYPE</B> short => type code of the source type of
+ * <LI><B>REMARKS</B> String => explanatory comment on the type
+ * <LI><B>BASE_TYPE</B> short => type code of the source type of
* a DISTINCT type or the type that implements the user-generated
* reference type of the SELF_REFERENCING_COLUMN of a structured
* type as defined in java.sql.Types (<code>null</code> if
diff --git a/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java b/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
index 596f91b..dad85be 100644
--- a/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
+++ b/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
@@ -2293,7 +2293,7 @@
* @param rows
* the number of rows to fetch
* @exception SQLException
- * if a database-access error occurs, or the condition 0 <=
+ * if a database-access error occurs, or the condition 0 <=
* rows is not satisfied.
*/
public void setFetchSize(int rows) throws SQLException {
diff --git a/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java b/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
index 9002c6e..770de5b 100644
--- a/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
+++ b/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
@@ -841,7 +841,7 @@
* this result is a ResultSet. getMoreResults also implicitly
* closes any current ResultSet obtained with getResultSet.
*
- * There are no more results when (!getMoreResults() &&
+ * There are no more results when (!getMoreResults() &&
* (getUpdateCount() == -1)
*
* @return true if the next result is a ResultSet; false if it is
@@ -931,7 +931,7 @@
*
* @param rows the number of rows to fetch
* @exception SQLException if a database-access error occurs, or the
- * condition 0 <= rows <= this.getMaxRows() is not satisfied.
+ * condition 0 <= rows <= this.getMaxRows() is not satisfied.
*/
public void setFetchSize(int rows) throws SQLException {
checkStatus();
diff --git a/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java b/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
index 79c09fd..bd457cf 100644
--- a/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
+++ b/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
@@ -88,7 +88,7 @@
* | V V | |
*|========================| |=================| |=================|
*| EmbedConnection | | EmbedConnection | | EmbedConnection |
- *| |<-----| |<-----| |
+ *| |<-----| |<-----| |
*| (DetachableConnection) | | ProxyConnection | | ProxyConnection |
*|========================| |=================| |=================|
* ^ | ^ ^ ^
diff --git a/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java b/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
index 16cf1a9..4ebd896 100644
--- a/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
+++ b/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
@@ -45,7 +45,7 @@
* It is activated upon setting derby.authentication.provider database
* or system property to 'BUILTIN'.
* <p>
- * It instantiates & calls the basic User authentication scheme at runtime.
+ * It instantiates and calls the basic User authentication scheme at runtime.
* <p>
* In 2.0, users can now be defined as database properties.
* If derby.database.propertiesOnly is set to true, then in this
diff --git a/java/engine/org/apache/derby/impl/load/Import.java b/java/engine/org/apache/derby/impl/load/Import.java
index 8267718..db88c33 100644
--- a/java/engine/org/apache/derby/impl/load/Import.java
+++ b/java/engine/org/apache/derby/impl/load/Import.java
@@ -116,7 +116,7 @@
* @param characterDelimiter Delimiter that is used to quiote non-numeric types
* @param codeset Codeset of the data in the file
* @param replace Indicates whether the data in table has to be replaced or
- * appended.(0 - append , > 0 Replace the data)
+ * appended.(0 - append , > 0 Replace the data)
* @param lobsInExtFile true, if the lobs data is stored in an external file,
* and the reference to it is stored in the main import file.
* @exception SQLException on errors
@@ -175,7 +175,7 @@
* @param characterDelimiter Delimiter that is used to quiote non-numeric types
* @param codeset Codeset of the data in the file
* @param replace Indicates whether the data in table has to be replaced or
- * appended.(0 - append , > 0 Replace the data)
+ * appended.(0 - append , > 0 Replace the data)
* @param lobsInExtFile true, if the lobs data is stored in an external file,
* and the reference is stored in the main import file.
* @exception SQLException on errors
diff --git a/java/engine/org/apache/derby/impl/load/LoadError.java b/java/engine/org/apache/derby/impl/load/LoadError.java
index 886856b..351efea 100644
--- a/java/engine/org/apache/derby/impl/load/LoadError.java
+++ b/java/engine/org/apache/derby/impl/load/LoadError.java
@@ -102,7 +102,7 @@
/**
- Raised if, field & record separators are substring of each other.
+ Raised if, field and record separators are substring of each other.
*/
static SQLException fieldAndRecordSeparatorsSubset() {
return PublicAPI.wrapStandardException(
diff --git a/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java b/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
index b721729..0c336d4 100644
--- a/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
+++ b/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
@@ -82,7 +82,7 @@
The best way to locate the problem here is to do this (replace
ac5.class with the name of your class file):
<ol>
- <li> javap -c -v ac5 >ac5.gp<br>
+ <li> javap -c -v ac5 > ac5.gp<br>
if javap reports "Class not found", and the file ac5.class does
exist in the current directory, then the .class file is probably
corrupt. Try running mocha on it to see if that works. The
@@ -103,9 +103,9 @@
until it builds or you figure out what is wrong with
the generated code.
<li> javac ac5.java
- <li> javap -v -c ac5 >ac5.jp
- <li> sed '1,$s/#[0-9]* </# </' ac5.gp > ac5.gn
- <li> sed '1,$s/#[0-9]* </# </' ac5.jp > ac5.jn<br>
+ <li> javap -v -c ac5 > ac5.jp
+ <li> sed '1,$s/#[0-9]* </# </' ac5.gp > ac5.gn
+ <li> sed '1,$s/#[0-9]* </# </' ac5.jp > ac5.jn<br>
These seds are to get rid of constant pool entry numbers,
which will be wildly different on the two files.
<li> vdiff32 ac5.gn ac5.jn<br>
diff --git a/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java b/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
index 48e0b0e..e84a0d7 100644
--- a/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
+++ b/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
@@ -934,7 +934,7 @@
this
word
</PRE>
- word2,word1 -> word2, word1, word2
+ word2,word1 -> word2, word1, word2
So that we are left with word after the put.
@@ -1139,7 +1139,7 @@
/**
Create an array instance
- Stack ... =>
+ Stack ... =>
...,arrayref
*/
public void pushNewArray(String className, int size) {
diff --git a/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java b/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
index 7b24a90..5f94057 100644
--- a/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
+++ b/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
@@ -1146,7 +1146,7 @@
* the given opcode at the program counter pc.
* <P>
* Returns a six element integer array of program counters and lengths.
- * <code. [0] - program counter of the IF opcode (passed in as pc) [1] -
+ * <code> [0] - program counter of the IF opcode (passed in as pc) [1] -
* program counter of the start of the then block [2] - length of the then
* block [3] - program counter of the else block, -1 if no else block
* exists. [4] - length of of the else block, -1 if no else block exists.
@@ -1621,8 +1621,8 @@
* This method will split out such expressions in sub-methods
* and replace the original code with a call to that submethod.
* <UL>
- * <LI>this.method(args) ->> this.sub1([parameters])
- * <LI>this.getter().method(args) ->> this.sub1([parameters])
+ * <LI>this.method(args) ->> this.sub1([parameters])
+ * <LI>this.getter().method(args) ->> this.sub1([parameters])
* </UL>
* The assumption is of course that the call to the sub-method
* is much smaller than the code it replaces.
diff --git a/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java b/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
index a31d9c6..0fd6962 100644
--- a/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
+++ b/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
@@ -53,14 +53,14 @@
Note all branches here are using relative offsets, not absolute program counters.
-If the then code leads to the conditional branch offset being too big (>32k)
+If the then code leads to the conditional branch offset being too big (>32k)
because the then code is larger than 32767 bytes then this is built:
<code>
// when else code is present
if condition branch to tb: (relative offset +8)
goto_w eb: // indirect for else block (5 bytes)
tb:
- then code (> 32767 bytes)
+ then code (> 32767 bytes)
goto end:
eb:
else code
@@ -72,7 +72,7 @@
if condition branch to tb: (relative offset +8)
goto_w end: // indirect for else block (5 bytes)
tb:
- then code (> 32767 bytes)
+ then code (> 32767 bytes)
end:
</code>
@@ -84,7 +84,7 @@
then code
goto_w end: // skip else
eb:
- else code (> 32767 bytes)
+ else code (> 32767 bytes)
end:
</code>
@@ -97,10 +97,10 @@
if condition branch to tb: (relative offset +8)
goto_w eb: // indirect for else block (5 bytes)
tb:
- then code (> 32767 bytes)
+ then code (> 32767 bytes)
goto_w end:
eb:
- else code (> 32767 bytes)
+ else code (> 32767 bytes)
end:
</code>
diff --git a/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java b/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
index 16a276b..6dde79b 100644
--- a/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
+++ b/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
@@ -1416,7 +1416,7 @@
* @param index row index
* @return {@code -1} if the current and previous key are identical,
* the index of the changed part of the key otherwise
- * ([0, key length>)
+ * ([0, key length>)
* @throws StandardException if comparing the two keys fails
*/
public int compareWithPrevKey(int index)
diff --git a/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java b/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
index 15b7dba..021a026 100644
--- a/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
+++ b/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
@@ -94,7 +94,7 @@
/**
Wait for a lock to be granted, returns when the lock is granted.
<P>
- The sleep wakeup scheme depends on the two booleans wakeUpNow & potentiallyGranted.
+ The sleep wakeup scheme depends on the two booleans wakeUpNow and potentiallyGranted.
MT - Single thread required - and assumed to be the thread requesting the lock.
diff --git a/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java b/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java
index 290fea4..f609925 100644
--- a/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java
+++ b/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java
@@ -160,7 +160,7 @@
* @exception IOException if there are IO problems opening the files.
* @exception SecurityException if a security manager exists and if the caller does not have
* <tt>LoggingPermission("control")</tt>.
- * @exception IllegalArgumentException if limit < 0, or count < 1.
+ * @exception IllegalArgumentException if limit < 0, or count < 1.
* @exception IllegalArgumentException if pattern is an empty string
*
*/
diff --git a/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java b/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
index 25540dc..db9d232 100644
--- a/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
+++ b/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
@@ -727,16 +727,16 @@
jbmsVersion.getMinorVersion()*100 +jbmsVersion.getMaintVersion() + (jbmsVersion.isBeta() ? 0 : 1) + 2
- 5.0.22 => (0*100) + 22 + 2 = 24 - (5.0 has a unique major number)
- 5.1.2 => (1*100) + 2 + 2 = 104 - (5.1 has a unique major number)
+ 5.0.22 => (0*100) + 22 + 2 = 24 - (5.0 has a unique major number)
+ 5.1.2 => (1*100) + 2 + 2 = 104 - (5.1 has a unique major number)
With the switch to the four part scheme in 5.2, the maint number now is in increments of one million,
thus the above scheme could lead to duplicate numbers. Note that the major number may not change
when the minor external release changes, e.g. 5.2 and 5.3 could share a DD_Version major number.
- 5.2.1.100 => (2*100) + 1000100 + 2 = 1000302
- 5.3.1.0 => (3*100) + 1000000 + 2 = 1000302
+ 5.2.1.100 => (2*100) + 1000100 + 2 = 1000302
+ 5.3.1.0 => (3*100) + 1000000 + 2 = 1000302
diff --git a/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java b/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
index 4fc5eb9..a16c6fa 100644
--- a/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
+++ b/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
@@ -406,7 +406,7 @@
*
* @param row row to insert
* @param tc transaction
- * @return row number (>= 0) if duplicate row inserted into an index
+ * @return row number (>= 0) if duplicate row inserted into an index
* ROWNOTDUPLICATE otherwise
*
* @exception StandardException Thrown on failure
@@ -428,7 +428,7 @@
* @param tc transaction controller
*
*
- * @return row number (>= 0) if duplicate row inserted into an index
+ * @return row number (>= 0) if duplicate row inserted into an index
* ROWNOTDUPLICATE otherwise
*
* @exception StandardException Thrown on failure
@@ -453,7 +453,7 @@
@param tc transaction controller
@param rowLocationOut on output rowLocationOut[0] is set to the
last RowLocation inserted.
- @return row number (>= 0) if duplicate row inserted into an index
+ @return row number (>= 0) if duplicate row inserted into an index
ROWNOTDUPLICATE otherwise
*/
private int insertRowListImpl(ExecRow[] rowList, TransactionController tc,
@@ -781,7 +781,7 @@
* Given an index row and index number return the RowLocation
* in the heap of the first matching row.
* Used by the autoincrement code to get the RowLocation in
- * syscolumns given a <tablename, columname> pair.
+ * syscolumns given a <tablename, columname> pair.
*
* @see DataDictionaryImpl#computeRowLocation(TransactionController, TableDescriptor, String)
*
diff --git a/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java b/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
index 6c6485b..55580aa 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
@@ -31,7 +31,7 @@
/**
* This node is the superclass for all binary comparison operators, such as =,
- * <>, <, etc.
+ * <>, <, etc.
*
*/
diff --git a/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java b/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
index bb13b6e..21dd8c6 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
@@ -39,7 +39,7 @@
/**
* A BinaryOperatorNode represents a built-in binary operator as defined by
- * the ANSI/ISO SQL standard. This covers operators like +, -, *, /, =, <, etc.
+ * the ANSI/ISO SQL standard. This covers operators like +, -, *, /, =, <, etc.
* Java operators are not represented here: the JSQL language allows Java
* methods to be called from expressions, but not Java operators.
*
@@ -384,7 +384,7 @@
return genSQLJavaSQLTree();
}
- /** generate a SQL->Java->SQL conversion tree above the left and right
+ /** generate a SQL->Java->SQL conversion tree above the left and right
* operand of this Binary Operator Node if needed. Subclasses can override
* the default behavior.
*/
diff --git a/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java b/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
index ac67ea5..b8a1d8b 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
@@ -486,7 +486,7 @@
* <LI>if it does not have exactly 1 table in its FROM list;
* 0 tables would occur if we ever support a SELECT without a
* FROM e.g., for generating a row without an underlying table
- * (like what we do for an INSERT of a VALUES list); >1 tables
+ * (like what we do for an INSERT of a VALUES list); >1 tables
* occurs when joins are in the tree.
* <LI>if the table in its FROM list is not a base table (REMIND
* when views/from subqueries are added, this should be relaxed to
diff --git a/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java b/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
index 3410e4b..9a14012 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
@@ -308,7 +308,7 @@
read columns. The returns a map such that
<PRE>
- map[heapColId (0 based)] -> readCol id (0 based)
+ map[heapColId (0 based)] -> readCol id (0 based)
</PRE>
@param column_map_length The number of columns(ints) in the map.
diff --git a/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java b/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
index 923f4a7..cf59011 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
@@ -4345,7 +4345,7 @@
* index row lock
*
* heap row lock if READ_COMMITTED,
- * REPEATBLE_READ, or READ_UNCOMMITTED &&
+ * REPEATBLE_READ, or READ_UNCOMMITTED and
* not specified table lock otherwise,
* use optimizer decided best acess
* path's lock mode
diff --git a/java/engine/org/apache/derby/impl/sql/compile/FromList.java b/java/engine/org/apache/derby/impl/sql/compile/FromList.java
index c6f911b..126d506 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/FromList.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/FromList.java
@@ -475,7 +475,7 @@
*
* select j from onerow where exists
* (select 1 from somerow
- * union select * from diffrow where onerow.j < diffrow.k)
+ * union select * from diffrow where onerow.j < diffrow.k)
*
* If "this" is the FromList for the right child of the UNION then it will
* contain both "diffrow" and "onerow", the latter of which was passed
diff --git a/java/engine/org/apache/derby/impl/sql/compile/FromTable.java b/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
index 28e2f9b..8178e48 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
@@ -90,7 +90,7 @@
private boolean considerSortAvoidancePath;
/**
- Set of object->trulyTheBestAccessPath mappings used to keep track
+ Set of object->trulyTheBestAccessPath mappings used to keep track
of which of this Optimizable's "trulyTheBestAccessPath" was the best
with respect to a specific outer query or ancestor node. In the case
of an outer query, the object key will be an instance of OptimizerImpl.
diff --git a/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java b/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
index 4a74a47..bbc5a27 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
@@ -63,7 +63,7 @@
* NOTE: A GroupByNode extends FromTable since it can exist in a FromList.
* <p>
* There is a lot of room for optimizations here: <UL>
- * <LI> agg(distinct x) group by x => agg(x) group by x (for min and max) </LI>
+ * <LI> agg(distinct x) group by x => agg(x) group by x (for min and max) </LI>
* <LI> min()/max() use index scans if possible, no sort may
* be needed. </LI>
* </UL>
@@ -500,11 +500,11 @@
</pre>
* the query tree ends up looking like this:
<pre>
- ProjectRestrictNode RCL -> (ptr to GBN(column[0]), ptr to GBN(column[1]), ptr to GBN(column[4]))
+ ProjectRestrictNode RCL -> (ptr to GBN(column[0]), ptr to GBN(column[1]), ptr to GBN(column[4]))
|
- GroupByNode RCL->(C1, SUM(C2), <agg-input>, <aggregator>, MAX(C3), <agg-input>, <aggregator>)
+ GroupByNode RCL->(C1, SUM(C2), <agg-input>, <aggregator>, MAX(C3), <agg-input>, <aggregator>)
|
- ProjectRestrict RCL->(C1, C2, C3)
+ ProjectRestrict RCL->(C1, C2, C3)
|
FromBaseTable
</pre>
diff --git a/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java b/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
index a08cc4b..6212855 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
@@ -39,8 +39,8 @@
This node represents a like comparison operator (no escape)
If the like pattern is a constant or a parameter then if possible
- the like is modified to include a >= and < operator. In some cases
- the like can be eliminated. By adding =, >= or < operators it may
+ the like is modified to include a >= and < operator. In some cases
+ the like can be eliminated. By adding =, >= or < operators it may
allow indexes to be used to greatly narrow the search range of the
query, and allow optimizer to estimate number of rows to affected.
@@ -48,36 +48,36 @@
constant or parameter LIKE pattern with prefix followed by optional wild
card e.g. Derby%
- CHAR(n), VARCHAR(n) where n < 255
+ CHAR(n), VARCHAR(n) where n < 255
- >= prefix padded with '\u0000' to length n -- e.g. Derby\u0000\u0000
- <= prefix appended with '\uffff' -- e.g. Derby\uffff
+ >= prefix padded with '\u0000' to length n -- e.g. Derby\u0000\u0000
+ <= prefix appended with '\uffff' -- e.g. Derby\uffff
[ can eliminate LIKE if constant. ]
- CHAR(n), VARCHAR(n), LONG VARCHAR where n >= 255
+ CHAR(n), VARCHAR(n), LONG VARCHAR where n >= 255
- >= prefix backed up one characer
- <= prefix appended with '\uffff'
+ >= prefix backed up one characer
+ <= prefix appended with '\uffff'
no elimination of like
parameter like pattern starts with wild card e.g. %Derby
- CHAR(n), VARCHAR(n) where n <= 256
+ CHAR(n), VARCHAR(n) where n <= 256
- >= '\u0000' padded with '\u0000' to length n
- <= '\uffff'
+ >= '\u0000' padded with '\u0000' to length n
+ <= '\uffff'
no elimination of like
- CHAR(n), VARCHAR(n), LONG VARCHAR where n > 256
+ CHAR(n), VARCHAR(n), LONG VARCHAR where n > 256
- >= NULL
+ >= NULL
- <= '\uffff'
+ <= '\uffff'
Note that the Unicode value '\uffff' is defined as not a character value
diff --git a/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java b/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
index 3f6ffdf..73c94f6 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
@@ -160,11 +160,11 @@
* violate any key constraints;
* the column being altered is
* 1. part of foreign key constraint
- * ==> ERROR. This references a Primary Key constraint and the
- * type & lengths of the pkey/fkey must match exactly.
+ * ==> ERROR. This references a Primary Key constraint and the
+ * type and lengths of the pkey/fkey must match exactly.
* 2. part of a unique/primary key constraint
- * ==> OK if no fkey references this constraint.
- * ==> ERROR if any fkey in the system references this constraint.
+ * ==> OK if no fkey references this constraint.
+ * ==> ERROR if any fkey in the system references this constraint.
*
* @param td The Table Descriptor on which the ALTER is being done.
*
diff --git a/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java b/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
index 8ca0f52..11d09eb 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
@@ -1099,7 +1099,7 @@
* is used to 'recover' cost estimate sums that have been lost due to
* the addition/subtraction of the cost estimate for the Optimizable
* at position "joinPosition". Ex. If the total cost for Optimizables
- * at positions < joinPosition is 1500, and then the Optimizable at
+ * at positions < joinPosition is 1500, and then the Optimizable at
* joinPosition has an estimated cost of 3.14E40, adding those two
* numbers effectively "loses" the 1500. When we later subtract 3.14E40
* from the total cost estimate (as part of "pull" processing), we'll
diff --git a/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java b/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
index 9377062..b97245a 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
@@ -45,7 +45,7 @@
/**
* If this sort key is added to the result column list then it is at result column position
* 1 + resultColumnList.size() - resultColumnList.getOrderBySelect() + addedColumnOffset
- * If the sort key is already in the result column list then addedColumnOffset < 0.
+ * If the sort key is already in the result column list then addedColumnOffset < 0.
*/
private int addedColumnOffset = -1;
diff --git a/java/engine/org/apache/derby/impl/sql/compile/Predicate.java b/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
index 46fb54b..0dcd0e4 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
@@ -1015,13 +1015,13 @@
* | / \
* PRN SELECT[1] SELECT[2]
* | | |
- * <FBT:T1> PRN PRN
+ * [FBT:T1] PRN PRN
* | |
- * SELECT[3] <FromBaseTable:T2>
+ * SELECT[3] [FromBaseTable:T2]
* |
* PRN
* |
- * <FromBaseTable:T3>
+ * [FromBaseTable:T3]
*
* Assume also that we have some predicate "SELECT[4].i = <UNION>.j".
* If the optimizer decides to push the predicate to the UNION
diff --git a/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java b/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
index 3f1325e..a85bca7 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
@@ -1786,7 +1786,7 @@
/**
* Perform transitive closure on join clauses. For each table in the query,
* we build a list of equijoin clauses of the form:
- * <ColumnReference> <=> <ColumnReference>
+ * ColumnReference relop ColumnReference
* Each join clause is put on 2 lists since it joins 2 tables.
*
* We then walk the array of lists. We first walk it as the outer list.
diff --git a/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java b/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
index 20fcb3a..62afd0a 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
@@ -259,9 +259,9 @@
/**
* Generate an expression that evaluates to true if the result of the
- * comparison should be negated. For example, col > 1 generates
- * a comparison operator of <= and a negation of true, while col < 1
- * generates a comparison operator of < and a negation of false.
+ * comparison should be negated. For example, col > 1 generates
+ * a comparison operator of <= and a negation of true, while col < 1
+ * generates a comparison operator of < and a negation of false.
*
* @param mb The method the generated code is to go into
* @param optTable The Optimizable table the Qualifier will qualify
diff --git a/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java b/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
index 98a17b7..c64f2ff 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
@@ -2469,7 +2469,7 @@
}
/**
- * Do the 2 RCLs have the same type & length.
+ * Do the 2 RCLs have the same type and length.
* This is useful for UNIONs when deciding whether a NormalizeResultSet is required.
*
* @param otherRCL The other RCL.
diff --git a/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java b/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
index 58348c4..f5e895d 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
@@ -906,8 +906,8 @@
* @param target the target node for the insert
* @param inOrder are source cols in same order as target cols?
* @param colMap int array representation of correspondence between
- * RCLs - colmap[i] = -1 -> missing in current RCL
- * colmap[i] = j -> targetRCL(i) <-> thisRCL(j+1)
+ * RCLs - colmap[i] = -1 -> missing in current RCL
+ * colmap[i] = j -> targetRCL(i) <-> thisRCL(j+1)
* @return a node that replaces this node and whose RCL matches the target
* RCL. May return this node if no changes to the RCL are needed, or if the
* RCL is modified in-place.
@@ -1836,7 +1836,7 @@
/**
* Count the number of distinct aggregates in the list.
* By 'distinct' we mean aggregates of the form:
- * <UL><I>SELECT MAX(DISTINCT x) FROM T<\I><\UL>
+ * <I>SELECT MAX(DISTINCT x) FROM T</I>
*
* @return number of aggregates
*/
diff --git a/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java b/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
index 04e29e7..16e89a3 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
@@ -1315,7 +1315,7 @@
* o The operator in the new predicate that is added to the subquery
* will be a BinaryAllOperatorNode whose bcoNodeType corresponds to
* the negation of the operator that modifies the ALL.
- * (eg, <> for = ALL, with <> for NOT IN.)
+ * (eg, <> for = ALL, with <> for NOT IN.)
*
* NOTE: This method is called after the underlying subquery has been
* preprocessed, so we build a new Predicate, not just a new expression.
diff --git a/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java b/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
index 508517d..00c4c0b 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
@@ -342,7 +342,7 @@
}
/**
- * Generate a SQL->Java->SQL conversion tree above the current node
+ * Generate a SQL->Java->SQL conversion tree above the current node
* and bind the new nodes individually.
* This is useful when doing comparisons, built-in functions, etc. on
* java types which have a direct mapping to system built-in types.
@@ -1164,7 +1164,7 @@
/**
* Returns true if this ValueNode is a relational operator. Relational
- * Operators are <, <=, =, >, >=, <> as well as IS NULL and IS NOT
+ * Operators are <, <=, =, >, >=, <> as well as IS NULL and IS NOT
* NULL. This is the preferred way of figuring out if a ValueNode is
* relational or not.
* @see RelationalOperator
diff --git a/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java b/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
index e4cb4e7..1643060 100644
--- a/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
+++ b/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
@@ -86,7 +86,7 @@
/**
- * Generate a SQL->Java->SQL conversion tree any node in the list
+ * Generate a SQL->Java->SQL conversion tree any node in the list
* which is not a system built-in type.
* This is useful when doing comparisons, built-in functions, etc. on
* java types which have a direct mapping to system built-in types.
diff --git a/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java b/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
index dee324c..2ebedec 100644
--- a/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
+++ b/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
@@ -2884,7 +2884,7 @@
/**
* Reports how many statement levels deep we are.
*
- * @return a statement level >= OUTERMOST_STATEMENT
+ * @return a statement level >= OUTERMOST_STATEMENT
*/
public int getStatementDepth()
{ return statementDepth; }
diff --git a/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java b/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
index 85de528..125c80a 100644
--- a/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
+++ b/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
@@ -133,7 +133,7 @@
* returned to the application).
*
* When the StatementContext object is assigned with setInUse(),
- * a CancelQueryTask is scheduled if a timeout > 0 has been set.
+ * a CancelQueryTask is scheduled if a timeout > 0 has been set.
*/
private static class CancelQueryTask
extends
diff --git a/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java b/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
index dee38f5..b2ba79f 100644
--- a/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
+++ b/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
@@ -142,7 +142,7 @@
declare temp table t2("declared in savepoint level" = 0, "dropped in savepoint level"=-1)
rollback tran
(temp table t2 will be removed from list of tables and conglomerate associated with it will be dropped)
- And if table was dropped in this unit of work ie "dropped in savepoint level" >= "current savepoint level"
+ And if table was dropped in this unit of work ie "dropped in savepoint level" >= "current savepoint level"
Then we should remove the table from the list of temp tables
eg
start tran ("current savepoint level = 0)
diff --git a/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java b/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
index e8f1ff7..54a23cb 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
@@ -3421,10 +3421,10 @@
/**
* Return the "semi" row count of a table. We are only interested in
- * whether the table has 0, 1 or > 1 rows.
+ * whether the table has 0, 1 or > 1 rows.
*
*
- * @return Number of rows (0, 1 or > 1) in table.
+ * @return Number of rows (0, 1 or > 1) in table.
*
* @exception StandardException Thrown on failure
*/
diff --git a/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java b/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
index 938626d..ea21b22 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
@@ -39,7 +39,7 @@
import java.sql.ResultSet;
/**
- * Base class for Insert, Delete & UpdateVTIResultSet
+ * Base class for Insert, Delete and UpdateVTIResultSet
*/
abstract class DMLVTIResultSet extends DMLWriteResultSet
{
diff --git a/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java b/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
index 3160d9e..9cdd679 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
@@ -484,7 +484,7 @@
* @param numColumns Number of columns to read
* @param dependencyId UUID for dependency system
* @param baseRowReadList Map of columns read in. 1 based.
- * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId.
+ * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId.
* @param streamStorableHeapColIds Null for non rep. (0 based)
* @param singleRowSource Whether or not source is a single row source
* @param underMerge True if this is an action of a MERGE statement.
diff --git a/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java b/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
index 6449003..5810153 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
@@ -107,7 +107,7 @@
private Vector<AutoincrementCounter> aiCounters;
/**
- * aiHT is a hash table of auto increment <key, value> pairs. This is used
+ * aiHT is a hash table of auto increment (key, value) pairs. This is used
* for auto increment values generated by the trigger.
*/
@SuppressWarnings("UseOfObsoleteCollectionType")
diff --git a/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java b/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
index 54ddca8..87b8ed4 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
@@ -464,7 +464,7 @@
}
/**
- * Upgrade code: upgrade one jar file to new style (>= 10.9)
+ * Upgrade code: upgrade one jar file to new style (>= 10.9)
*
* @param tc transaction controller
* @param fid the jar file to be upgraded
diff --git a/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java b/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
index 14aaac6..97b5285 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
@@ -108,7 +108,7 @@
to be updated. Only used for updates
@param tc the transaction controller
@param baseRowReadList bit set of columns read from base row. 1 based.
- @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
+ @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
@exception StandardException Thrown on error
*/
public RowChangerImpl(
@@ -272,7 +272,7 @@
Open this RowChanger to avoid fixing indexes that do not change
during update operations.
- @param fixOnUpdate fixOnUpdat[ix] == true ==> fix index 'ix' on
+ @param fixOnUpdate fixOnUpdat[ix] == true ==> fix index 'ix' on
an update operation.
@param lockMode The lock mode to use
(row or table, see TransactionController)
diff --git a/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java b/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
index b5025fe..a91a42e 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
@@ -169,7 +169,7 @@
Copy references for an ExecRow's columns to another ExecRow.
For copying from a compact array to a reconstituted array.
E.g. if positions = {2, 4}, and from = {666, 777} then
- to => {null, 666, null, 777}. Will only go as far as to.getArray().length.
+ to => {null, 666, null, 777}. Will only go as far as to.getArray().length.
@param to Place the column references here. Sparse array
@param from Get the column references from here. Compact array
@@ -400,7 +400,7 @@
}
/**
* Shift a FormatableBitSet N bits toward the zero end.
- * e.g. shift({2,4}) -> {1,3}.
+ * e.g. shift({2,4}) -> {1,3}.
*
* @param bitSet the bit set
* @param n the number of bits to shift
diff --git a/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java b/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
index e3a49b1..f3d4945 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
@@ -48,7 +48,7 @@
* the table's rows satisfying the filter as a result set.
*
* There are several things we could do during object
- * construction that are done in the open & next calls, to
+ * construction that are done in the open and next calls, to
* improve performance.
*
*/
diff --git a/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java b/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
index 4e9e184..0b9bb21 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
@@ -1193,7 +1193,7 @@
not in the partial row if validColumns.get(N) returns false. Column N is
in the partial row if validColumns.get(N) returns true. If column N is
in the partial row then it maps to DataValueDescriptor[M] where M is the
- count of calls to validColumns.get(i) that return true where i < N. If
+ count of calls to validColumns.get(i) that return true where i < N. If
DataValueDescriptor.length is greater than the number of columns
indicated by validColumns the extra entries are ignored.
*/
diff --git a/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java b/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
index 25aa78f..ecd0891 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
@@ -111,7 +111,7 @@
* @param triggerInfo Array of structures containing trigger info,
* if any (may be null)
* @param baseRowReadList Map of columns read in. 1 based.
- * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
+ * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
* @param streamStorableHeapColIds Null for non rep. (0 based)
* @param numColumns Number of columns being read.
* @param positionedUpdate is this a positioned update
diff --git a/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java b/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
index 99fcfcb..84001a9 100644
--- a/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
+++ b/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
@@ -110,7 +110,7 @@
* @param lockMode The lock mode to use on the target table
* @param fkInfo Structure containing foreign key info, if any (may be null)
* @param triggerInfo Structure containing trigger info, if any (may be null)
- * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
+ * @param baseRowReadMap BaseRowReadMap[heapColId]->ReadRowColumnId. (0 based)
* @param streamStorableHeapColIds Null for non rep. (0 based)
* @param singleRowSource Whether or not source is a single row source
* @param underMerge True if this action is under a MERGE statement
diff --git a/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java b/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
index ec6b33f..7c1721f 100644
--- a/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
+++ b/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
@@ -702,7 +702,7 @@
* implementation may only track this info under SanityManager.DEBUG mode.
* If the implementation does not track the info it will return -1 (so
* code using this call to verify that no congloms are open should check
- * for return <= 0 rather than == 0).
+ * for return <= 0 rather than == 0).
*
* The return value depends on the "which_to_count" parameter as follows:
* OPEN_CONGLOMERATE - return # of openConglomerate() calls not close()'d.
diff --git a/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java b/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
index ec7ced9..11311df 100644
--- a/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
+++ b/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
@@ -259,9 +259,9 @@
*
* @param other The Orderable to compare this one to.
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
diff --git a/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java b/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
index f9cc108..94aa33c 100644
--- a/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
+++ b/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
@@ -1290,7 +1290,7 @@
* unknown condition of the controller following a transaction ending error.
* Use this call when closing all controllers as part of an abort of a
* transaction.
- * <p)
+ * <p>
* This call is meant to only be used internally by the Storage system,
* clients of the storage system should use the simple close() interface.
* <p>
diff --git a/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java b/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
index e9ed081..015847e 100644
--- a/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
+++ b/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
@@ -170,10 +170,10 @@
* Given the current latched page and slot number, lock the logically
* previous key in the table. There are 3 cases:
* <p>
- * slotnumber > 1 - just lock (slotnumber - 1)
- * (slotnumber == 1) && (leftmost leaf) - this is the first key in the
+ * slotnumber > 1 - just lock (slotnumber - 1)
+ * (slotnumber == 1) && (leftmost leaf) - this is the first key in the
* table, so lock a "magic" FIRSTKEY.
- * (slotnumber == 1) && !(leftmost leaf)- traverse left in the tree looking
+ * (slotnumber == 1) && !(leftmost leaf)- traverse left in the tree looking
* for a previous key.
* <p>
* On successful return from this routine appropriate locking will have
diff --git a/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java b/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
index 136fb88..5133c55 100644
--- a/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
+++ b/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
@@ -1621,7 +1621,7 @@
* return how many rows were filled in. If fetchNextSet() returns 0
* then the scan is complete, (ie. the scan is in the same state as if
* fetchNext() had returned false). If the scan is not complete then
- * fetchNext() will return (1 <= row_count <= N).
+ * fetchNext() will return (1 <= row_count <= N).
* <p>
* The current position of the scan is undefined if fetchNextSet()
* is used (ie. mixing fetch()/fetchNext() and fetchNextSet() calls
@@ -1664,10 +1664,10 @@
* @return The number of qualifying rows found and copied into the
* provided array of rows. If 0 then the scan is complete,
* otherwise the return value will be:
- * 1 <= row_count <= row_array.length
+ * 1 <= row_count <= row_array.length
*
* @param row_array The array of rows to copy rows into.
- * row_array[].length must >= 1. This routine
+ * row_array[].length must >= 1. This routine
* assumes that all entries in the array
* contain complete template rows.
*
diff --git a/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java b/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
index 0542a04..97060b5 100644
--- a/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
+++ b/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
@@ -1316,7 +1316,7 @@
** pain, and will slow down applications. It's only
** needed for consistency checks, so we may want to
** have implementations that don't bother to maintain it.
- ** <P)
+ ** <P>
** This
**/
private void fixChildrensParents(
diff --git a/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java b/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
index 2573fa8..3fd6174 100644
--- a/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
+++ b/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
@@ -923,7 +923,7 @@
object allocations occur during the execution of this method.
<P>
This method performs a binary search on the page and finds the entry i on
- the page such that entry[i] <= key < entry[i+1]. The result of the search
+ the page such that entry[i] <= key < entry[i+1]. The result of the search
is filled into the passed in params structure.
@param params the parameters of the search
@@ -1364,9 +1364,9 @@
** the same level of this page.
** <li> This page is the left sibling of its right sibling,
** and it's the right sibling of its left sibling.
- ** <li> The last row on the left sibling is < the first
+ ** <li> The last row on the left sibling is < the first
** row on this page.
- ** <li> The first row on the right sibling is > than the
+ ** <li> The first row on the right sibling is > than the
** the last row on this page.
** </menu>
** Note that these last two are really only true if there
@@ -1407,7 +1407,7 @@
/**
** Check that all rows on the page are in order. This
- ** means that each key is > than the previous key.
+ ** means that each key is > than the previous key.
@exception StandardException Standard exception policy.
**/
diff --git a/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java b/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
index 21d7ebb..e2023f8 100644
--- a/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
+++ b/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
@@ -194,9 +194,9 @@
*
* @param other The Orderable to compare this one to.
*
- * @return <0 - this Orderable is less than other.
+ * @return <0 - this Orderable is less than other.
* 0 - this Orderable equals other.
- * >0 - this Orderable is greater than other.
+ * >0 - this Orderable is greater than other.
*
* The code should not explicitly look for -1, or 1.
*
diff --git a/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java b/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
index cee8f97..fe8d6f8 100644
--- a/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
+++ b/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
@@ -103,7 +103,7 @@
* unknown condition of the controller following a transaction ending error.
* Use this call when closing all controllers as part of an abort of a
* transaction.
- * <p)
+ * <p>
* This call is meant to only be used internally by the Storage system,
* clients of the storage system should use the simple close() interface.
* <p>
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java b/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
index 34d311b..758feba 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
@@ -82,7 +82,7 @@
(non-first) alloc page have N == 0.
<PRE>
- <-- borrowed ->
+ [ borrowed ]
+----------+-------------+---+---------+-------------------+-------------+--------+
| FormatId | page header | N | N bytes | alloc extend rows | slot offset |checksum|
+----------+-------------+---+---------+-------------------+-------------+--------+
@@ -98,7 +98,7 @@
first physical byte of the container. Subsequent allocation pages are
chained via the nextAllocPageOffset. Each allocation page is expected to
manage at least 1000 user pages (for 1K page size) so this chaining may not
- be a severe performance hit. The logical -> physical mapping of an
+ be a severe performance hit. The logical -> physical mapping of an
allocation page is stored in the previous allocation page. The container
object will need to maintain this mapping.
<P>
@@ -1074,7 +1074,7 @@
* truncated. The next allocate looks at actual size of file as
* does the right thing.
*
- * <p)
+ * <p>
* MT - expect Container level X lock
*
* @exception StandardException Standard exception policy.
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java b/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
index fc69c51..3ffb3bb 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
@@ -129,8 +129,8 @@
* There are 3 latch states for a page:
*
* UNLATCHED - (owner == null)
- * PRELATCH - (owner != null) && preLatch
- * LATCHED - (owner != null) && !preLatch
+ * PRELATCH - (owner != null) && preLatch
+ * LATCHED - (owner != null) && !preLatch
*
* A page may be "cleaned" while it is either UNLATCHED, or PRELATCH, but
* it must wait for it to be not LATCHED.
@@ -173,7 +173,7 @@
Values for pageStatus flag
page goes thru the following transition:
- VALID_PAGE <-> deallocated page -> free page <-> VALID_PAGE
+ VALID_PAGE <-> deallocated page -> free page <-> VALID_PAGE
deallocated and free page are both INVALID_PAGE as far as BasePage is concerned.
When a page is deallocated, it transitioned from VALID to INVALID.
@@ -1474,7 +1474,7 @@
* Also used by access methods after undo of an insert.
* <p>
* Will return true if the number of non-deleted rows on the page is
- * <= "num_non_deleted_rows". For instance 0 means schedule reclaim
+ * <= "num_non_deleted_rows". For instance 0 means schedule reclaim
* only if all rows are deleted, 1 if all rows but one are deleted.
* <p>
* Will return true if the row just deleted is either a long row or long
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java b/java/engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
index f449291..4ec006f 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
@@ -52,7 +52,7 @@
* temporary file(n<cid>.dat) in the data segment itself.
* 3. Rename the current container file (c<cid>.dat) to
* another file (o<cid>.dat)
- * 4. Rename the new encrypted version of the file (n<cid).dat) to be
+ * 4. Rename the new encrypted version of the file (n<cid).dat) to be
* the current container file (c<cid>.dat).
* 5. All the old version of the container (o<cid>.dat) files are removed
* after a successful checkpoint with a new key or on a rollback.
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java b/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
index 89f627c..cee87ec 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
@@ -47,7 +47,7 @@
Any time store fetches a long column, the value is returned as a stream.
A long column is any column that at some point was longer than a page, so
a long column in one table may not be long in another depending on page size.
-<p)
+<p>
When the column is fetched a new OverflowInputStream is created and then
the datatype's stream is set using:
((StreamStorable)sColumn).setStream(OverflowInputStream);
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java b/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
index 3f5002c..bb6c10f 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
@@ -565,26 +565,33 @@
}
/**
+ * <p>
* This method handles what to do when, during a NIO operation we receive a
* {@code ClosedChannelException}. Note the specialization hierarchy:
- * <p/>
- * {@code ClosedChannelException} -> {@code AsynchronousCloseException} ->
+ * </p>
+ * <p>
+ * {@code ClosedChannelException} -> {@code AsynchronousCloseException} ->
* {@code ClosedByInterruptException}
- * <p/>
+ * </p>
+ * <p>
* If {@code e} is a ClosedByInterruptException, we normally start
* container recovery, i.e. we need to reopen the random access file so we
* get get a new interruptible channel and continue IO.
- * <p/>
+ * </p>
+ * <p>
* If {@code e} is a {@code AsynchronousCloseException} or a plain {@code
* ClosedChannelException}, the behavior depends of {@code stealthMode}:
- * <p/>
+ * </p>
+ * <p>
* If {@code stealthMode == false}, the method will wait for
* another thread tp finish recovering the IO channel before returning.
- * <p/>
+ * </p>
+ * <p>
* If {@code stealthMode == true}, the method throws {@code
* InterruptDetectedException}, allowing retry at a higher level in the
* code. The reason for this is that we sometimes need to release monitors
* on objects needed by the recovery thread.
+ * </p>
*
* @param e Should be an instance of {@code ClosedChannelException}.
* @param stealthMode If {@code true}, do retry at a higher level
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java b/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
index 4a96bbf..28c4016 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
@@ -135,7 +135,7 @@
their slots are also moved down.
A page has no empty slot (an empty page has no slot)
- <BR><B>Record & Field Format</B>
+ <BR><B>Record and Field Format</B>
Record Header format is defined in the StoredRecordHeader class.
@@ -1288,7 +1288,7 @@
* Is this page unfilled?
* <p>
* Returns true if page is relatively unfilled,
- * which means the page is < 1/2 full and has enough space to insert an
+ * which means the page is < 1/2 full and has enough space to insert an
* "average" sized row onto the page.
* <p>
*
@@ -7683,7 +7683,7 @@
This method ensures there is enough room to replace the
old data of length oldLength at the given offset, with the new data of length
newLength. This method does put any new data on the page, it moves old data around
- and zeros out any old data when newLength < oldLength. This method does
+ and zeros out any old data when newLength < oldLength. This method does
update the information in the slot table.
The passed in offset is the correct place to put the data
diff --git a/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java b/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
index 8a3c44b..fc48967 100644
--- a/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
+++ b/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
@@ -78,7 +78,7 @@
* RECORD_VALID_MASK - A mask of valid bits that can be set
* currently, such that the following assert can
* be made:
- * ASSERT((status & ~RECORD_VALID_MASK) == 0))
+ * ASSERT((status & ~RECORD_VALID_MASK) == 0))
**/
private static final byte RECORD_DELETED = 0x01;
private static final byte RECORD_OVERFLOW = 0x02;
diff --git a/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java b/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
index a492852..cb5e8ae 100644
--- a/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
+++ b/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
@@ -59,7 +59,7 @@
the buffers.
Log Buffers are used in circular fashion, each buffer moves through following stages:
- freeBuffers --> dirtyBuffers --> freeBuffers. Movement of buffers from one
+ freeBuffers --> dirtyBuffers --> freeBuffers. Movement of buffers from one
stage to another stage is synchronized using the object(this) of this class.
A Checksum log record that has the checksum value for the data that is
diff --git a/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java b/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
index 0999e7c..24ff5e8 100644
--- a/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
+++ b/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
@@ -39,7 +39,7 @@
hence the getValueAsLong() method. Outside the LogFactory the instant
is passed around as a LogCounter (through its LogInstant interface).
- The way the long is encoded is such that < == > correctly tells if
+ The way the long is encoded is such that < == > correctly tells if
one log instant is lessThan, equals or greater than another.
*/
diff --git a/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java b/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
index 8eb629c..e7bbee4 100644
--- a/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
+++ b/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
@@ -505,7 +505,7 @@
* there was no support to do write sync until jdk1.4 and then
* there was write sync jvm bug in jdk1.4.1, only in jdk1.4.2 write
* sync(rws and rwd modes) mechanism can be used correctly.
- * Default in JVMS >= jdk1.4.2 is write sync(see the boot method for jvm checks).
+ * Default in JVMS >= jdk1.4.2 is write sync(see the boot method for jvm checks).
*
* Write sync mechanism support is added for performance reasons.
* On commits, logging system has to make sure the log for committed
@@ -1435,7 +1435,7 @@
4 |--------------------------------------(end of log)
5 |-^-|
. Checkpoint Log Record
- ---A--->|<-------B--------->|<-------------C-----------
+ ---A--->|<-------B--------->|<-------------C-----------
</PRE>
<P>
diff --git a/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java b/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
index 4418df4..fa0871e 100644
--- a/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
+++ b/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
@@ -574,7 +574,7 @@
* @param recovered <code> true </code> to search for transaction
* that are in prepared during recovery.
* recovered tranaction.
- * <code> false > to search for just prepared
+ * <code> false > to search for just prepared
* transactons.
* @return <code> true if there is a prepared transaction and
* recovered when <code> recovered </code> argument is
diff --git a/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java b/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
index 5669680..2d96b63 100644
--- a/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
+++ b/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
@@ -132,8 +132,8 @@
/**
Return 0 if a == b,
- +ve number if a > b
- -ve number if a < b
+ +ve number if a > b
+ -ve number if a < b
*/
public static long compare(TransactionId a, TransactionId b)
{
diff --git a/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java b/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
index 41bda83..793ba97 100644
--- a/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
+++ b/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
@@ -41,7 +41,7 @@
* elements that contains dirty log are in dirtyBuffers. Chunks of log records
* are appended to the buffer element in currentDirtyBuffer. Hence,
* the life cycle of buffer elements is:
- * freeBuffers -> currentDirtyBuffer -> dirtyBuffers -> freeBuffers
+ * freeBuffers -> currentDirtyBuffer -> dirtyBuffers -> freeBuffers
*
* To append chunks of log records to the buffer, use appendLog(...)
*
diff --git a/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java b/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
index 6b98d23..0340e32 100644
--- a/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
+++ b/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
@@ -156,7 +156,7 @@
* max(MAX, DEFAULT_NUMBER_LOG_BUFFERS*MIN) is the maximum delay between a
* log record is committed at the master until it is replicated to the
* slave. Hence the default latency should be atleast greater than the maximum
- * latency offered by the choice of MIN, hence MAX > DEFAULT_NUMBER_LOG_BUFFERS*MIN.
+ * latency offered by the choice of MIN, hence MAX > DEFAULT_NUMBER_LOG_BUFFERS*MIN.
*/
private static final long MAX = 5000;
@@ -376,7 +376,7 @@
* action to be taken when a notification from the log shipper is received,
*
* a) Get FI from log buffer
- * b) If FI >= FI_HIGH
+ * b) If FI >= FI_HIGH
* b.1) notify the log shipper thread.
* c) Else If the time elapsed since last ship is greater than
* minShippingInterval
@@ -402,9 +402,9 @@
* information obtained from the log buffer. This method uses the following
* steps to arrive at the shipping interval,
*
- * a) FI >= FI_HIGH return -1 (signifies that the waiting time should be 0)
- * b) FI > FI_LOW and FI < FI_HIGH return minShippingInterval
- * c) FI <= FI_LOW return maxShippingInterval.
+ * a) FI >= FI_HIGH return -1 (signifies that the waiting time should be 0)
+ * b) FI > FI_LOW and FI < FI_HIGH return minShippingInterval
+ * c) FI <= FI_LOW return maxShippingInterval.
*
* @return the shipping interval based on the fill information.
*/
diff --git a/java/engine/org/apache/derby/jdbc/package.html b/java/engine/org/apache/derby/jdbc/package.html
index 22e211a..a700754 100644
--- a/java/engine/org/apache/derby/jdbc/package.html
+++ b/java/engine/org/apache/derby/jdbc/package.html
@@ -108,7 +108,7 @@
</TABLE>
<HR/>
-<A name="implblob"/A>
+<A name="implblob"></A>
<H3>java.sql.Blob</H3>
<H4>Clarification for getBytes(int pos, int length)</H4>
If the pos (position) argument is greater than the length of the BLOB then an exception is thrown.
@@ -117,7 +117,7 @@
If the pattern argument has length zero, then the value of start argument will be returned.
This matches the semantics of the SQL LOCATE function.
<HR/>
-<A name="implclob"/A>
+<A name="implclob"></A>
<H3>java.sql.Clob</H3>
<H4>Clarification for getSubString(int pos, int length)</H4>
If the pos (position) argument is greater than the length of the CLOB then an exception is thrown.
@@ -126,12 +126,12 @@
If the searchstr argument has length zero (the empty string), then the value of start argument
will be returned. This matches the semantics of the SQL LOCATE function.
<HR/>
-<A name="implconnection"/A>
+<A name="implconnection"></A>
<H3>java.sql.Connection</H3>
<H4>Clarification for createStatement(), prepareStatement() and prepareCall()</H4>
CONCUR_UPDATABLE concurrency is supported for TYPE_FORWARD_ONLY and TYPE_SCROLL_INSENSITIVE ResultSet types only.
<HR/>
-<A name="implpreparedstatement"/A>
+<A name="implpreparedstatement"></A>
<H3>java.sql.PreparedStatement</H3>
<H4>Clarification for setAsciiStream(),setBinaryStream(),setCharacterStream()</H4>
In Derby, the stream must have the exact amount of data as the length argument,
@@ -148,7 +148,7 @@
the statement execution will fail with
'Stream has already been read and end-of-file reached and cannot be re-used.'.
<HR/>
-<A name="implresultset"/A>
+<A name="implresultset"></A>
<H3>java.sql.ResultSet</H3>
<H4>Extension for getXXX()</H4>
Support for data conversion using the getXXX() methods matches Table B-6 of [JDBC3] with this extension:
@@ -172,7 +172,7 @@
An ASCII character is defined as an eight bit character (range 0x00 to 0xff),
see CHAR() function definition by [JDBC3] in appendix C.2.
<P>
-For character types (Types.CHAR, Types.VARCHAR & Types.LONGVARCHAR),
+For character types (Types.CHAR, Types.VARCHAR and Types.LONGVARCHAR),
each character in the value is translated to one byte in the ASCII stream:
<UL>
<LI> Unicode characters in the range 0x0000 to 0x00ff,
@@ -226,7 +226,7 @@
<LI>getString() returns a String with eight characters "3487c21f"
</UL>
<HR/>
-<A name="implsqldate"/A>
+<A name="implsqldate"></A>
<H3>Derby's SQL DATE interactions with JDBC</H3>
<P>Derby’s SQL DATE type represents a date in the form yyyy-mm-dd with no associated time zone information.</P>
<H4>java.sql.Date</H4>
@@ -313,7 +313,7 @@
<P>If the format of the string matches one of the built in formats then a conversion to a java.sql.Date matches that of a SQL DATE value with value yyyy-mm-dd.</P>
<P>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</P>
<HR/>
-<A name="implsqltime"/A>
+<A name="implsqltime"></A>
<H3>Derby's SQL TIME interactions with JDBC</H3>
<P>Derby’s SQL TIME type represents a time of day in the form hh:mm:ss with no associated time zone information.</P>
<H4>java.sql.Time</H4>
@@ -402,7 +402,7 @@
<P>If the format of the string matches one of the built in formats then a conversion to a java.sql.Time matches that of a SQL TIME value with value hh:mm:ss.</P>
<P>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</P>
<HR/>
-<A name="implsqltimestamp"/A>
+<A name="implsqltimestamp"></A>
<H3>Derby's SQL TIMESTAMP interactions with JDBC</H3>
<P>Derby’s SQL TIMESTAMP type represents a time of day in the form yyyy-mm-dd hh:mm:ss.fffffffff (nanosecond granularity) with no associated time zone information.</P>
<H4>java.sql.Timestamp</H4>
diff --git a/java/engine/org/apache/derby/vti/DeferModification.java b/java/engine/org/apache/derby/vti/DeferModification.java
index 76298b6..37ef358 100644
--- a/java/engine/org/apache/derby/vti/DeferModification.java
+++ b/java/engine/org/apache/derby/vti/DeferModification.java
@@ -29,7 +29,7 @@
* Consider the following statement:<br>
* UPDATE NEW myVTI(...)
* SET cost = cost + 10
- * WHERE cost < 15
+ * WHERE cost < 15
*<p>
* Updating a column that is used in the WHERE clause might or might not give the VTI implementation trouble;
* the update might cause the same row to be selected more than once. This problem can be solved by building the
diff --git a/java/engine/org/apache/derby/vti/RestrictedVTI.java b/java/engine/org/apache/derby/vti/RestrictedVTI.java
index c322cba..d412971 100644
--- a/java/engine/org/apache/derby/vti/RestrictedVTI.java
+++ b/java/engine/org/apache/derby/vti/RestrictedVTI.java
@@ -41,7 +41,7 @@
* because they don't have to fetch all columns and rows. This can mean
* performance boosts for queries which only need a subset of the Table
* Function's columns and for queries which compare those columns to constant
- * expressions using the <, <=, =, >, >=, and != operators. This can also mean
+ * expressions using the <, <=, =, >, >=, and != operators. This can also mean
* performance boosts for LIKE and BETWEEN operations on Table Function
* columns. For more information, see the commentary on
* <a href="https://issues.apache.org/jira/browse/DERBY-4357">DERBY-4357</a>.
diff --git a/java/engine/org/apache/derby/vti/Restriction.java b/java/engine/org/apache/derby/vti/Restriction.java
index ec3d8db..377b2ea 100644
--- a/java/engine/org/apache/derby/vti/Restriction.java
+++ b/java/engine/org/apache/derby/vti/Restriction.java
@@ -114,7 +114,7 @@
* </p>
*
* <blockquote><pre>
- * < = <= > >= IS NULL IS NOT NULL
+ * < = <= > >= IS NULL IS NOT NULL
* </pre></blockquote>
*/
public static class ColumnQualifier extends Restriction
@@ -128,19 +128,19 @@
/** Derby serializes these objects in PreparedStatements */
public static final long serialVersionUID = -8205388794606605844L;
- /** Ordering operation constant representing '<' **/
+ /** Ordering operation constant representing '<' **/
public static final int ORDER_OP_LESSTHAN = 0;
/** Ordering operation constant representing '=' **/
public static final int ORDER_OP_EQUALS = 1;
- /** Ordering operation constant representing '<=' **/
+ /** Ordering operation constant representing '<=' **/
public static final int ORDER_OP_LESSOREQUALS = 2;
- /** Ordering operation constant representing '>' **/
+ /** Ordering operation constant representing '>' **/
public static final int ORDER_OP_GREATERTHAN = 3;
- /** Ordering operation constant representing '>=' **/
+ /** Ordering operation constant representing '>=' **/
public static final int ORDER_OP_GREATEROREQUALS = 4;
/** Ordering operation constant representing 'IS NULL' **/
diff --git a/java/shared/org/apache/derby/shared/common/sanity/AssertFailure.java b/java/shared/org/apache/derby/shared/common/sanity/AssertFailure.java
index 162bb71..d359446 100644
--- a/java/shared/org/apache/derby/shared/common/sanity/AssertFailure.java
+++ b/java/shared/org/apache/derby/shared/common/sanity/AssertFailure.java
@@ -43,7 +43,7 @@
* and we have the right permissions.
*
* If the JVM doesn't have the method Thread.getAllStackTraces i.e, we are on a
- * JVM < 1.5, or if we don't have the permissions java.lang.RuntimePermission
+ * JVM < 1.5, or if we don't have the permissions java.lang.RuntimePermission
* "getStackTrace" and "modifyThreadGroup", a message saying so is stored
* instead.
*
@@ -146,7 +146,7 @@
* The result is returned as a string, ready to print.
*
* If the JVM doesn't have the method Thread.getAllStackTraces
- * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
+ * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
* java.lang.RuntimePermission "getStackTrace" and "modifyThreadGroup",
* a message saying so is returned instead.
*
diff --git a/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java b/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
index 0ad4861..ec6a8df 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
@@ -29,7 +29,7 @@
/**
Class: HandleResult
- Purpose: To capture stdout & stderr to a file
+ Purpose: To capture stdout and stderr to a file
(PrintWriter is used for writing the output)
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java b/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
index ea1d79e..3f14c3b 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
@@ -426,7 +426,7 @@
** Given the command file, infer the test name.
** Takes the portion of the file name between
** the last '.' and the last '/'. e.g.
- ** x/y/Name.suffix -> Name
+ ** x/y/Name.suffix -> Name
**
*/
private static String getTestName(String cmdFile)
diff --git a/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java b/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
index e6b8dc2..8fbcbae 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
@@ -164,11 +164,11 @@
* timeout period.
*
* Behavior is as follows:
- * 1) If timeout is set to a valid value (>0) - in this case, if myThread has not
+ * 1) If timeout is set to a valid value (>0) - in this case, if myThread has not
* finished its work by the time this method was called, then it will wait
* till the timeout has elapsed or if the myThread has finished its work.
*
- * 2)If timeout is not set ( <= 0) - in this case, if myThread has not
+ * 2)If timeout is not set ( <= 0) - in this case, if myThread has not
* finished its work by the time this method was called, then it will wait
* till myThread has finished its work.
*
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
index bbc7ee3..c121595 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
@@ -504,10 +504,10 @@
/**
* Tests the exceptions thrown by the getBinaryStream
* (long pos, long length) for the following conditions
- * a) pos <= 0
- * b) pos > (length of LOB)
- * c) length < 0
- * d) pos + length > (length of LOB).
+ * a) pos <= 0
+ * b) pos > (length of LOB)
+ * c) length < 0
+ * d) pos + length > (length of LOB).
*
* @throws SQLException.
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
index 5a2c2b0..8023e80 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
@@ -578,10 +578,10 @@
/**
* Tests the exceptions thrown by the getCharacterStream
* (long pos, long length) for the following conditions
- * a) pos <= 0
- * b) pos > (length of LOB)
- * c) length < 0
- * d) pos + length > (length of LOB).
+ * a) pos <= 0
+ * b) pos > (length of LOB)
+ * c) length < 0
+ * d) pos + length > (length of LOB).
*
* @throws SQLException
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
index 85c0153..cab36fe 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
@@ -390,7 +390,7 @@
* Sets the current schema to the name given as argument and returns the
* schema transition.
* @param nextSchema schema to transition to
- * @return a string of the form oldSchema->newSchema
+ * @return a string of the form oldSchema->newSchema
* @throws java.sql.SQLException
*/
public static String getSchemaTransition(String nextSchema)
@@ -412,8 +412,8 @@
/**
* Utility that cycles through the legal isolation levels in the following
- * order: read uncommitted -> read committed -> repeatable read ->
- * serializable -> read uncommitted -> ...
+ * order: read uncommitted -> read committed -> repeatable read ->
+ * serializable -> read uncommitted -> ...
* @return IsoLevel object representing the isolation level.
*/
private static IsoLevel cycleIsolation() {
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
index e4cc5dd..c83afa7 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
@@ -36,8 +36,8 @@
/**
* Tests the following PreparedStatement methods:
- * -> setCharacterStream(int parameterIndex, InputStream x, int length)
- * -> setAsciiStream(int parameterIndex, Reader reader, int length)
+ * -> setCharacterStream(int parameterIndex, InputStream x, int length)
+ * -> setAsciiStream(int parameterIndex, Reader reader, int length)
*/
public class CharacterStreamsTest extends BaseJDBCTestCase {
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
index 36f9f5b..9de3d32 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
@@ -924,7 +924,7 @@
* Tests that a pooled connection can successfully be reused
* (a new connection obtained from it) during the processing
* of its close event by its listener.
- * Sections 11.2 & 12.5 of JDBC 4 specification indicate that the
+ * Sections 11.2 and 12.5 of JDBC 4 specification indicate that the
* connection can be returned to the pool when the
* ConnectionEventListener.connectionClosed() is called.
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
index 5e1db72..8082233 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
@@ -4926,7 +4926,7 @@
* non-zero fraction to see what happens to the discarded fractional
* part (scale == 1): Conversions to long should round off in the
* direction of zero for both positive and negative numbers with a
- * fractional part >< 0, cf. RoundingMode.DOWN used in the asserts
+ * fractional part >< 0, cf. RoundingMode.DOWN used in the asserts
* below.
*/
public void testDerby5536() throws SQLException {
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
index 957315c..300c427 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
@@ -451,7 +451,7 @@
}
/**
- * Test fix for Bug4810 -Connection.commit() & rollback() do not
+ * Test fix for Bug4810 -Connection.commit() and rollback() do not
* commit/rollback in auto-commit mode.
*/
public void testBug4810() throws SQLException {
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
index 3ff1ceb..a8c6280 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
@@ -1400,7 +1400,7 @@
* passed down to ScrollInsensitiveResultSet.updateRow does not always
* contain all the rows of the basetable, cf. the logic of RowChangerImpl.
* When an explicit list of columns is given as in FOR UPDATE OF
- * <column-list>, the ExecRow may contains a subset of the the base table
+ * <column-list>, the ExecRow may contains a subset of the the base table
* columns and ScrollInsensitiveResultSet was not ready to handle that.
*
* Test some of the cases which went wrong before the fix.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
index ccc2fcd..d0ca1e0 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
@@ -359,7 +359,7 @@
}
/**
- * try a column which is > 32767
+ * try a column which is > 32767
*
* @throws SQLException
*/
@@ -376,7 +376,7 @@
}
/**
- * try several columns > 32767.
+ * try several columns > 32767.
*
* @throws SQLException
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
index eb90043..a03700a 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
@@ -438,7 +438,7 @@
}
/**
- * Test in list with constant and non constant elements & Norwegian collation
+ * Test in list with constant and non constant elements and Norwegian collation
* DERBY-6025(Wrong results with IN lists and indexes in territory based
* collation)
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
index 4db67ef..ed8f987 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
@@ -179,7 +179,7 @@
* <p>
* Insert all data to tested against into LIKE_NAMES. A customer table
* will be filled with this data.
- * {p>
+ * <p>
* Insert test cases for like string into the LIKE_TEST_CASES, results
* are expected only to return a single row.
* <p>
@@ -987,7 +987,7 @@
/**
* Check simple boolean compare of string constant to column value.
* <p>
- * Check <, <=, =, >=, > of constant to column, ie. of the form
+ * Check <, <=, =, >=, > of constant to column, ie. of the form
* select * from table where col boolean constant
*
*
@@ -1125,7 +1125,7 @@
/**
* Check simple boolean compare of string constant to column value.
* <p>
- * Check <, <=, =, >=, > of constant to column, ie. of the form
+ * Check <, &glt;=, =, >=, > of constant to column, ie. of the form
* select * from table where col boolean constant
*
*
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
index 7929415..1b59fe3 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
@@ -1477,7 +1477,7 @@
*
* The tests below show that GROUP BY and HAVING clauses are able to use a
* column which is not part of the SELECT list. This happens for USING
- * clause & NATURAL joins with queries using INNER JOINS and OUTER JOINS.
+ * clause and NATURAL joins with queries using INNER JOINS and OUTER JOINS.
* When using the JOIN with ON clause, we do not run into this problem
* because we are expected to qualify the JOIN column with table name
* in the SELECT list when using thw ON clause.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
index 53de34a..9a592cf 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
@@ -58,7 +58,7 @@
* 3. The number of elements in the IN list is significantly less
* than the number of rows in the target table (in this test
* the data rows are not unique w.r.t the IN list values, so
- * the size of the IN list should generally be <= 1/10th of the
+ * the size of the IN list should generally be <= 1/10th of the
* number rows in the table).
*
* If all three of these are true then we expect that Derby will perform
@@ -1485,7 +1485,7 @@
/**
* Select all rows from DATA_TABLE and store them into an in-memory
- * map of "foreign_uuid -> rows". So any given foreign_key_uuid can
+ * map of "foreign_uuid -> rows". So any given foreign_key_uuid can
* be mapped to one or more rows from the table.
*
* We use the in-memory map to verify that all queries executed
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
index 7bc4b43..1efa543 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
@@ -1070,7 +1070,7 @@
-auto commit is true
-lock count before execution 0
-lock count after execution 1
- -lock count after next on first rs 3 -> 2 now FIXME: explain
+ -lock count after next on first rs 3 -> 2 now FIXME: explain
-lock count after first getMoreResults() 2
-lock count after next on second rs 7
-lock count after second getMoreResults() 0
@@ -1078,7 +1078,7 @@
-auto commit is false
-lock count before execution 0
-lock count after execution 1
- -lock count after next on first rs 3 -> 2 now FIXME: explain
+ -lock count after next on first rs 3 -> 2 now FIXME: explain
-lock count after first getMoreResults() 2
-lock count after next on second rs 7
-lock count after second getMoreResults() 7
@@ -1086,7 +1086,7 @@
-auto commit is true
-lock count before execution 0
-lock count after execution 1
- -lock count after next on first rs 3 -> 2 now FIXME: explain
+ -lock count after next on first rs 3 -> 2 now FIXME: explain
-executing statement to force auto commit on open call statement
-lock count after statement execution 0
-lock count after first getMoreResults() 0
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LobMode.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LobMode.java
index 7390f2b..091cf92 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LobMode.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LobMode.java
@@ -46,8 +46,8 @@
* because they do not satisfy its type bounds. That is because they inherit the
* Comparable implementation of java.util.Date rather than implementing
* their own more specific version of Comparable. That is,
- * java.sql.Date implements Comparable<java.util.Date> rather than
- * Comparable<java.sql.Date>.
+ * java.sql.Date implements Comparable<java.util.Date> rather than
+ * Comparable<java.sql.Date>.
* </p>
*/
public class LobMode<V> implements Aggregator<V,V,LobMode<V>>
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
index e9a7b6a..48557be 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
@@ -1274,7 +1274,7 @@
* One of the productions of {@code <query expression body>}, is
*
* <pre>
- * <left paren> <query expression body
+ * <left paren> <query expression body>
* [ <order by clause> ] [ <result offset clause> ]
* [ <fetch first clause> ] <right paren>
* </pre>
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
index 053fdea..0ec3bcc 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
@@ -2918,7 +2918,7 @@
/**
* This fixture would give:
* <pre>
- * ASSERT FAILED sourceResultSetNumber expected to be >= 0 for T2.X
+ * ASSERT FAILED sourceResultSetNumber expected to be >= 0 for T2.X
* </pre>
* error in sane mode prior to DERBY-4736 due to a missing rebinding
* operation as a result a the LOJ reordering. Schema and query originally
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
index 44e6965..05df1bb 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
@@ -219,7 +219,7 @@
/**
* Compile a number of statements based upon the sqlbase
- * replacing the & with a number increasing from 0 to number - 1
+ * replacing the and with a number increasing from 0 to number - 1
*
* Uses PreparedStatement unless sqlbase starts with CALL then
* CallableStatement is used.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
index 56cd1e0..e37dd3c 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
@@ -2279,7 +2279,7 @@
}
/**
- * Derby-388: When a set of inserts & updates is performed on a table
+ * Derby-388: When a set of inserts and updates is performed on a table
* and each update fires a trigger that in turn performs other updates,
* Derby will sometimes try to recompile the trigger in the middle
* of the update process and will throw an NPE when doing so.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
index 9358c2a..005338e 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
@@ -497,7 +497,7 @@
}
/**
- * Negative test - attempt to deleteRow & updateRow on updatable resultset
+ * Negative test - attempt to deleteRow and updateRow on updatable resultset
* when the resultset is not positioned on a row
*/
public void testUpdateDeleteRowNotOnRow() throws SQLException {
@@ -557,7 +557,7 @@
}
/**
- * Negative test - attempt deleteRow & updateRow on updatable resultset
+ * Negative test - attempt deleteRow and updateRow on updatable resultset
* after closing the resultset
*/
public void testUpdateDeleteRowOnClosedResultSet() throws SQLException {
@@ -1861,7 +1861,7 @@
}
/**
- * Positive test - setting the fetch size to > 1 will be ignored by
+ * Positive test - setting the fetch size to > 1 will be ignored by
* updatable resultset. Same as updatable cursors
*/
public void testSetFetchSizeOnUpdatableResultSet() throws SQLException {
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java b/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
index 7967c31..31ce0b4 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
@@ -109,11 +109,11 @@
Scan type=btree
Tree height=4
start position:
- >= on first 1 column(s).
+ >= on first 1 column(s).
Ordered null semantics on the following columns:
0
stop position:
- > on first 1 column(s).
+ > on first 1 column(s).
Ordered null semantics on the following columns:
0
qualifiers:
@@ -243,11 +243,11 @@
Scan type=btree
Tree height=-1
start position:
- >= on first 1 column(s).
+ >= on first 1 column(s).
Ordered null semantics on the following columns:
0
stop position:
- > on first 1 column(s).
+ > on first 1 column(s).
Ordered null semantics on the following columns:
0
qualifiers:
@@ -277,11 +277,11 @@
Scan type=btree
Tree height=3
start position:
- >= on first 1 column(s).
+ >= on first 1 column(s).
Ordered null semantics on the following columns:
0
stop position:
- > on first 1 column(s).
+ > on first 1 column(s).
Ordered null semantics on the following columns:
0
qualifiers:
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
index af261e0..8e11411 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
@@ -129,7 +129,7 @@
* Returns a set of startup properties suitable for VersionMBeanTest.
* These properties are used to configure JMX in a different JVM.
* Will set up remote JMX using the port defined by the current test
- * configuration, and with JMX security (authentication & SSL) disabled.
+ * configuration, and with JMX security (authentication and SSL) disabled.
*
* @return a set of Java system properties to be set on the command line
* when starting a new JVM in order to enable remote JMX.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
index 401fff9..722fe46 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
@@ -145,7 +145,7 @@
/**
* Reports the access count for the specified worker thread.
*
- * @param id worker thread id, must be in the range [0, threadCount>
+ * @param id worker thread id, must be in the range [0, threadCount>
* @param accessCount number of successful accesses made to the db
*/
public synchronized void reportAccessCount(int id, int accessCount) {
@@ -157,7 +157,7 @@
* Reports an unexpected error and the access count for the specified
* worker thread.
*
- * @param id worker thread id, must be in the range [0, threadCount>
+ * @param id worker thread id, must be in the range [0, threadCount>
* @param accessCount number of successful accesses made to the db
* @param error error to report
*/
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
index 659978a..87a1426 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
@@ -39,7 +39,7 @@
*
* DERBY-1296 - Setting property derby.system.bootAll causes an Exception
*
- * create & shutdown three databases as well as the default
+ * create and shutdown three databases as well as the default
* shutdown the engine
* set "derby.system.bootAll"
* check at least four databases are listed in the driver info
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
index d88fefc..2ded24a 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
@@ -57,7 +57,7 @@
/**
* Two threads simultaneously updating a table. Threads each
- * update a separate row with a long value (>32K). NUMALLOCATED
+ * update a separate row with a long value (>32K). NUMALLOCATED
* pages should not grow past expected value after 500 updates
* by each thread.
*
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java b/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
index 8a0d681..58d8280 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
@@ -78,7 +78,7 @@
* The update error occurs with the following:
* o update of a long row which requires an update on it's overflow page
* o The portion of the long row on the overflow page needs to have
- * max(row size, reserved space) + free space on page <= 12
+ * max(row size, reserved space) + free space on page <= 12
* (12 causes the error, other values might also).
*
* In order to get to this one needs multiple rows on the overflow page,
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java b/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
index 231179b..9099dc8 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
@@ -576,7 +576,7 @@
// streamTest5(length, tableName);
// }
/**
- * If length > 32700 insert to a BLOB field. Else, a long varchar field.
+ * If length > 32700 insert to a BLOB field. Else, a long varchar field.
*
* @param length
* Padding length
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java b/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
index aac2598..993474c 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
@@ -371,7 +371,7 @@
/**
* wait for background thread to convert allocated pages to free pages
* <p>
- * Wait until the total number of allocated pages is <= alloc_wait_count.
+ * Wait until the total number of allocated pages is <= alloc_wait_count.
* The expectation is that the test has performed some deletes and
* committed allowing the background task converted empty allocated pages
* with only deleted rows into free pages.
diff --git a/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java b/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
index a63bd0d..1bd9c7f 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
@@ -652,7 +652,7 @@
/**
* Regexp pattern to match the file name of a jar file stored in the
- * database (version >= 10.9).
+ * database (version >= 10.9).
*/
private Goal[] pattern;
@@ -704,7 +704,7 @@
/**
* assert that fName has the expected shape of a jar file
- * in the database (version >= 10.9).
+ * in the database (version >= 10.9).
*/
private void assertFileNameShape(String fName) {
assertTrue(matches(fName, pattern));
diff --git a/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java b/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
index b1c8a62..2533e99 100644
--- a/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
+++ b/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
@@ -48,7 +48,7 @@
This function depends on DDL performed by the authorize.jsql test.
@param k A key for adding/deleting rows in table t.
- @param shouldBeReadOnly true -> the connection should be ReadOnly
+ @param shouldBeReadOnly true -> the connection should be ReadOnly
*/
private static void verifyAccess(int k, boolean shouldBeReadOnly)
throws Exception
diff --git a/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java b/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
index 9f3b232..87341d8 100644
--- a/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
+++ b/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
@@ -467,7 +467,7 @@
/**
* Tear down this fixture, sub-classes should call
- * super.tearDown(). This cleanups & closes the connection
+ * super.tearDown(). This cleans up and closes the connection
* if it is open and any statement objects returned through
* the utility methods.
*/
diff --git a/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java b/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
index 49c6849..c446e9f 100644
--- a/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
+++ b/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
@@ -84,7 +84,7 @@
/**
* Tear down this fixture, sub-classes should call
- * super.tearDown(). This cleanups & closes the connection
+ * super.tearDown(). This cleans up and closes the connection
* if it is open.
*/
protected void tearDown()
diff --git a/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java b/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
index 59067e8..42e5bd1 100644
--- a/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
+++ b/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
@@ -961,7 +961,7 @@
/**
* Check if we have old style (before Sun Java 1.7) Solaris interruptible
- * IO. On Sun Java 1.5 >= update 22 and Sun Java 1.6 this can be disabled
+ * IO. On Sun Java 1.5 >= update 22 and Sun Java 1.6 this can be disabled
* with Java option {@code -XX:-UseVMInterruptibleIO}. On Sun Java 1.7 it
* is by default disabled.
*
diff --git a/java/testing/org/apache/derbyTesting/junit/JDBC.java b/java/testing/org/apache/derbyTesting/junit/JDBC.java
index e053008..9d717ba 100644
--- a/java/testing/org/apache/derbyTesting/junit/JDBC.java
+++ b/java/testing/org/apache/derbyTesting/junit/JDBC.java
@@ -1402,7 +1402,7 @@
* @param colsToCheck If non-null then for every bit b
* that is set in colsToCheck, we'll compare the (b+1)-th column
* of the received result set's current row to the i-th column
- * of expectedRow, where 0 <= i < # bits set in colsToCheck.
+ * of expectedRow, where 0 <= i < # bits set in colsToCheck.
* So if colsToCheck is { 0, 3 } then expectedRow should have
* two objects and we'll check that:
*
@@ -1411,7 +1411,7 @@
*
* If colsToCheck is null then the (i+1)-th column in the
* result set is compared to the i-th column in expectedRow,
- * where 0 <= i < expectedRow.length.
+ * where 0 <= i < expectedRow.length.
*/
private static void assertRowInResultSet(
ResultSet rs,
diff --git a/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java b/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
index 8277249..367dc3e 100644
--- a/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
+++ b/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
@@ -41,7 +41,7 @@
* the elapsed time is printed out and after R repeats of the test, the average
* elapsed time is also printed.
*
- * If a test has R repeats and (R>1), then the average elapsed time of the
+ * If a test has R repeats and (R>1), then the average elapsed time of the
* (R-1) runs is printed out and the timing info collected as part of the first
* testrun is ignored.
* If R=1, then the average elapsed time prints time for that
diff --git a/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java b/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
index 206e634..9ac74d0 100644
--- a/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
+++ b/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
@@ -665,7 +665,7 @@
/**
* Decorate a test to use a new database that is created upon the
- * first connection request to the database and shutdown & deleted at
+ * first connection request to the database and shutdown and deleted at
* tearDown. The configuration differs only from the current configuration
* by the list of used databases. The new database name
* is generated automatically as 'singleUse/oneuseXX' where 'XX' is
@@ -686,7 +686,7 @@
/**
* Decorate a test to use a new database that is created upon the first
- * connection request to the database and shutdown & deleted at
+ * connection request to the database and shutdown and deleted at
* tearDown. The configuration differs only from the current configuration
* by the list of used databases. The generated database name is added at
* the end of <code>usedDbNames</code> and assigned as a default database
@@ -729,7 +729,7 @@
/**
* Decorate a test to use a new database that is created upon the
- * first connection request to the database and shutdown & deleted at
+ * first connection request to the database and shutdown and deleted at
* tearDown. The configuration differs only from the current configuration
* by the list of used databases.
* The passed database name is mapped to the generated database
diff --git a/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java b/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java
index 4e0e48d..d50fa07 100644
--- a/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java
+++ b/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java
@@ -30,8 +30,8 @@
* <BR>
* For clarity these fields are renamed in Java
* <UL>
- * <LI>w_id => warehouse (SQL column C_W_ID)
- * <LI>d_id => district (SQL column C_D_ID)
+ * <LI>w_id => warehouse (SQL column C_W_ID)
+ * <LI>d_id => district (SQL column C_D_ID)
* </UL>
* <BR>
* The columns that map to an address are extracted out as
diff --git a/java/testing/org/apache/derbyTesting/system/oe/model/District.java b/java/testing/org/apache/derbyTesting/system/oe/model/District.java
index 1fd61dd..2175db6 100644
--- a/java/testing/org/apache/derbyTesting/system/oe/model/District.java
+++ b/java/testing/org/apache/derbyTesting/system/oe/model/District.java
@@ -27,7 +27,7 @@
* and are in lower case.
* For clarity this field are renamed in Java
* <UL>
- * <LI>w_id => warehouse (SQL column D_W_ID)
+ * <LI>w_id => warehouse (SQL column D_W_ID)
* </UL>
* <BR>
* The columns that map to an address are extracted out as
diff --git a/java/testing/org/apache/derbyTesting/system/oe/model/Order.java b/java/testing/org/apache/derbyTesting/system/oe/model/Order.java
index a935c4b..745ed06 100644
--- a/java/testing/org/apache/derbyTesting/system/oe/model/Order.java
+++ b/java/testing/org/apache/derbyTesting/system/oe/model/Order.java
@@ -28,9 +28,9 @@
* and are in lower case.
* For clarity these fields are renamed in Java
* <UL>
- * <LI>w_id => warehouse (SQL column O_W_ID)
- * <LI>d_id => district (SQL column O_D_ID)
- * <LI>c_id => customer (SQL column O_C_ID)
+ * <LI>w_id => warehouse (SQL column O_W_ID)
+ * <LI>d_id => district (SQL column O_D_ID)
+ * <LI>c_id => customer (SQL column O_C_ID)
* </UL>
* <BR>
* The columns that map to an address are extracted out as
diff --git a/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java b/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
index 2a75430..f20323a 100644
--- a/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
+++ b/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
@@ -511,7 +511,7 @@
Create two lockable objects and pass them off to two threads.
Each thread will run lock the first object, set its value then lock
- the second object & set its value, yield and then release the lock
+ the second object and set its value, yield and then release the lock
on one and then on two. Various checks are made to ensure the
values are as expected.
diff --git a/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java b/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
index 7e87dc4..1bed55d 100644
--- a/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
+++ b/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
@@ -6455,7 +6455,7 @@
Insert a single row with single or multiple portions.
Update every other field with a long col
rollback.
- The update each column back to a null & rollback
+ The update each column back to a null and rollback
@exception T_Fail Unexpected behaviour from the API
@exception StandardException Unexpected exception from the implementation
diff --git a/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java b/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
index 4934161..15ab893 100644
--- a/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
+++ b/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
@@ -149,7 +149,7 @@
Tests in here come in pairs (Snnn Rnnn), one to set it up, one to test
it after recovery. Information that needs to be passed from the setup
to the recovery should, ideally, be written out to a database. For
- now, it is written out as a pair of <key,value> long in the file
+ now, it is written out as a pair of (key,value) long in the file
T_Recovery.info.
To make sure you don't accidently tramples on someone else's key,
@@ -157,8 +157,8 @@
your key. Multiple invocations which needs paramaters saved should
be encoded futher.
- 001 < nnn < 200 - no recovery undo
- 200 < nnn < 400 - recovery undo
+ 001 < nnn < 200 - no recovery undo
+ 200 < nnn < 400 - recovery undo
@exception T_Fail Unexpected behaviour from the API
*/
diff --git a/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java b/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
index 28b3430..8301fbc 100644
--- a/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
+++ b/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
@@ -34,7 +34,7 @@
public class DB_GrantRevoke {
/** ************************************************
- * Generate Grant & Revoke statements if sqlAuthorization is on
+ * Generate Grant and Revoke statements if sqlAuthorization is on
*
* @param conn Connection to use
* @param at10_6 True if the database level is 10.6 or higher
diff --git a/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java b/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
index 0b913ee..c58cd06 100644
--- a/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
+++ b/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
@@ -92,7 +92,7 @@
@param s the input stream for reading statements from.
@param promptDest LocalizedOutput stream to write line
- continuation prompts ("> ") to. If null,
+ continuation prompts ("> ") to. If null,
no such prompts will be written.
*/
public StatementFinder(LocalizedInput s, LocalizedOutput promptDest) {
diff --git a/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java b/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
index 9a3a72f..9b4fdf0 100644
--- a/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
+++ b/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
@@ -1,4 +1,5 @@
/*
+
Derby - Class org.apache.derby.impl.tools.optional.DBMDWrapper
@@ -72,7 +73,7 @@
*
*
* -- now list metadata in a foreign database
- * call setDatabaseURL( 'com.mysql.jdbc.Driver', 'jdbc:mysql://localhost/world?user=root&password=' );
+ * call setDatabaseURL( 'com.mysql.jdbc.Driver', 'jdbc:mysql://localhost/world?user=root&password=' );
*
* select t.table_schem, t.table_name, c.column_name, c.type_name
* from table( getTables( 'WORLD', null, null ) ) t,
