db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scott hutinger <s-hutin...@wiu.edu>
Subject Re: svn commit: r109470 - incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook
Date Fri, 03 Dec 2004 07:19:42 GMT
Hmm, I think probably it best if I email compressed patches.  It could 
be that the hunk failed due to a conflict; I would have to look at the 
DB_View.java log to see for sure.  I figured since no ^M's where in the 
file, then they couldn't be stripped.  But what OS were you patching 
with?  Normally I don't have abnormal program termination's with a patch 
that I can ever remember. 

I'm a bit uncertain why the abnormal program termination happened, but 
normally when a hunk fails, one can change the fuzzy value (in cvs I 
forgot), but the patch is corrupt, or the patch already exists.  
Probably some other reasons that I don't know about.  But if the patch 
exists, you should get the following:

patching file java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
Reversed (or previously applied) patch detected!  Assume -R? [n]

not:
Assertion failed: hunk, file patch.c, line 321

abnormal program termination

But, if you are using:
http://lists.gnu.org/archive/html/bug-gnu-utils/2003-07/msg00267.html
then it might be a patch file that doesn't have the correct eol's, or 
some other reason?
http://svn.haxx.se/dev/archive-2003-09/0944.shtml
has the same type of problem.  I used svn of:
[srh@scott ~]$ svn --version
svn, version 1.1.1 (r11581)
   compiled Nov 11 2004, 11:51:04

I did a diff of the original patch and the patch from e-mail, and I had 
no difference.

Anyway, if you want to take it off-line and figure out what's going on, 
please let me know.



From:
[srhs-Computer:~/Desktop/derby/trunk] srh% svn diff -rPREV 
java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
Index: java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/dblook/DB_View.java  
(revision 109469)
+++ java/tools/org/apache/derby/impl/tools/dblook/DB_View.java  (working 
copy)
@@ -59,7 +59,7 @@
 
                        if (firstTime) {
                                
Logs.reportString("----------------------------------------------");
-                               Logs.reportMessage("CSLOOK_ViewsHeader");
+                               Logs.reportMessage("DBLOOK_ViewsHeader");
                                
Logs.reportString("----------------------------------------------\n");
                        }
 
@@ -82,7 +82,7 @@
 
                // Set schema back to default ("APP").
                if (!firstTime) {
-                       Logs.reportMessage("CSLOOK_DefaultSchema");
+                       Logs.reportMessage("DBLOOK_DefaultSchema");
                        Logs.writeToNewDDL("SET SCHEMA \"APP\"");
                        Logs.writeStmtEndToNewDDL();
                        Logs.writeNewlineToNewDDL();

scott


Satheesh Bandaram wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>  
> I tried to apply this patch, but it failed.
>
> patching file `java/tools/org/apache/derby/impl/tools/dblook/DB_View.java'
> Assertion failed: hunk, file patch.c, line 321
>
> abnormal program termination
>
> Not sure why...
>
> Satheesh
>
> scott hutinger wrote:
>
> > fuzzylogic@apache.org wrote:
> >
> >> Author: fuzzylogic
> >> Date: Wed Dec  1 23:44:03 2004
> >> New Revision: 109470
> >>
> >> URL: http://svn.apache.org/viewcvs?view=rev&rev=109470
> >> Log:
> >> Fix message names in dblook
> >>
> >> Modified:
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
> >>   
> incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/Logs.java
> >>  
> >>
> > <snip>
> >
> > 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.?
> >
> > scott
> >
> >
> >-------------------------
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_View.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_View.java    
> (working copy)
> >@@ -59,7 +59,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_ViewsHeader");
> >+                Logs.reportMessage("DBLOOK_ViewsHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >@@ -82,7 +82,7 @@
> >
> >         // Set schema back to default ("APP").
> >         if (!firstTime) {
> >-            Logs.reportMessage("CSLOOK_DefaultSchema");
> >+            Logs.reportMessage("DBLOOK_DefaultSchema");
> >             Logs.writeToNewDDL("SET SCHEMA \"APP\"");
> >             Logs.writeStmtEndToNewDDL();
> >             Logs.writeNewlineToNewDDL();
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java    
> (working copy)
> >@@ -68,8 +68,8 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_JarsHeader");
> >-                Logs.reportMessage("CSLOOK_Jar_Note");
> >+                Logs.reportMessage("DBLOOK_JarsHeader");
> >+                Logs.reportMessage("DBLOOK_Jar_Note");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >@@ -119,7 +119,7 @@
> >                 oldJarFile.close();
> >
> >             } catch (Exception e) {
> >-                Logs.debug("CSLOOK_FailedToLoadJar",
> >+                Logs.debug("DBLOOK_FailedToLoadJar",
> >                     absJarDir + jarFullName.toString());
> >                 Logs.debug(e);
> >                 firstTime = false;
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java    
> (working copy)
> >@@ -63,7 +63,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_ChecksHeader");
> >+                Logs.reportMessage("DBLOOK_ChecksHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/Logs.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/Logs.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/Logs.java    
> (working copy)
> >@@ -291,7 +291,7 @@
> >         try {
> >             if (atLeastOneDebug)
> >                 dblook.writeVerboseOutput(
> >-                    "CSLOOK_AtLeastOneDebug", null);
> >+                    "DBLOOK_AtLeastOneDebug", null);
> >             logFile.close();
> >             if (ddlFile != null)
> >                 ddlFile.close();
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java    
> (working copy)
> >@@ -64,7 +64,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_SchemasHeader");
> >+                Logs.reportMessage("DBLOOK_SchemasHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java    
> (working copy)
> >@@ -74,7 +74,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_TriggersHeader");
> >+                Logs.reportMessage("DBLOOK_TriggersHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java    
> (working copy)
> >@@ -73,7 +73,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_IndexesHeader");
> >+                Logs.reportMessage("DBLOOK_IndexesHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java    
> (working copy)
> >@@ -86,7 +86,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_TablesHeader");
> >+                Logs.reportMessage("DBLOOK_TablesHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
> >===================================================================
> >--- java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java    
> (revision 109469)
> >+++ java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java    
> (working copy)
> >@@ -111,9 +111,9 @@
> >             if (firstTime) {
> >                 printHeader();
> >                 if (rs.getString(2).equals("F"))
> >-                    Logs.reportMessage("CSLOOK_ForeignHeader");
> >+                    Logs.reportMessage("DBLOOK_ForeignHeader");
> >                 else
> >-                    Logs.reportMessage("CSLOOK_PrimUniqueHeader");
> >+                    Logs.reportMessage("DBLOOK_PrimUniqueHeader");
> >             }
> >
> >             StringBuffer kString = createKeyString(tableId, 
> tableName, rs);
> >@@ -261,7 +261,7 @@
> >             return;
> >
> >         
> Logs.reportString("----------------------------------------------");
> >-        Logs.reportMessage("CSLOOK_KeysHeader");
> >+        Logs.reportMessage("DBLOOK_KeysHeader");
> >         
> Logs.reportString("----------------------------------------------\n");
> >         printedHeader = true;
> >
> >Index: 
> java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java
> >===================================================================
> >--- 
> java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java    
> (revision 109469)
> >+++ 
> java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java    
> (working copy)
> >@@ -76,7 +76,7 @@
> >
> >             if (firstTime) {
> >                 
> Logs.reportString("----------------------------------------------");
> >-                Logs.reportMessage("CSLOOK_StoredProcHeader");
> >+                Logs.reportMessage("DBLOOK_StoredProcHeader");
> >                 
> Logs.reportString("----------------------------------------------\n");
> >             }
> >
> >Index: 
> java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
> >===================================================================
> >--- 
> java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java    
> (revision 109503)
> >+++ 
> java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java    
> (working copy)
> >@@ -1727,7 +1727,7 @@
> >             synchronized (this) {
> >
> >                 if (inShutdown) {
> >-                    throw 
> StandardException.newException(SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);
> >+                    throw 
> StandardException.newException(SQLState.DERBY_SYSTEM_SHUTDOWN);
> >                 }
> >
> >                 for (int i = 1; i < services.size(); i++) {
> >Index: java/engine/org/apache/derby/jdbc/Driver169.java
> >===================================================================
> >--- java/engine/org/apache/derby/jdbc/Driver169.java    (revision 109503)
> >+++ java/engine/org/apache/derby/jdbc/Driver169.java    (working copy)
> >@@ -168,7 +168,7 @@
> >
> >                     Monitor.getMonitor().shutdown();
> >                     throw Util.generateCsSQLException(
> >-                                         
> SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);
> >+                                         
> SQLState.DERBY_SYSTEM_SHUTDOWN);
> >                 }
> >             }
> >             
> >Index: java/engine/org/apache/derby/jdbc/Driver20.java
> >===================================================================
> >--- java/engine/org/apache/derby/jdbc/Driver20.java    (revision 109503)
> >+++ java/engine/org/apache/derby/jdbc/Driver20.java    (working copy)
> >@@ -227,7 +227,7 @@
> >             };
> >
> >             String[][] connBooleanAttributes = {
> >-                {Attribute.SHUTDOWN_ATTR, 
> MessageId.CONN_SHUT_DOWN_CLOUDSCAPE},
> >+                {Attribute.SHUTDOWN_ATTR, 
> MessageId.CONN_SHUT_DOWN_DERBY},
> >                 {Attribute.CREATE_ATTR, MessageId.CONN_CREATE_DATABASE},
> >                 {Attribute.DATA_ENCRYPTION, 
> MessageId.CONN_DATA_ENCRYPTION},
> >                 {Attribute.UPGRADE_ATTR, 
> MessageId.CONN_UPGRADE_DATABASE},
> >Index: java/engine/org/apache/derby/iapi/reference/SQLState.java
> >===================================================================
> >--- java/engine/org/apache/derby/iapi/reference/SQLState.java    
> (revision 109503)
> >+++ java/engine/org/apache/derby/iapi/reference/SQLState.java    
> (working copy)
> >@@ -1404,7 +1404,7 @@
> >     String NORMAL_CLOSE = "XXXXX.C.6";
> >
> >     //following are system severity.
> >-    String CLOUDSCAPE_SYSTEM_SHUTDOWN = "XJ015.M";
> >+    String DERBY_SYSTEM_SHUTDOWN = "XJ015.M";
> >
> >     //following are warning severity.
> >     String DATABASE_EXISTS = "01J01";
> >Index: java/engine/org/apache/derby/iapi/reference/MessageId.java
> >===================================================================
> >--- java/engine/org/apache/derby/iapi/reference/MessageId.java    
> (revision 109503)
> >+++ java/engine/org/apache/derby/iapi/reference/MessageId.java    
> (working copy)
> >@@ -94,7 +94,7 @@
> >     ** Connectivity
> >     */
> >     String CONN_DATABASE_IDENTITY            = "J004"; // database 
> identity
> >-    String CONN_SHUT_DOWN_CLOUDSCAPE        = "J005"; // shut down 
> Cloudscape
> >+    String CONN_SHUT_DOWN_DERBY            = "J005"; // shut down Derby
> >     String CONN_CREATE_DATABASE                = "J007"; // create 
> database
> >     String CONN_NO_DETAILS                    = "J008"; // no details
> >     String CONN_SPS_INSTALLER                = "J009"; // 
> unexepected exception while loading JDBC ...
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (MingW32)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
>  
> iD8DBQFBr8RRENVNIY6DZ7ERAuVXAJ9U2+tbM8nZZIN+FjF4/xqT4IQi1ACffBcu
> QtcV9r0+gp4SGQPPbp/oOkQ=
> =itFN
> -----END PGP SIGNATURE-----
>


Mime
View raw message