[teiid-commits] teiid SVN: r4528 - in branches/7.7.x/engine/src/main/java/org/teiid: query/util and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: jolee
Date: 2012-11-03 18:54:03 -0400 (Sat, 03 Nov 2012)
New Revision: 4528

Modified:
   branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
   branches/7.7.x/engine/src/main/java/org/teiid/query/util/CommandContext.java
Log:
TEIID-2245: Limit pushdown of nulls first/last (after Eng review)

Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2012-11-01 20:35:09 UTC (rev 4527)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2012-11-03 22:54:03 UTC (rev 4528)
@@ -78,7 +78,6 @@
 import org.teiid.query.rewriter.QueryRewriter;
 import org.teiid.query.sql.lang.BatchedUpdateCommand;
 import org.teiid.query.sql.lang.Command;
-import org.teiid.query.util.ContextProperties;
 import org.teiid.query.sql.lang.Limit;
 import org.teiid.query.sql.lang.QueryCommand;
 import org.teiid.query.sql.lang.StoredProcedure;
@@ -90,6 +89,7 @@
 import org.teiid.query.tempdata.GlobalTableStore;
 import org.teiid.query.tempdata.TempTableStore;
 import org.teiid.query.util.CommandContext;
+import org.teiid.query.util.ContextProperties;
 import org.teiid.query.util.Options;
 import org.teiid.query.validator.AbstractValidationVisitor;
 import org.teiid.query.validator.ValidationVisitor;
@@ -257,13 +257,15 @@
         context.setSubject(workContext.getSubject());
         context.setEnvironmentProperties(props);
         
+        Options options = new Options();
+        options.setProperties(System.getProperties());
+        PropertiesUtils.setBeanProperties(options, options.getProperties(), "org.teiid", true); //$NON-NLS-1$
         this.context.setConnectionID(workContext.getSessionId());
         this.context.setSession(workContext.getSession());
         this.context.setRequestId(this.requestId);
         this.context.setDQPWorkContext(this.workContext);
         this.context.setTransactionService(this.transactionService);
         this.context.setTransactionContext(this.transactionContext);
-		this.context.setVDBClassLoader(workContext.getVDB().getAttachment(ClassLoader.class));
     }
     
     @Override

Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/util/CommandContext.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/util/CommandContext.java	2012-11-01 20:35:09 UTC (rev 4527)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/util/CommandContext.java	2012-11-03 22:54:03 UTC (rev 4528)
@@ -145,8 +145,6 @@
 		private LRUCache<String, SimpleDateFormat> dateFormatCache;
 		
 		private Options options;
-
-		public ClassLoader classLoader;
 	}
 	
 	private GlobalState globalState = new GlobalState();
@@ -705,14 +703,4 @@
 	public void setOptions(Options options) {
 		this.globalState.options = options;
 	}
-
-	public ClassLoader getVDBClassLoader() {
-		return this.globalState.classLoader;
-	}
-	
-	public void setVDBClassLoader(ClassLoader classLoader) {
-		this.globalState.classLoader = classLoader;
-	}
-
-	
 }