Author: kwsutter
Date: Tue Feb 27 09:23:27 2007
New Revision: 512327
URL: http://svn.apache.org/viewvc?view=rev&rev=512327
Log:
These changes are reverting the changes integrated for revisions 510336 and
510281. From the remarks on the dev mailing list, the basic idea is sound, we
just need to re-visit the implementation a bit.
One "problem" that I couldn't resolve with this revert process was to restore
the svn history for the DB2Dictionary.java part. Somehow, the history for this
part was lost when revision 510336 was integrated. I have not found a means of
restoring that history. But, at least the contents are back to a known state.
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?view=diff&rev=512327&r1=512326&r2=512327
==============================================================================
---
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
(original)
+++
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Tue Feb 27 09:23:27 2007
@@ -20,7 +20,6 @@
import java.sql.SQLException;
import java.util.Arrays;
-import org.apache.openjpa.jdbc.kernel.JDBCFetchConfiguration;
import org.apache.openjpa.jdbc.schema.Sequence;
/**
@@ -34,7 +33,7 @@
validationSQL = "SELECT DISTINCT(CURRENT TIMESTAMP) FROM "
+ "SYSIBM.SYSTABLES";
supportsSelectEndIndex = true;
- optimizeClause ="optimize for";
+
nextSequenceQuery = "VALUES NEXTVAL FOR {0}";
sequenceSQL = "SELECT SEQSCHEMA AS SEQUENCE_SCHEMA, "
@@ -191,20 +190,5 @@
}
}
}
- }
-
- public String getOptimizeClause(JDBCFetchConfiguration fetch) {
- Integer rows = null;
- StringBuffer optimizeString = new StringBuffer();
- if (fetch.getHint("openjpa.hint.optimize") != null) {
- rows = (Integer)fetch.getHint("openjpa.hint.optimize");
- optimizeString.append(" ").append(optimizeClause).append(" ")
- .append(rows).append(" ");
- if (rows.intValue() > 1)
- optimizeString.append(rowsClause).append(" ");
- else
- optimizeString.append(rowClause).append(" ");
- }
- return optimizeString.toString();
}
}
Modified:
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?view=diff&rev=512327&r1=512326&r2=512327
==============================================================================
---
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
(original)
+++
incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Tue Feb 27 09:23:27 2007
@@ -184,9 +184,6 @@
public String crossJoinClause = "CROSS JOIN";
public boolean requiresConditionForCrossJoin = false;
public String forUpdateClause = "FOR UPDATE";
- public String optimizeClause = null;
- public String rowClause = "row";
- public String rowsClause = "rows";
public String tableForUpdateClause = null;
public String distinctCountColumnSeparator = null;
public boolean supportsSelectForUpdate = true;
@@ -2146,22 +2143,10 @@
SQLBuffer from, SQLBuffer where, SQLBuffer group,
SQLBuffer having, SQLBuffer order,
boolean distinct, boolean forUpdate, long start, long end) {
-
- String optimizeString = null;
- SQLBuffer selString = toOperation(getSelectOperation(fetch),
- selects, from, where,
+ return toOperation(getSelectOperation(fetch), selects, from, where,
group, having, order, distinct, forUpdate, start, end);
- if (fetch != null)
- optimizeString = getOptimizeClause(fetch);
- if (optimizeString != null)
- selString.append(optimizeString);
- return selString;
}
- public String getOptimizeClause(JDBCFetchConfiguration fetch) {
- return null;
- }
-
/**
* Return the "SELECT" operation clause, adding any available hints, etc.
*/
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?view=diff&rev=512327&r1=512326&r2=512327
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Tue Feb 27 09:23:27 2007
@@ -765,7 +765,7 @@
}
if (fetch == null)
fetch = _fc;
- fetch.setHint("openjpa.hint.optimize", new Integer(1));
+
beginOperation(true);
try {
assertNontransactionalRead();
Modified:
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?view=diff&rev=512327&r1=512326&r2=512327
==============================================================================
---
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
(original)
+++
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
Tue Feb 27 09:23:27 2007
@@ -279,8 +279,6 @@
*/
public Object getSingleResult() {
_em.assertNotCloseInvoked();
- _query.getFetchConfiguration().
- setHint("openjpa.hint.optimize", new Integer(1));
Object ob = execute();
if (!(ob instanceof List))
return ob;
