db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r619981 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/compile/CompilerContext.java impl/sql/compile/CompilerContextImpl.java impl/sql/conn/GenericLanguageConnectionContext.java
Date Fri, 08 Feb 2008 19:44:33 GMT
Author: djd
Date: Fri Feb  8 11:44:30 2008
New Revision: 619981

URL: http://svn.apache.org/viewvc?rev=619981&view=rev
Log:
DERBY-3391 Remove dead code that restored isolation level during a compile, since isolation
cannot be changed by a compile

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java?rev=619981&r1=619980&r2=619981&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
Fri Feb  8 11:44:30 2008
@@ -477,20 +477,6 @@
 	public int getScanIsolationLevel();
 
 	/**
-	 * Set the isolation level on entry to this CC so that it can be restored on exit.
-	 *
-	 * @param isolationLevel	The isolation level on entry.
-	 */
-	public void setEntryIsolationLevel(int isolationLevel);
-
-	/**
-	 * Get the entry isolation level from this CC.
-	 *
-	 * @return	The entry isolation level.
-	 */
-	public int getEntryIsolationLevel();
-
-	/**
 	 * Get the next equivalence class for equijoin clauses.
 	 *
 	 * @return The next equivalence class for equijoin clauses.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java?rev=619981&r1=619980&r2=619981&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
Fri Feb  8 11:44:30 2008
@@ -618,22 +618,6 @@
 	}
 
 	/**
-	 * @see CompilerContext#setEntryIsolationLevel
-	 */
-	public void setEntryIsolationLevel(int isolationLevel)
-	{
-		this.entryIsolationLevel = isolationLevel;
-	}
-
-	/**
-	 * @see CompilerContext#getScanIsolationLevel
-	 */
-	public int getEntryIsolationLevel()
-	{
-		return entryIsolationLevel;
-	}
-
-	/**
 	 * @see CompilerContext#getTypeCompilerFactory
 	 */
 	public TypeCompilerFactory getTypeCompilerFactory()
@@ -915,7 +899,6 @@
 	private int					nextTableNumber;
 	private int					nextSubqueryNumber;
 	private int					nextResultSetNumber;
-	private int					entryIsolationLevel;
 	private int					scanIsolationLevel;
 	private int					nextEquivalenceClass = -1;
 	private long				nextClassName;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java?rev=619981&r1=619980&r2=619981&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
Fri Feb  8 11:44:30 2008
@@ -1914,9 +1914,6 @@
 
 		cc.setInUse(true);
 
-		// Save off the current isolation level on entry so that it gets restored
-		cc.setEntryIsolationLevel( getCurrentIsolationLevel());
-
 		StatementContext sc = getStatementContext();
 		if (sc.getSystemCode())
 			cc.setReliability(CompilerContext.INTERNAL_SQL_LEGAL);
@@ -1953,9 +1950,6 @@
 		cc.setCurrentDependent(null);
 
 		cc.setInUse(false);
-
-		// Restore the isolation level at the time of entry to CompilerContext
-		isolationLevel = cc.getEntryIsolationLevel();
 
 		/*
 		** Only pop the compiler context if it's not the first one



Mime
View raw message