db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1370897 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/sql/execute/rts/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/
Date Wed, 08 Aug 2012 19:03:23 GMT
Author: rhillegas
Date: Wed Aug  8 19:03:23 2012
New Revision: 1370897

URL: http://svn.apache.org/viewvc?rev=1370897&view=rev
Log:
DERBY-5879: Remove untranslatable tokens from messages.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
Wed Aug  8 19:03:23 2012
@@ -119,13 +119,13 @@ public class RealDistinctScanStatistics
 
 		if (indexName != null)
 		{
+            // note that the "constraint" and "index" literals are names of SQL
+            // objects and so do not need to be internationalized
 			header =
 			  indent + MessageService.getTextMessage(
 				SQLState.RTS_DISTINCT_SCAN_RS_USING,
 				tableName,
-				isConstraint ?
-					MessageService.getTextMessage(SQLState.RTS_CONSTRAINT) :
-					MessageService.getTextMessage(SQLState.RTS_INDEX),
+				isConstraint ? "constraint" : "index",
 				indexName);
 		}
 		else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
Wed Aug  8 19:03:23 2012
@@ -152,15 +152,14 @@ public class RealHashScanStatistics
 
 		if (indexName != null)
 		{
+            // note that the "constraint" and "index" literals are names of SQL
+            // objects and so do not need to be internationalized
 			header =
 				indent +
 					MessageService.getTextMessage(
 										SQLState.RTS_HASH_SCAN_RS_USING,
 										tableName,
-										MessageService.getTextMessage(
-											isConstraint ?
-												SQLState.RTS_CONSTRAINT :
-												SQLState.RTS_INDEX),
+                                        isConstraint ? "constraint" : "index",
 										indexName);
 		}
 		else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
Wed Aug  8 19:03:23 2012
@@ -154,14 +154,13 @@ public class RealTableScanStatistics 
 		}
 		if (indexName != null)
 		{
+            // note that the "constraint" and "index" literals are names of SQL
+            // objects and so do not need to be internationalized
 			header = header +
 				indent + MessageService.getTextMessage(
 											SQLState.RTS_IS_RS_USING,
 											tableName,
-											MessageService.getTextMessage(
-												(isConstraint) ?
-													SQLState.RTS_CONSTRAINT :
-													SQLState.RTS_INDEX),
+                                            isConstraint ? "constraint" : "index",
 											indexName);
 				
 		}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
Wed Aug  8 19:03:23 2012
@@ -167,11 +167,12 @@ public class RealUnionResultSetStatistic
     return children;
   }
 	/**
-   * Format for display, a name for this node.
+   * Format for display, a name for this node. Since this is a SQL operator name,
+   * it does not need to be internationalized.
 	 *
 	 */
   public String getNodeName(){
-    return MessageService.getTextMessage(SQLState.RTS_UNION);
+      return "Union";
   }
   
   // -----------------------------------------------------

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
Wed Aug  8 19:03:23 2012
@@ -142,11 +142,12 @@ public class RealUpdateResultSetStatisti
 		return getStatementExecutionPlanText(0);
 	}
 	/**
-   * Format for display, a name for this node.
+   * Format for display, a name for this node. Since this is a SQL operator name,
+   * it does not need to be internationalized.
 	 *
 	 */
   public String getNodeName(){
-    return MessageService.getTextMessage(SQLState.RTS_UPDATE);
+    return "Update";
   }
   
   // -----------------------------------------------------

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=1370897&r1=1370896&r2=1370897&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 Wed Aug  8 19:03:23
2012
@@ -6604,18 +6604,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>43X24.U</name>
-                <text>constraint</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
-                <name>43X25.U</name>
-                <text>index</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
                 <name>43X26.U</name>
                 <text>Distinct Scan ResultSet for {0}</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
@@ -7189,12 +7177,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>43Y15.U</name>
-                <text>Union</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
                 <name>43Y16.U</name>
                 <text>Update ResultSet using {0} locking</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
@@ -7208,12 +7190,6 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>43Y18.U</name>
-                <text>Update</text>
-                <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>
-            </msg>
-
-            <msg>
                 <name>43Y19.U</name>
                 <text>VTI ResultSet for {0}</text>
                 <comment>Translators: This is part of query plan printout; the string
is complete as is.</comment>

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1370897&r1=1370896&r2=1370897&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Wed Aug  8 19:03:23 2012
@@ -1162,8 +1162,6 @@ public interface SQLState {
 	String RTS_ROWS_INPUT											   = "43X21.U";
 	String RTS_DISTINCT_SCALAR_AGG									   = "43X22.U";
 	String RTS_DISTINCT_SCAN_RS_USING								   = "43X23.U";
-	String RTS_CONSTRAINT											   = "43X24.U";
-	String RTS_INDEX												   = "43X25.U";
 	String RTS_DISTINCT_SCAN_RS										   = "43X26.U";
 	String RTS_LOCKING												   = "43X27.U";
 	String RTS_SCAN_INFO											   = "43X28.U";
@@ -1257,10 +1255,8 @@ public interface SQLState {
 	String RTS_FETCH_SIZE											   = "43Y12.U";
 	String RTS_QUALS												   = "43Y13.U";
 	String RTS_UNION_RS												   = "43Y14.U";
-	String RTS_UNION												   = "43Y15.U";
 	String RTS_UPDATE_RS_USING										   = "43Y16.U";
 	String RTS_ROWS_UPDATED											   = "43Y17.U";
-	String RTS_UPDATE												   = "43Y18.U";
 	String RTS_VTI_RS												   = "43Y19.U";
 	String RTS_VTI													   = "43Y20.U";
 	String RTS_MATERIALIZED_SUBQS									   = "43Y21.U";



Mime
View raw message