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 [5/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/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java Sun Jul 17 17:11:36 2016
@@ -219,7 +219,7 @@ public class StatementPlanCacheTest exte
/**
* 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.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java Sun Jul 17 17:11:36 2016
@@ -2279,7 +2279,7 @@ public final class TriggerGeneralTest ex
}
/**
- * 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.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Sun Jul 17 17:11:36 2016
@@ -497,7 +497,7 @@ public class UpdatableResultSetTest ext
}
/**
- * 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 @@ public class UpdatableResultSetTest ext
}
/**
- * 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 @@ public class UpdatableResultSetTest ext
}
/**
- * 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 {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java Sun Jul 17 17:11:36 2016
@@ -109,11 +109,11 @@ Source result set:
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 @@ Source result set:
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 @@ Source result set:
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:
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java Sun Jul 17 17:11:36 2016
@@ -129,7 +129,7 @@ abstract class MBeanTest extends BaseJDB
* 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.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java Sun Jul 17 17:11:36 2016
@@ -145,7 +145,7 @@ public class DropWhileConnectingTest
/**
* 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 @@ public class DropWhileConnectingTest
* 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
*/
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java Sun Jul 17 17:11:36 2016
@@ -39,7 +39,7 @@ import org.apache.derbyTesting.junit.Tes
*
* 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java Sun Jul 17 17:11:36 2016
@@ -57,7 +57,7 @@ public class ClobReclamationTest extends
/**
* 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.
*
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java Sun Jul 17 17:11:36 2016
@@ -78,7 +78,7 @@ public class Derby4577Test extends Store
* 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,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java Sun Jul 17 17:11:36 2016
@@ -576,7 +576,7 @@ public class StreamingColumnTest extends
// 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java Sun Jul 17 17:11:36 2016
@@ -371,7 +371,7 @@ public class st_reclaim_longcol extends
/**
* 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.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java Sun Jul 17 17:11:36 2016
@@ -652,7 +652,7 @@ public class Changes10_9 extends Upgrade
/**
* 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 @@ public class Changes10_9 extends Upgrade
/**
* 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));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java Sun Jul 17 17:11:36 2016
@@ -48,7 +48,7 @@ public class T_Authorize
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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java Sun Jul 17 17:11:36 2016
@@ -467,7 +467,7 @@ public abstract class BaseJDBCTestCase
/**
* 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.
*/
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java Sun Jul 17 17:11:36 2016
@@ -84,7 +84,7 @@ public abstract class BaseJDBCTestSetup
/**
* 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()
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Sun Jul 17 17:11:36 2016
@@ -961,7 +961,7 @@ public abstract class BaseTestCase
/**
* 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.
*
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java Sun Jul 17 17:11:36 2016
@@ -1402,7 +1402,7 @@ public class JDBC {
* @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 @@ public class JDBC {
*
* 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,
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java Sun Jul 17 17:11:36 2016
@@ -41,7 +41,7 @@ package org.apache.derbyTesting.junit;
* 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Sun Jul 17 17:11:36 2016
@@ -665,7 +665,7 @@ public final class TestConfiguration {
/**
* 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 @@ public final class TestConfiguration {
/**
* 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 @@ public final class TestConfiguration {
/**
* 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java Sun Jul 17 17:11:36 2016
@@ -30,8 +30,8 @@ import java.sql.Timestamp;
* <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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/District.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/District.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/District.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/District.java Sun Jul 17 17:11:36 2016
@@ -27,7 +27,7 @@ package org.apache.derbyTesting.system.o
* 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Order.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Order.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Order.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Order.java Sun Jul 17 17:11:36 2016
@@ -28,9 +28,9 @@ import java.sql.Timestamp;
* 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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java Sun Jul 17 17:11:36 2016
@@ -511,7 +511,7 @@ public class T_LockFactory extends T_Mul
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.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java Sun Jul 17 17:11:36 2016
@@ -6455,7 +6455,7 @@ public class T_RawStoreFactory extends T
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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java Sun Jul 17 17:11:36 2016
@@ -149,7 +149,7 @@ public class T_Recovery extends T_Generi
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 @@ public class T_Recovery extends T_Generi
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
*/
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java Sun Jul 17 17:11:36 2016
@@ -34,7 +34,7 @@ import org.apache.derby.tools.dblook;
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
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java Sun Jul 17 17:11:36 2016
@@ -92,7 +92,7 @@ public class StatementFinder {
@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) {
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java Sun Jul 17 17:11:36 2016
@@ -1,4 +1,5 @@
/*
+
Derby - Class org.apache.derby.impl.tools.optional.DBMDWrapper
@@ -72,7 +73,7 @@ import org.apache.derby.iapi.sql.diction
*
*
* -- 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,