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 km...@apache.org on 2005/11/10 05:42:08 UTC
svn commit: r332222 - in /db/derby/code/trunk: ./
java/drda/org/apache/derby/impl/drda/
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/
java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/
Author: kmarsden
Date: Wed Nov 9 20:42:01 2005
New Revision: 332222
URL: http://svn.apache.org/viewcvs?rev=332222&view=rev
Log:
DERBY-569 Derby network server is printing connection activity on System.out instead of logging it to derby.log
This patch changes derby.drda.logConnections also turn off logging of connections to console.
Contributed by Bryan Pendleton
Modified:
db/derby/code/trunk/CHANGES
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/NSinSameJVM.out
Modified: db/derby/code/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/CHANGES?rev=332222&r1=332221&r2=332222&view=diff
==============================================================================
--- db/derby/code/trunk/CHANGES (original)
+++ db/derby/code/trunk/CHANGES Wed Nov 9 20:42:01 2005
@@ -1,111 +1,5 @@
-Changes in Derby 10.0.2.1
+Changes in Derby 10.2
- *) For Network Server, clear back to appropriate point if
- query fails instead of clearing buffer. (Derby-5)
- [Army Brown <ar...@golux.com>]
-
- *) Enable use of functions in triggers (Derby-6)
- [Jack Klebanoff <kl...@mutagen.net>]
-
- *) Triggers do not evaluate functions in VALUES trigger actions. (Derby-14)
-
- *) Method calls on a closed Connection from a PooledConnection no
- longer cause connection closed events to be sent to any listeners.
- Minor clean up of BrokeredConnection as well, remove an unused
- constructor, make the control field final and remove incorrect
- comment and unused imports. (Derby-24)
- [Dan Debrunner <dj...@debrunners.com>]
-
- *) Connection.close() on a closed connection is defined by JDBC
- javadoc to be a no-op. (Derby-30)
- [Dan Debrunner]
-
- *) Multiple jvms prevented from booting the same database in parallel
- to avoid accidental corruptions in Unix environments. (Derby-32)
- [Suresh Thalamati <ts...@source-zone.org>]
-
- *) Allow default to be specified for CHAR FOR BIT DATA columns
- (Derby-34)
- [Satheesh Bandaram <sa...@sourcery.org>]
-
- *) Fix dss chaining problems for network server. (Derby-35)
- [Army Brown]
-
- *) LOCKS is no longer a reserved keyword (Derby-38)
- [Mamta Satoor <ma...@remulak.net>]
-
- *) Allow BIGINT default values in create table. (Derby-40)
- [Satheesh Bandaram]
-
- *) Encryption key length no longer stored in
- service.properties. (Derby-42)
- [Sunitha Kambhampati <sk...@Yngvi.Org>]
-
- *) Enable LIKE ? ESCAPE ? syntax that was disabled before (Derby-44)
- [Satheesh Bandaram]
-
- *) Allow expressions that result in string types as arguments to a
- LIKE expression (Derby-45)
- [Satheesh Bandaram]
-
- *) Make RETAIN a non-reserved keyword (Derby-54)
- [Satheesh Bandaram]
-
- *) Faster create database by moving DatabaseMetaData SPS creation
- into the DataDictionary. Means creation of these statements is not
- logged and compilation is delayed until the matching
- DatabaseMetaData method is first called.
- [Dan Debrunner]
-
- *) dblook argument handling has been improved. Bad arguments now
- generate an error, and connection URLs in quotes are handled
- properly.
- [Jalud Abdulmenan <te...@rogers.com>]
-
- *) Localization of dblook messages enabled.
- [Satheesh Bandaram]
-
- *) Extension Packaging:
- 1. The monitor is changed to read multiple module.properties
- files, using method ClassLoader.getSystemResources.
- 2. The monitor reads sub-sub-protocol properties from the
- modules.properties files, instead of just the system
- properties.
- 3. Sub-sub-protocol property values can name either a
- StorageFactory or a PersistentService
- implementation. Previously it could only name a
- StorageFactory implementation.
- [Jack Klebanoff]
-
- *) Latent bug fixed in
- org.apache.derby.impl.store.access.sort.ExternalSortFactory. Its
- canSupport method throws an exception if it is called with a null
- startParams argument.
- [Jack Klebanoff]
-
- *) Prevent empty log switches by rechecking the conditions that
- trigger the log switched in synchronized blocks, and make backward
- scans skip the empty log files. In multi-threaded application when
- many threads are executing commits in parallel, empty log files
- might be created. Recovery log scan does not expect empty log
- files while scanning log records to undo incomplete transactions.
- [Suresh Thalamati]
-
- *) Add derby.war file
- [Kathey Marsden <km...@sourcery.org>]
-
- *) Fix display of NetServlet messages.
- [Lynh Nguyen <ly...@remulak.net>]
-
- *) Database Metadata now returns correct size for maximum column name
- length, maximum schema name length, etc.
- [Satheesh Bandaram]
-
- *) Add static property derby.drda.keepAlive to Network Server, to set
- the use of TCP keepalive for Network Server connections on the
- server side, with the use of keepalive on by default.
- [Kathey Marsden]
-
- *) Ensure BrokeredStatement and PreparedStatement always throw a
- Statement is closed exception if the statement is closed.
- [Dan Debrunner]
+ *) The Network Server no longer prints the message "Connection Number: N"
+ to the console unless derby.drda.logConnections is set to true (DERBY-569)
+ [ Bryan Pendleton ]
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=332222&r1=332221&r2=332222&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Wed Nov 9 20:42:01 2005
@@ -82,7 +82,8 @@
} // end priv try/catch block
connNum = parent.getNewConnNum();
- parent.consolePropertyMessage("DRDA_ConnNumber.I",
+ if (parent.getLogConnections())
+ parent.consolePropertyMessage("DRDA_ConnNumber.I",
Integer.toString(connNum));
//create a new Session for this session
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out?rev=332222&r1=332221&r2=332222&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/NSinSameJVM.out Wed Nov 9 20:42:01 2005
@@ -1,9 +1,6 @@
main-NSinSameJVM: Derby drivers loaded
Server is ready to accept connections on port 20000.
-Connection number: 1.
main-NSinSameJVM: NetworkServer started
-Connection number: 2.
main-NSinSameJVM: Connected to database NSinSameJVMTestDB;create=true
getting ready to shutdown
-Connection number: 3.
Shutdown successful.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/NSinSameJVM.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/NSinSameJVM.out?rev=332222&r1=332221&r2=332222&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/NSinSameJVM.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/NSinSameJVM.out Wed Nov 9 20:42:01 2005
@@ -1,9 +1,6 @@
main-NSinSameJVM: Derby drivers loaded
Server is ready to accept connections on port 20000.
-Connection number: 1.
main-NSinSameJVM: NetworkServer started
-Connection number: 2.
main-NSinSameJVM: Connected to database NSinSameJVMTestDB;create=true
getting ready to shutdown
-Connection number: 3.
Shutdown successful.