[teiid-commits] teiid SVN: r3075 - in trunk: engine/src/main/java/org/teiid/dqp/internal/process and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-04-07 11:22:24 -0400 (Thu, 07 Apr 2011)
New Revision: 3075

Modified:
   trunk/api/src/main/java/org/teiid/CommandContext.java
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
   trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java
Log:
TEIID-1550 exposing the subject through the commandcontext for use by udfs

Modified: trunk/api/src/main/java/org/teiid/CommandContext.java
===================================================================
--- trunk/api/src/main/java/org/teiid/CommandContext.java	2011-04-07 11:39:30 UTC (rev 3074)
+++ trunk/api/src/main/java/org/teiid/CommandContext.java	2011-04-07 15:22:24 UTC (rev 3075)
@@ -25,6 +25,8 @@
 import java.util.Properties;
 import java.util.TimeZone;
 
+import javax.security.auth.Subject;
+
 /**
  * Context information for the currently executing command.
  * Can be used as an argument to UDFs.
@@ -48,5 +50,7 @@
 	int getProcessorBatchSize();
 	
 	TimeZone getServerTimeZone();
+	
+	Subject getSubject();
 
 }

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2011-04-07 11:39:30 UTC (rev 3074)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2011-04-07 15:22:24 UTC (rev 3075)
@@ -313,6 +313,7 @@
         context.setPreparedPlanCache(planCache);
         context.setResultSetCacheEnabled(this.resultSetCacheEnabled);
         context.setUserRequestSourceConcurrency(this.userRequestConcurrency);
+        context.setSubject(workContext.getSubject());
     }
     
     @Override

Modified: trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java	2011-04-07 11:39:30 UTC (rev 3074)
+++ trunk/engine/src/main/java/org/teiid/query/util/CommandContext.java	2011-04-07 15:22:24 UTC (rev 3075)
@@ -29,6 +29,8 @@
 import java.util.Set;
 import java.util.TimeZone;
 
+import javax.security.auth.Subject;
+
 import org.teiid.api.exception.query.QueryProcessingException;
 import org.teiid.common.buffer.BufferManager;
 import org.teiid.core.TeiidComponentException;
@@ -111,7 +113,7 @@
 	    private boolean resultSetCacheEnabled = true;
 	    
 	    private int userRequestSourceConcurrency;
-
+	    private Subject subject;
 	}
 	
 	private GlobalState globalState = new GlobalState();
@@ -522,4 +524,13 @@
 		this.globalState.userRequestSourceConcurrency = userRequestSourceConcurrency;
 	}
 	
+	@Override
+	public Subject getSubject() {
+		return this.globalState.subject;
+	}
+	
+	public void setSubject(Subject subject) {
+		this.globalState.subject = subject;
+	}
+	
 }