[teiid-commits] teiid SVN: r3288 - in branches/7.4.x/engine/src: main/java/org/teiid/query/rewriter and 2 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-06-28 16:56:20 -0400 (Tue, 28 Jun 2011)
New Revision: 3288

Modified:
   branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java
   branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
   branches/7.4.x/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java
   branches/7.4.x/engine/src/test/java/org/teiid/common/buffer/TestSTree.java
Log:
minor changes to remove validation warnings

Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java	2011-06-28 20:41:02 UTC (rev 3287)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/NodeConstants.java	2011-06-28 20:56:20 UTC (rev 3288)
@@ -43,7 +43,6 @@
         public static final int SET_OP = 1<<8;
         public static final int NULL = 1<<9;
         public static final int TUPLE_LIMIT = 1<<10;
-        public static final int WITH = 1<<11;
     }
 
     /**
@@ -64,7 +63,6 @@
             case NodeConstants.Types.SET_OP:        return "SetOperation"; //$NON-NLS-1$
             case NodeConstants.Types.NULL:          return "Null"; //$NON-NLS-1$
             case NodeConstants.Types.TUPLE_LIMIT:   return "TupleLimit"; //$NON-NLS-1$
-            case NodeConstants.Types.WITH:   		return "With"; //$NON-NLS-1$
             default:                                return "Unknown: " + type; //$NON-NLS-1$
         }
     }

Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java	2011-06-28 20:41:02 UTC (rev 3287)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java	2011-06-28 20:56:20 UTC (rev 3288)
@@ -604,9 +604,9 @@
         From from = query.getFrom();
         if(from != null){
             List<FromClause> clauses = new ArrayList<FromClause>(from.getClauses().size());
-            Iterator clauseIter = from.getClauses().iterator();
+            Iterator<FromClause> clauseIter = from.getClauses().iterator();
             while(clauseIter.hasNext()) {
-                clauses.add( rewriteFromClause(query, (FromClause) clauseIter.next()) );
+                clauses.add( rewriteFromClause(query, clauseIter.next()) );
             }
             from.setClauses(clauses);
         } else {

Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java	2011-06-28 20:41:02 UTC (rev 3287)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/validator/UpdateValidator.java	2011-06-28 20:56:20 UTC (rev 3288)
@@ -404,7 +404,7 @@
             	String groupName = es.getGroupSymbol().getCanonicalName();
         		UpdateMapping info = updateInfo.updatableGroups.get(groupName);
         		if (es.getGroupSymbol().getDefinition() != null) {
-            		ElementSymbol clone = (ElementSymbol)es.clone();
+            		ElementSymbol clone = es.clone();
             		clone.setOutputName(null);
             		clone.getGroupSymbol().setName(clone.getGroupSymbol().getNonCorrelationName());
             		clone.getGroupSymbol().setDefinition(null);

Modified: branches/7.4.x/engine/src/test/java/org/teiid/common/buffer/TestSTree.java
===================================================================
--- branches/7.4.x/engine/src/test/java/org/teiid/common/buffer/TestSTree.java	2011-06-28 20:41:02 UTC (rev 3287)
+++ branches/7.4.x/engine/src/test/java/org/teiid/common/buffer/TestSTree.java	2011-06-28 20:56:20 UTC (rev 3288)
@@ -33,7 +33,7 @@
 import org.teiid.core.TeiidComponentException;
 import org.teiid.query.sql.symbol.ElementSymbol;
 
- at SuppressWarnings("nls")
+ at SuppressWarnings({"nls", "unchecked"})
 public class TestSTree {
 	
 	@Test public void testRemoveAll() throws TeiidComponentException {
@@ -42,7 +42,7 @@
 		e1.setType(Integer.class);
 		ElementSymbol e2 = new ElementSymbol("y");
 		e2.setType(String.class);
-		List elements = Arrays.asList(e1, e2);
+		List<ElementSymbol> elements = Arrays.asList(e1, e2);
 		STree map = bm.createSTree(elements, "1", 1);
 		
 		for (int i = 20000; i > 0; i--) {
@@ -83,7 +83,7 @@
 		
 		ElementSymbol e1 = new ElementSymbol("x");
 		e1.setType(Integer.class);
-		List elements = Arrays.asList(e1);
+		List<ElementSymbol> elements = Arrays.asList(e1);
 		STree map = bm.createSTree(elements, "1", 1);
 		
 		int size = (1<<16)+(1<<4)+1;