db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1176633 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ engine/org/apache/derby/impl/sql/execute/rts/ engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionT...
Date Tue, 27 Sep 2011 21:48:50 GMT
Author: dag
Date: Tue Sep 27 21:48:49 2011
New Revision: 1176633

URL: http://svn.apache.org/viewvc?rev=1176633&view=rev
Log:
DERBY-5420 Regression suite appears locale sensitive: failed in TableLockBasicTest: bug in
RealBasicNoPutResultSetStatistics

Patch derby-5420-2 changes the way the localization of the floating
point numbers is done for RealBasicNoPutResultSetStatistics to use an
explicit decimal format in the localized message text itself. When the
double argument is henceforth filled in, the locale is already set
correctly (in MessageBuilder), so the the decimal point/comma will be
chosen correctly according to locale.


Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java Tue Sep 27 21:48:49
2011
@@ -27,13 +27,14 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.xml.parsers.*;
 import org.w3c.dom.*;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
 
 
 /**
@@ -659,14 +660,16 @@ public class MessageBuilder extends Task
     {
         int             count = rawArgs.length;
         String[]    cookedArgs = new String[ count ];
+        MessageFormat format = new MessageFormat(message);
 
         // add xml angle brackets around the args
         for ( int i = 0; i < count; i++ )
         {
             cookedArgs[ i ] = "<varname>&lt;" + rawArgs[ i ] + "&gt;</varname>";
+            format.setFormatByArgumentIndex(i, null); // use plain string format
         }
 
-        return MessageFormat.format( message, cookedArgs );
+        return format.format(cookedArgs);
     }
 
     /////////////////////////////////////////////////////////////////////////

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
Tue Sep 27 21:48:49 2011
@@ -21,26 +21,20 @@
 
 package org.apache.derby.impl.sql.execute.rts;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import org.apache.derby.catalog.UUID;
+import org.apache.derby.iapi.reference.SQLState;
+import org.apache.derby.iapi.services.context.ContextService;
+import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.impl.sql.catalog.XPLAINResultSetDescriptor;
 import org.apache.derby.impl.sql.catalog.XPLAINResultSetTimingsDescriptor;
 import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil;
 
-import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.services.io.Formatable;
-
-import org.apache.derby.iapi.services.i18n.MessageService;
-import org.apache.derby.iapi.reference.SQLState;
-
-import org.apache.derby.iapi.services.io.FormatableHashtable;
-
-import java.util.Vector;
-
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
 
 import java.text.DecimalFormat;
+import java.util.Locale;
+import java.util.Vector;
 
 
 /**
@@ -135,39 +129,11 @@ abstract class RealBasicNoPutResultSetSt
 	protected final String dumpEstimatedCosts(String subIndent)
 	{
 		return	subIndent +
-				MessageService.getTextMessage(SQLState.RTS_OPT_EST_RC) +
-					": " +
-				formatDouble(optimizerEstimatedRowCount) + "\n" +
+            MessageService.getTextMessage(SQLState.RTS_OPT_EST_RC,
+                new Double(optimizerEstimatedRowCount)) + "\n" +
 				subIndent +
-				MessageService.getTextMessage(SQLState.RTS_OPT_EST_COST) +
-					": " +
-				formatDouble(optimizerEstimatedCost) + "\n";
-	}
-
-	/**
-	 * Format a double as a String with leading spaces and two digits
-	 * after the decimal.
-	 */
-	private static DecimalFormat df = null;
-	private String formatDouble(double toFormat)
-	{
-		if (df == null)
-		{
-			// RESOLVE: This really should use the database locale to
-			// format the number.
-			df = new DecimalFormat("###########0.00");
-			df.setMinimumIntegerDigits(1);
-		}
-
-		String retval = df.format(toFormat);
-
-		if (retval.length() < 15)
-		{
-			retval =
-				"               ".substring(0, 15 - retval.length()) + retval;
-		}
-
-		return retval;
+            MessageService.getTextMessage(SQLState.RTS_OPT_EST_COST,
+                 new Double(optimizerEstimatedCost));
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Tue Sep 27 21:48:49
2011
@@ -6428,12 +6428,14 @@ MessageId.java.
 
             <msg>
                 <name>43X07.U</name>
-                <text>optimizer estimated row count</text>
+                <text>optimizer estimated row count: {0,number,###########0.00}</text>
+                <arg>number</arg>
             </msg>
 
             <msg>
                 <name>43X08.U</name>
-                <text>optimizer estimated cost</text>
+                <text>optimizer estimated cost: {0,number,###########0.00}</text>
+                <arg>number</arg>
             </msg>
 
             <msg>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Tue Sep 27
21:48:49 2011
@@ -824,8 +824,8 @@ XSDG8.D=Nelze kop\u00edrovat adres\u00e1
 43X04.U=Po\u010det prohl\u00e9dnut\u00fdch \u0159\u00e1dk\u016f
 43X05.U=Mno\u017eina v\u00fdsledk\u016f zdroje
 43X06.U=Ukon\u010dit poddotazov\u00e1n\u00ed \u010d\u00edsla
-43X07.U=po\u010det \u0159\u00e1dk\u016f odhadnut\u00fd optimaliz\u00e1torem
-43X08.U=n\u00e1klady odhadnut\u00e9 optimaliz\u00e1torem
+43X07.U=po\u010det \u0159\u00e1dk\u016f odhadnut\u00fd optimaliz\u00e1torem: {0,number,###########0.00}
+43X08.U=n\u00e1klady odhadnut\u00e9 optimaliz\u00e1torem: {0,number,###########0.00}
 43X09.U=sekundy
 43X10.U=Celkem
 43X11.U=Uzel

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Tue Sep
27 21:48:49 2011
@@ -512,8 +512,8 @@
 43X04.U=Gesehene Zeilen
 43X05.U=Quellenergebnisliste
 43X06.U=Nummer der letzten Unterabfrage
-43X07.U=Vom Optimizer gesch\u00E4tzte Zeilenzahl
-43X08.U=Vom Optimizer gesch\u00E4tzte Kosten
+43X07.U=Vom Optimizer gesch\u00E4tzte Zeilenzahl: {0,number,###########0.00}
+43X08.U=Vom Optimizer gesch\u00E4tzte Kosten: {0,number,###########0.00}
 43X09.U=Sekunden
 43X10.U=Summe
 43X11.U=Knoten

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Tue Sep 27
21:48:49 2011
@@ -512,8 +512,8 @@
 43X04.U=Filas vistas
 43X05.U=Juego de resultados origen
 43X06.U=Fin de subconsulta n\u00FAmero
-43X07.U=n\u00FAmero de filas estimado por el optimizador
-43X08.U=coste estimado por el optimizador
+43X07.U=n\u00FAmero de filas estimado por el optimizador: {0,number,###########0.00}
+43X08.U=coste estimado por el optimizador: {0,number,###########0.00}
 43X09.U=segundos
 43X10.U=Total
 43X11.U=Nodo

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Tue Sep 27
21:48:49 2011
@@ -512,8 +512,8 @@
 43X04.U=Lignes affich\u00E9es
 43X05.U=Ensemble de r\u00E9sultats source
 43X06.U=Num\u00E9ro de sous-requ\u00EAte de fin
-43X07.U=nombre de lignes estim\u00E9 par l''optimiseur
-43X08.U=co\u00FBt estim\u00E9 par l''optimiseur
+43X07.U=nombre de lignes estim\u00E9 par l''optimiseur: {0,number,###########0.00}
+43X08.U=co\u00FBt estim\u00E9 par l''optimiseur: {0,number,###########0.00}
 43X09.U=secondes
 43X10.U=Total
 43X11.U=Noeud

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Tue Sep 27
21:48:49 2011
@@ -824,8 +824,8 @@ XSDG8.D=Vissza\u00e1ll\u00edt\u00e1s sor
 43X04.U=Megjelen\u00edtett sorok
 43X05.U=Forr\u00e1s eredm\u00e9nyhalmaz
 43X06.U=Befejez\u0151 allek\u00e9rdez\u00e9s sz\u00e1m
-43X07.U=optimaliz\u00e1l\u00f3 becs\u00fclt sorsz\u00e1m
-43X08.U=optimaliz\u00e1l\u00f3 becs\u00fclt k\u00f6lts\u00e9g
+43X07.U=optimaliz\u00e1l\u00f3 becs\u00fclt sorsz\u00e1m: {0,number,###########0.00}
+43X08.U=optimaliz\u00e1l\u00f3 becs\u00fclt k\u00f6lts\u00e9g: {0,number,###########0.00}
 43X09.U=m\u00e1sodperc
 43X10.U=\u00d6sszes
 43X11.U=Csom\u00f3pont

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Tue Sep 27
21:48:49 2011
@@ -512,8 +512,8 @@
 43X04.U=Righe visualizzate
 43X05.U=Insieme dei risultati di origine
 43X06.U=Numero finale query secondaria
-43X07.U=conteggio righe calcolate dal programma di ottimizzazione
-43X08.U=costo calcolato dal programma di ottimizzazione
+43X07.U=conteggio righe calcolate dal programma di ottimizzazione: {0,number,###########0.00}
+43X08.U=costo calcolato dal programma di ottimizzazione: {0,number,###########0.00}
 43X09.U=secondi
 43X10.U=Totale
 43X11.U=Nodo

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Tue Sep
27 21:48:49 2011
@@ -511,8 +511,8 @@
 43X04.U=\u8868\u793A\u6E08\u307F\u884C
 43X05.U=\u30BD\u30FC\u30B9\u7D50\u679C\u30BB\u30C3\u30C8
 43X06.U=\u526F\u7167\u4F1A\u306E\u7D42\u4E86\u756A\u53F7
-43X07.U=\u30AA\u30D7\u30C6\u30A3\u30DE\u30A4\u30B6\u30FC\u898B\u7A4D\u884C\u6570
-43X08.U=\u30AA\u30D7\u30C6\u30A3\u30DE\u30A4\u30B6\u30FC\u898B\u7A4D\u30B3\u30B9\u30C8
+43X07.U=\u30AA\u30D7\u30C6\u30A3\u30DE\u30A4\u30B6\u30FC\u898B\u7A4D\u884C\u6570\: {0,number,###########0.00}
+43X08.U=\u30AA\u30D7\u30C6\u30A3\u30DE\u30A4\u30B6\u30FC\u898B\u7A4D\u30B3\u30B9\u30C8\:
{0,number,###########0.00}
 43X09.U=\u79D2
 43X10.U=\u5408\u8A08
 43X11.U=\u30CE\u30FC\u30C9

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Tue Sep
27 21:48:49 2011
@@ -513,8 +513,8 @@
 43X04.U=\uBCF8 \uD589 \uC218
 43X05.U=\uC18C\uC2A4 \uACB0\uACFC \uC138\uD2B8
 43X06.U=\uC885\uB8CC \uBD80\uC18D \uC870\uD68C \uBC88\uD638
-43X07.U=\uCD5C\uC801\uD654 \uD504\uB85C\uADF8\uB7A8 \uC608\uC0C1 \uD589 \uACC4\uC218
-43X08.U=\uCD5C\uC801\uD654 \uD504\uB85C\uADF8\uB7A8 \uC608\uC0C1 \uBE44\uC6A9
+43X07.U=\uCD5C\uC801\uD654 \uD504\uB85C\uADF8\uB7A8 \uC608\uC0C1 \uD589 \uACC4\uC218\: {0,number,###########0.00}
+43X08.U=\uCD5C\uC801\uD654 \uD504\uB85C\uADF8\uB7A8 \uC608\uC0C1 \uBE44\uC6A9\: {0,number,###########0.00}
 43X09.U=\uCD08
 43X10.U=\uCD1D\uACC4
 43X11.U=\uB178\uB4DC

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Tue Sep 27
21:48:49 2011
@@ -824,8 +824,8 @@ XSDG8.D=Nie mo\u017cna skopiowa\u0107 ka
 43X04.U=Widoczne wiersze
 43X05.U=\u0179r\u00f3d\u0142owa tabela wynikowa
 43X06.U=Ko\u0144cowy numer podzapytania
-43X07.U=liczba wierszy oszacowana przez optymalizator
-43X08.U=koszt oszacowany przez optymalizator
+43X07.U=liczba wierszy oszacowana przez optymalizator: {0,number,###########0.00}
+43X08.U=koszt oszacowany przez optymalizator: {0,number,###########0.00}
 43X09.U=sekundy
 43X10.U=\u0141\u0105cznie
 43X11.U=W\u0119ze\u0142

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Tue Sep
27 21:48:49 2011
@@ -820,8 +820,8 @@ XSDG8.D=N\u00e3o foi poss\u00edvel copia
 43X04.U=Linhas exibidas
 43X05.U=Conjunto de resultados de origem
 43X06.U=N\u00famero da subconsulta final
-43X07.U=quantidade de linhas estimada pelo otimizador
-43X08.U=custo estimado pelo otimizador
+43X07.U=quantidade de linhas estimada pelo otimizador: {0,number,###########0.00}
+43X08.U=custo estimado pelo otimizador: {0,number,###########0.00}
 43X09.U=segundos
 43X10.U=Total
 43X11.U=N\u00f3

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Tue Sep 27
21:48:49 2011
@@ -824,8 +824,8 @@ XSDG8.D=\u041d\u0435 \u0443\u0434\u0430\
 43X04.U=\u0427\u0438\u0441\u043b\u043e \u0432\u0438\u0434\u0438\u043c\u044b\u0445 \u0441\u0442\u0440\u043e\u043a
 43X05.U=\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0439 \u043d\u0430\u0431\u043e\u0440 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432
 43X06.U=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u043f\u043e\u0434\u0437\u0430\u043f\u0440\u043e\u0441\u0430
-43X07.U=\u0447\u0438\u0441\u043b\u043e \u0441\u0442\u0440\u043e\u043a \u043f\u043e \u043e\u0446\u0435\u043d\u043a\u0435
\u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0430\u0442\u043e\u0440\u0430
-43X08.U=\u0437\u0430\u0442\u0440\u0430\u0442\u044b \u043f\u043e \u043e\u0446\u0435\u043d\u043a\u0435
\u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0430\u0442\u043e\u0440\u0430
+43X07.U=\u0447\u0438\u0441\u043b\u043e \u0441\u0442\u0440\u043e\u043a \u043f\u043e \u043e\u0446\u0435\u043d\u043a\u0435
\u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0430\u0442\u043e\u0440\u0430: {0,number,###########0.00}
+43X08.U=\u0437\u0430\u0442\u0440\u0430\u0442\u044b \u043f\u043e \u043e\u0446\u0435\u043d\u043a\u0435
\u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0430\u0442\u043e\u0440\u0430: {0,number,###########0.00}
 43X09.U=\u0441\u0435\u043a.
 43X10.U=\u0412\u0441\u0435\u0433\u043e
 43X11.U=\u0423\u0437\u0435\u043b

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Tue Sep
27 21:48:49 2011
@@ -510,8 +510,8 @@
 43X04.U=\u770B\u5230\u7684\u884C
 43X05.U=\u6E90\u7ED3\u679C\u96C6
 43X06.U=\u7ED3\u675F\u5B50\u67E5\u8BE2\u53F7
-43X07.U=\u4F18\u5316\u5668\u4F30\u8BA1\u7684\u884C\u8BA1\u6570
-43X08.U=\u4F18\u5316\u5668\u4F30\u8BA1\u7684\u6210\u672C
+43X07.U=\u4F18\u5316\u5668\u4F30\u8BA1\u7684\u884C\u8BA1\u6570\: {0,number,###########0.00}
+43X08.U=\u4F18\u5316\u5668\u4F30\u8BA1\u7684\u6210\u672C\: {0,number,###########0.00}
 43X09.U=\u79D2
 43X10.U=\u603B\u8BA1
 43X11.U=\u8282\u70B9

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Tue Sep
27 21:48:49 2011
@@ -512,8 +512,8 @@
 43X04.U=\u6240\u898B\u5217\u6578
 43X05.U=\u4F86\u6E90\u7D50\u679C\u96C6
 43X06.U=\u7D50\u675F\u5B50\u67E5\u8A62\u865F\u78BC
-43X07.U=\u6700\u4F73\u5316\u7A0B\u5F0F\u9810\u4F30\u7684\u5217\u8A08\u6578
-43X08.U=\u6700\u4F73\u5316\u7A0B\u5F0F\u9810\u4F30\u7684\u6210\u672C
+43X07.U=\u6700\u4F73\u5316\u7A0B\u5F0F\u9810\u4F30\u7684\u5217\u8A08\u6578\: {0,number,###########0.00}
+43X08.U=\u6700\u4F73\u5316\u7A0B\u5F0F\u9810\u4F30\u7684\u6210\u672C\: {0,number,###########0.00}
 43X09.U=\u79D2\u6578
 43X10.U=\u7E3D\u8A08
 43X11.U=\u7BC0\u9EDE

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
Tue Sep 27 21:48:49 2011
@@ -7138,7 +7138,33 @@ Attached subqueries:
 																close time (milliseconds) = 0
 													Right result set:
 														Row ResultSet:
-								
+														Number of opens = 3
+														Rows returned = 3
+															constructor time (milliseconds) = 0
+															open time (milliseconds) = 0
+															next time (milliseconds) = 0
+															close time (milliseconds) = 0
+												Right result set:
+													Row ResultSet:
+													Number of opens = 3
+													Rows returned = 3
+														constructor time (milliseconds) = 0
+														open time (milliseconds) = 0
+														next time (milliseconds) = 0
+														close time (milliseconds) = 0
+											Right result set:
+												Row ResultSet:
+												Number of opens = 3
+												Rows returned = 3
+													constructor time (milliseconds) = 0
+													open time (milliseconds) = 0
+													next time (milliseconds) = 0
+													close time (milliseconds) = 0
+										Right result set:
+											Row ResultSet:
+											Number of opens = 3
+											Rows returned = 3
+												constructor time (m
 ij> select * from t1 where exists (select * from t2 where t1.c1=t2.c1 and t2.c1 not in
(select t3.c1 from t3, t4));
 C1         
 -----------
@@ -7693,7 +7719,33 @@ Attached subqueries:
 																close time (milliseconds) = 0
 													Right result set:
 														Row ResultSet:
-												
+														Number of opens = 3
+														Rows returned = 3
+															constructor time (milliseconds) = 0
+															open time (milliseconds) = 0
+															next time (milliseconds) = 0
+															close time (milliseconds) = 0
+												Right result set:
+													Row ResultSet:
+													Number of opens = 3
+													Rows returned = 3
+														constructor time (milliseconds) = 0
+														open time (milliseconds) = 0
+														next time (milliseconds) = 0
+														close time (milliseconds) = 0
+											Right result set:
+												Row ResultSet:
+												Number of opens = 3
+												Rows returned = 3
+													constructor time (milliseconds) = 0
+													open time (milliseconds) = 0
+													next time (milliseconds) = 0
+													close time (milliseconds) = 0
+										Right result set:
+											Row ResultSet:
+											Number of opens = 3
+											Rows returned = 3
+												constructor time (milli
 ij> drop table colls;
 0 rows inserted/updated/deleted
 ij> drop table docs;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java?rev=1176633&r1=1176632&r2=1176633&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
Tue Sep 27 21:48:49 2011
@@ -536,8 +536,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 },
         });
 
@@ -599,8 +599,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );
@@ -648,8 +648,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );
@@ -696,8 +696,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );
@@ -745,8 +745,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );
@@ -794,8 +794,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );
@@ -843,8 +843,8 @@ public class TableLockBasicTest extends 
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
-                    + "	optimizer estimated row count:            6.00\n"
-                    + "	optimizer estimated cost:          100.40"
+                    + "	optimizer estimated row count: 6.00\n"
+                    + "	optimizer estimated cost: 100.40"
                 }
         }        
         );



Mime
View raw message