You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2016/07/17 17:11:39 UTC
svn commit: r1753091 [3/5] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ client/org/apache/derby/client/net/
drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/
drda/org/apache/derby/mbeans/drda/ engine/org/apache/derby/ca...
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java Sun Jul 17 17:11:36 2016
@@ -477,11 +477,11 @@ public final class SQLSmallint
}
/**
- * 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 @@ public final class SQLSmallint
}
/**
- * 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 @@ public final class SQLSmallint
}
/**
- * 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 @@ public final class SQLSmallint
}
/**
- * 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 @@ public final class SQLSmallint
}
/**
- * 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java Sun Jul 17 17:11:36 2016
@@ -381,7 +381,7 @@ public final class SQLTime extends DataT
*<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 @@ public final class SQLTime extends DataT
*<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 @@ public final class SQLTime extends DataT
}
/**
* 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 @@ public final class SQLTime extends DataT
/**
* 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
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java Sun Jul 17 17:11:36 2016
@@ -880,7 +880,7 @@ public final class SQLTimestamp extends
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 @@ public final class SQLTimestamp extends
/**
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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java Sun Jul 17 17:11:36 2016
@@ -483,11 +483,11 @@ public final class SQLTinyint
}
/**
- * 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 @@ public final class SQLTinyint
}
/**
- * 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 @@ public final class SQLTinyint
}
/**
- * 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 @@ public final class SQLTinyint
}
/**
- * 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 @@ public final class SQLTinyint
}
/**
- * 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java Sun Jul 17 17:11:36 2016
@@ -526,11 +526,11 @@ public class UserType extends DataType
}
/**
- * 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java Sun Jul 17 17:11:36 2016
@@ -214,12 +214,12 @@ public abstract class IdUtil
* 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:
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java Sun Jul 17 17:11:36 2016
@@ -70,10 +70,10 @@ public class StringUtil
| 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 @@ public class StringUtil
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.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java Sun Jul 17 17:11:36 2016
@@ -605,7 +605,7 @@ final class EmbedBlob extends Connection
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java Sun Jul 17 17:11:36 2016
@@ -789,7 +789,7 @@ public class EmbedCallableStatement exte
/**
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Sun Jul 17 17:11:36 2016
@@ -1449,20 +1449,20 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
* 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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
* 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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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 @@ public class EmbedDatabaseMetaData exten
* <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 @@ public class EmbedDatabaseMetaData exten
*
* <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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Sun Jul 17 17:11:36 2016
@@ -2293,7 +2293,7 @@ public class EmbedResultSet extends Conn
* @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 {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java Sun Jul 17 17:11:36 2016
@@ -841,7 +841,7 @@ public class EmbedStatement extends Conn
* 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 @@ public class EmbedStatement extends Conn
*
* @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();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java Sun Jul 17 17:11:36 2016
@@ -88,7 +88,7 @@ import java.sql.SQLException;
* | V V | |
*|========================| |=================| |=================|
*| EmbedConnection | | EmbedConnection | | EmbedConnection |
- *| |<-----| |<-----| |
+ *| |<-----| |<-----| |
*| (DetachableConnection) | | ProxyConnection | | ProxyConnection |
*|========================| |=================| |=================|
* ^ | ^ ^ ^
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java Sun Jul 17 17:11:36 2016
@@ -45,7 +45,7 @@ import java.sql.SQLException;
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java Sun Jul 17 17:11:36 2016
@@ -116,7 +116,7 @@ public class Import extends ImportAbstra
* @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 @@ public class Import extends ImportAbstra
* @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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java Sun Jul 17 17:11:36 2016
@@ -102,7 +102,7 @@ class LoadError {
/**
- 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(
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java Sun Jul 17 17:11:36 2016
@@ -82,7 +82,7 @@ import java.util.Hashtable;
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 @@ import java.util.Hashtable;
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>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java Sun Jul 17 17:11:36 2016
@@ -934,7 +934,7 @@ class BCMethod implements MethodBuilder
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 @@ class BCMethod implements MethodBuilder
/**
Create an array instance
- Stack ... =>
+ Stack ... =>
...,arrayref
*/
public void pushNewArray(String className, int size) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java Sun Jul 17 17:11:36 2016
@@ -1146,7 +1146,7 @@ final class CodeChunk {
* 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 @@ final class CodeChunk {
* 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.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java Sun Jul 17 17:11:36 2016
@@ -53,14 +53,14 @@ import org.apache.derby.shared.common.sa
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 @@ because the then code is larger than 327
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 @@ the code is:
then code
goto_w end: // skip else
eb:
- else code (> 32767 bytes)
+ else code (> 32767 bytes)
end:
</code>
@@ -97,10 +97,10 @@ for this is the same as when both the th
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>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java Sun Jul 17 17:11:36 2016
@@ -1416,7 +1416,7 @@ public class IndexStatisticsDaemonImpl
* @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)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java Sun Jul 17 17:11:36 2016
@@ -94,7 +94,7 @@ public final class ActiveLock extends Lo
/**
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.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java Sun Jul 17 17:11:36 2016
@@ -160,7 +160,7 @@ public class RollingFileStream extends O
* @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
*
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Sun Jul 17 17:11:36 2016
@@ -727,16 +727,16 @@ public class DD_Version implements Forma
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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java Sun Jul 17 17:11:36 2016
@@ -406,7 +406,7 @@ class TabInfoImpl
*
* @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 @@ class TabInfoImpl
* @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 @@ class TabInfoImpl
@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 @@ class TabInfoImpl
* 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)
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java Sun Jul 17 17:11:36 2016
@@ -31,7 +31,7 @@ import org.apache.derby.iapi.types.TypeI
/**
* This node is the superclass for all binary comparison operators, such as =,
- * <>, <, etc.
+ * <>, <, etc.
*
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java Sun Jul 17 17:11:36 2016
@@ -39,7 +39,7 @@ import org.apache.derby.iapi.util.JBitSe
/**
* 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 @@ class BinaryOperatorNode extends Operato
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.
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java Sun Jul 17 17:11:36 2016
@@ -486,7 +486,7 @@ public class CursorNode extends DMLState
* <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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java Sun Jul 17 17:11:36 2016
@@ -308,7 +308,7 @@ abstract class DMLModStatementNode exten
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.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Sun Jul 17 17:11:36 2016
@@ -4345,7 +4345,7 @@ class FromBaseTable extends FromTable
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java Sun Jul 17 17:11:36 2016
@@ -475,7 +475,7 @@ class FromList extends QueryTreeNodeV
*
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Sun Jul 17 17:11:36 2016
@@ -90,7 +90,7 @@ abstract class FromTable extends ResultS
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.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Sun Jul 17 17:11:36 2016
@@ -63,7 +63,7 @@ import org.apache.derby.impl.sql.execute
* 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 @@ class GroupByNode extends SingleChildRes
</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>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java Sun Jul 17 17:11:36 2016
@@ -39,8 +39,8 @@ import org.apache.derby.iapi.types.TypeI
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 @@ import org.apache.derby.iapi.types.TypeI
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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java Sun Jul 17 17:11:36 2016
@@ -160,11 +160,11 @@ class ModifyColumnNode extends ColumnDef
* 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.
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java Sun Jul 17 17:11:36 2016
@@ -1099,7 +1099,7 @@ class OptimizerImpl implements Optimizer
* 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
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java Sun Jul 17 17:11:36 2016
@@ -45,7 +45,7 @@ class OrderByColumn extends OrderedColum
/**
* 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;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java Sun Jul 17 17:11:36 2016
@@ -1015,13 +1015,13 @@ public final class Predicate extends Que
* | / \
* 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