db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r541732 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute: InsertResultSet.java RowUtil.java
Date Fri, 25 May 2007 17:32:04 GMT
Author: djd
Date: Fri May 25 10:32:03 2007
New Revision: 541732

URL: http://svn.apache.org/viewvc?view=rev&rev=541732
Log:
DERBY-2661 (partial) Remove one use of ExecutuionContext with a direct use of ExecutionFactory.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?view=diff&rev=541732&r1=541731&r2=541732
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
Fri May 25 10:32:03 2007
@@ -1636,7 +1636,7 @@
 	private ExecRow makeIndexTemplate(FKInfo fkInfo, ExecRow fullTemplate, ContextManager cm)
 		throws StandardException
 	{
-		ExecRow newRow = RowUtil.getEmptyIndexRow(fkInfo.colArray.length+1, cm);
+		ExecRow newRow = RowUtil.getEmptyIndexRow(fkInfo.colArray.length+1, lcc);
 
 		DataValueDescriptor[] templateColArray = fullTemplate.getRowArray();
 		DataValueDescriptor[] newRowColArray   = newRow.getRowArray();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java?view=diff&rev=541732&r1=541731&r2=541732
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java Fri May
25 10:32:03 2007
@@ -21,19 +21,12 @@
 
 package org.apache.derby.impl.sql.execute;
  
-import org.apache.derby.iapi.services.context.ContextManager;
-
+import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.services.sanity.SanityManager;
-
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
-
-import org.apache.derby.iapi.sql.execute.ExecRow;
 import org.apache.derby.iapi.sql.execute.ExecIndexRow;
-import org.apache.derby.iapi.sql.execute.ExecutionContext;
-import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.services.io.FormatableBitSet;
-import java.util.Vector;
+import org.apache.derby.iapi.sql.execute.ExecRow;
 
 /**
   Utility class manipulating rows.
@@ -62,13 +55,10 @@
 	  @param cm			 Current ContextManager
 	  @return the row.
 	  */
-	public static ExecIndexRow getEmptyIndexRow(int columnCount, ContextManager cm)
+	public static ExecIndexRow getEmptyIndexRow(int columnCount, LanguageConnectionContext lcc)
 	{
-		ExecutionContext	ec;
-
-		ec = (ExecutionContext)
-				cm.getContext(ExecutionContext.CONTEXT_ID);
-		return ec.getExecutionFactory().getIndexableRow(columnCount);
+		return lcc.getLanguageConnectionFactory().
+            getExecutionFactory().getIndexableRow(columnCount);
 	}
 
 	/**



Mime
View raw message