db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Satheesh Bandaram <sathe...@Sourcery.Org>
Subject Re: svn commit: r109470 - incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook
Date Fri, 03 Dec 2004 01:41:37 GMT
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=UTF-8" http-equiv="Content-Type">
  <title></title>
</head>
<body bgcolor="#ffffff" text="#000000">
-----BEGIN PGP SIGNED MESSAGE----- <br>
Hash: SHA1 <br>
 <br>
I tried to apply this patch, but it failed.<br>
<br>
patching file
`java/tools/org/apache/derby/impl/tools/dblook/DB_View.java'<br>
Assertion failed: hunk, file patch.c, line 321<br>
<br>
abnormal program termination<br>
<br>
Not sure why...<br>
<br>
Satheesh<br>
<br>
scott hutinger wrote:<br>
<br>
&gt; <a class="moz-txt-link-abbreviated" href="mailto:fuzzylogic@apache.org">fuzzylogic@apache.org</a>
wrote:<br>
&gt;<br>
&gt;&gt; Author: fuzzylogic<br>
&gt;&gt; Date: Wed Dec  1 23:44:03 2004<br>
&gt;&gt; New Revision: 109470<br>
&gt;&gt;<br>
&gt;&gt; URL: <a class="moz-txt-link-freetext" href="http://svn.apache.org/viewcvs?view=rev&rev=109470">http://svn.apache.org/viewcvs?view=rev&amp;rev=109470</a><br>
&gt;&gt; Log:<br>
&gt;&gt; Fix message names in dblook<br>
&gt;&gt;<br>
&gt;&gt; Modified:<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_View.java<br>
&gt;&gt;  
incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/Logs.java<br>
&gt;&gt;  <br>
&gt;&gt;<br>
&gt; &lt;snip&gt;<br>
&gt;<br>
&gt; I was going to do a clean sweep of the entire code base. 
Currently I am busy till friday, but did start yesterday a bit.  I
wouldn't use this, as I haven't verified anything at all.  But figured
if you were doing this, possibly some of the patch might help.  I also
didn't see any conflicts, but wasn't sure about your check-ins and what
I started.  Also, I would guess it would be better to do the sweep in
smaller chunks rather than one large patch.?<br>
&gt;<br>
&gt; scott<br>
&gt;<br>
&gt;<br>
&gt;-------------------------<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_View.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_View.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_View.java   
(working copy)<br>
&gt;@@ -59,7 +59,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_ViewsHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_ViewsHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;@@ -82,7 +82,7 @@<br>
&gt;<br>
&gt;         // Set schema back to default ("APP").<br>
&gt;         if (!firstTime) {<br>
&gt;-            Logs.reportMessage("CSLOOK_DefaultSchema");<br>
&gt;+            Logs.reportMessage("DBLOOK_DefaultSchema");<br>
&gt;             Logs.writeToNewDDL("SET SCHEMA \"APP\"");<br>
&gt;             Logs.writeStmtEndToNewDDL();<br>
&gt;             Logs.writeNewlineToNewDDL();<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java   
(working copy)<br>
&gt;@@ -68,8 +68,8 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_JarsHeader");<br>
&gt;-                Logs.reportMessage("CSLOOK_Jar_Note");<br>
&gt;+                Logs.reportMessage("DBLOOK_JarsHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_Jar_Note");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;@@ -119,7 +119,7 @@<br>
&gt;                 oldJarFile.close();<br>
&gt;<br>
&gt;             } catch (Exception e) {<br>
&gt;-                Logs.debug("CSLOOK_FailedToLoadJar",<br>
&gt;+                Logs.debug("DBLOOK_FailedToLoadJar",<br>
&gt;                     absJarDir + jarFullName.toString());<br>
&gt;                 Logs.debug(e);<br>
&gt;                 firstTime = false;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java   
(working copy)<br>
&gt;@@ -63,7 +63,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_ChecksHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_ChecksHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/Logs.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/Logs.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/Logs.java   
(working copy)<br>
&gt;@@ -291,7 +291,7 @@<br>
&gt;         try {<br>
&gt;             if (atLeastOneDebug)<br>
&gt;                 dblook.writeVerboseOutput(<br>
&gt;-                    "CSLOOK_AtLeastOneDebug", null);<br>
&gt;+                    "DBLOOK_AtLeastOneDebug", null);<br>
&gt;             logFile.close();<br>
&gt;             if (ddlFile != null)<br>
&gt;                 ddlFile.close();<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java   
(working copy)<br>
&gt;@@ -64,7 +64,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_SchemasHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_SchemasHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java<br>
&gt;===================================================================<br>
&gt;---
java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java   
(revision 109469)<br>
&gt;+++
java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java   
(working copy)<br>
&gt;@@ -74,7 +74,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_TriggersHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_TriggersHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java   
(working copy)<br>
&gt;@@ -73,7 +73,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_IndexesHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_IndexesHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java   
(working copy)<br>
&gt;@@ -86,7 +86,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_TablesHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_TablesHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java<br>
&gt;===================================================================<br>
&gt;--- java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java   
(revision 109469)<br>
&gt;+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java   
(working copy)<br>
&gt;@@ -111,9 +111,9 @@<br>
&gt;             if (firstTime) {<br>
&gt;                 printHeader();<br>
&gt;                 if (rs.getString(2).equals("F"))<br>
&gt;-                    Logs.reportMessage("CSLOOK_ForeignHeader");<br>
&gt;+                    Logs.reportMessage("DBLOOK_ForeignHeader");<br>
&gt;                 else<br>
&gt;-                    Logs.reportMessage("CSLOOK_PrimUniqueHeader");<br>
&gt;+                    Logs.reportMessage("DBLOOK_PrimUniqueHeader");<br>
&gt;             }<br>
&gt;<br>
&gt;             StringBuffer kString = createKeyString(tableId,
tableName, rs);<br>
&gt;@@ -261,7 +261,7 @@<br>
&gt;             return;<br>
&gt;<br>
&gt;        
Logs.reportString("----------------------------------------------");<br>
&gt;-        Logs.reportMessage("CSLOOK_KeysHeader");<br>
&gt;+        Logs.reportMessage("DBLOOK_KeysHeader");<br>
&gt;        
Logs.reportString("----------------------------------------------\n");<br>
&gt;         printedHeader = true;<br>
&gt;<br>
&gt;Index:
java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java<br>
&gt;===================================================================<br>
&gt;---
java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java   
(revision 109469)<br>
&gt;+++
java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java   
(working copy)<br>
&gt;@@ -76,7 +76,7 @@<br>
&gt;<br>
&gt;             if (firstTime) {<br>
&gt;                
Logs.reportString("----------------------------------------------");<br>
&gt;-                Logs.reportMessage("CSLOOK_StoredProcHeader");<br>
&gt;+                Logs.reportMessage("DBLOOK_StoredProcHeader");<br>
&gt;                
Logs.reportString("----------------------------------------------\n");<br>
&gt;             }<br>
&gt;<br>
&gt;Index:
java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java<br>
&gt;===================================================================<br>
&gt;---
java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java   
(revision 109503)<br>
&gt;+++
java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java   
(working copy)<br>
&gt;@@ -1727,7 +1727,7 @@<br>
&gt;             synchronized (this) {<br>
&gt;<br>
&gt;                 if (inShutdown) {<br>
&gt;-                    throw
StandardException.newException(SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);<br>
&gt;+                    throw
StandardException.newException(SQLState.DERBY_SYSTEM_SHUTDOWN);<br>
&gt;                 }<br>
&gt;<br>
&gt;                 for (int i = 1; i &lt; services.size(); i++)
{<br>
&gt;Index: java/engine/org/apache/derby/jdbc/Driver169.java<br>
&gt;===================================================================<br>
&gt;--- java/engine/org/apache/derby/jdbc/Driver169.java    (revision
109503)<br>
&gt;+++ java/engine/org/apache/derby/jdbc/Driver169.java    (working
copy)<br>
&gt;@@ -168,7 +168,7 @@<br>
&gt;<br>
&gt;                     Monitor.getMonitor().shutdown();<br>
&gt;                     throw Util.generateCsSQLException(<br>
&gt;-                                        
SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);<br>
&gt;+                                        
SQLState.DERBY_SYSTEM_SHUTDOWN);<br>
&gt;                 }<br>
&gt;             }<br>
&gt;             <br>
&gt;Index: java/engine/org/apache/derby/jdbc/Driver20.java<br>
&gt;===================================================================<br>
&gt;--- java/engine/org/apache/derby/jdbc/Driver20.java    (revision
109503)<br>
&gt;+++ java/engine/org/apache/derby/jdbc/Driver20.java    (working
copy)<br>
&gt;@@ -227,7 +227,7 @@<br>
&gt;             };<br>
&gt;<br>
&gt;             String[][] connBooleanAttributes = {<br>
&gt;-                {Attribute.SHUTDOWN_ATTR,
MessageId.CONN_SHUT_DOWN_CLOUDSCAPE},<br>
&gt;+                {Attribute.SHUTDOWN_ATTR,
MessageId.CONN_SHUT_DOWN_DERBY},<br>
&gt;                 {Attribute.CREATE_ATTR,
MessageId.CONN_CREATE_DATABASE},<br>
&gt;                 {Attribute.DATA_ENCRYPTION,
MessageId.CONN_DATA_ENCRYPTION},<br>
&gt;                 {Attribute.UPGRADE_ATTR,
MessageId.CONN_UPGRADE_DATABASE},<br>
&gt;Index: java/engine/org/apache/derby/iapi/reference/SQLState.java<br>
&gt;===================================================================<br>
&gt;--- java/engine/org/apache/derby/iapi/reference/SQLState.java   
(revision 109503)<br>
&gt;+++ java/engine/org/apache/derby/iapi/reference/SQLState.java   
(working copy)<br>
&gt;@@ -1404,7 +1404,7 @@<br>
&gt;     String NORMAL_CLOSE = "XXXXX.C.6";<br>
&gt;<br>
&gt;     //following are system severity.<br>
&gt;-    String CLOUDSCAPE_SYSTEM_SHUTDOWN = "XJ015.M";<br>
&gt;+    String DERBY_SYSTEM_SHUTDOWN = "XJ015.M";<br>
&gt;<br>
&gt;     //following are warning severity.<br>
&gt;     String DATABASE_EXISTS = "01J01";<br>
&gt;Index: java/engine/org/apache/derby/iapi/reference/MessageId.java<br>
&gt;===================================================================<br>
&gt;--- java/engine/org/apache/derby/iapi/reference/MessageId.java   
(revision 109503)<br>
&gt;+++ java/engine/org/apache/derby/iapi/reference/MessageId.java   
(working copy)<br>
&gt;@@ -94,7 +94,7 @@<br>
&gt;     ** Connectivity<br>
&gt;     */<br>
&gt;     String CONN_DATABASE_IDENTITY            = "J004"; // database
identity<br>
&gt;-    String CONN_SHUT_DOWN_CLOUDSCAPE        = "J005"; // shut down
Cloudscape<br>
&gt;+    String CONN_SHUT_DOWN_DERBY            = "J005"; // shut down
Derby<br>
&gt;     String CONN_CREATE_DATABASE                = "J007"; // create
database<br>
&gt;     String CONN_NO_DETAILS                    = "J008"; //
no
details<br>
&gt;     String CONN_SPS_INSTALLER                = "J009"; //
unexepected exception while loading JDBC ...<br>
-----BEGIN PGP SIGNATURE----- <br>
Version: GnuPG v1.2.5 (MingW32) <br>
Comment: Using GnuPG with Thunderbird - <a class="moz-txt-link-freetext" href="http://enigmail.mozdev.org">http://enigmail.mozdev.org</a>
<br>
 <br>
iD8DBQFBr8RRENVNIY6DZ7ERAuVXAJ9U2+tbM8nZZIN+FjF4/xqT4IQi1ACffBcu <br>
QtcV9r0+gp4SGQPPbp/oOkQ= <br>
=itFN <br>
-----END PGP SIGNATURE----- <br>
<br>
</body>
</html>

Mime
View raw message