Author: tv
Date: Thu Aug 16 10:03:41 2018
New Revision: 1838172
URL: http://svn.apache.org/viewvc?rev=1838172&view=rev
Log:
Cleanup
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java?rev=1838172&r1=1838171&r2=1838172&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/map/ColumnMap.java
Thu Aug 16 10:03:41 2018
@@ -524,9 +524,9 @@ public class ColumnMap extends OptionSup
}
/**
- * Returns whether this colum uses primitive values rather than objects.
+ * Returns whether this column uses primitive values rather than objects.
*
- * @return true if this colum uses primitive values, false if it uses
+ * @return true if this column uses primitive values, false if it uses
* objects.
*/
public boolean isUsePrimitive()
@@ -535,7 +535,7 @@ public class ColumnMap extends OptionSup
}
/**
- * Sets whether this colum uses primitive values rather than objects.
+ * Sets whether this column uses primitive values rather than objects.
*
* @param usePrimitive whether primitive objects are used
* rather than objects.
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java?rev=1838172&r1=1838171&r2=1838172&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/om/mapper/RecordMapper.java
Thu Aug 16 10:03:41 2018
@@ -35,6 +35,7 @@ import org.apache.torque.criteria.Criter
*
* @version $Id$
*/
+@FunctionalInterface
public interface RecordMapper<T> extends Serializable
{
/**
Modified:
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1838172&r1=1838171&r2=1838172&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
(original)
+++
db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java
Thu Aug 16 10:03:41 2018
@@ -1137,51 +1137,52 @@ public class BasePeerImpl<T> implements
query.getPreparedStatementReplacements(),
0);
- long startTime = System.currentTimeMillis();
- log.debug("Executing query " + query
- + ", parameters = "
- + replacements);
-
- try (ResultSet resultSet = statement.executeQuery())
+ // Set offset and limit
+ long offset;
+ Database database = Torque.getDatabase(criteria.getDbName());
+ if (database.getAdapter().supportsNativeOffset())
{
- long queryEndTime = System.currentTimeMillis();
- log.trace("query took " + (queryEndTime - startTime)
- + " milliseconds");
+ offset = 0; //database takes care of offset
+ }
+ else
+ {
+ offset = criteria.getOffset();
+ }
- long offset;
- Database database = Torque.getDatabase(criteria.getDbName());
+ long limit;
+ if (database.getAdapter().supportsNativeLimit())
+ {
+ limit = -1; //database takes care of offset
+ }
+ else
+ {
if (database.getAdapter().supportsNativeOffset())
{
- offset = 0; //database takes care of offset
+ limit = criteria.getLimit();
}
else
{
- offset = criteria.getOffset();
- }
-
- long limit;
- if (database.getAdapter().supportsNativeLimit())
- {
- limit = -1; //database takes care of offset
- }
- else
- {
- if (database.getAdapter().supportsNativeOffset())
+ if (criteria.getLimit() == -1)
{
limit = criteria.getLimit();
}
else
{
- if (criteria.getLimit() == -1)
- {
- limit = criteria.getLimit();
- }
- else
- {
- limit = offset + criteria.getLimit();
- }
+ limit = offset + criteria.getLimit();
}
}
+ }
+
+ long startTime = System.currentTimeMillis();
+ log.debug("Executing query " + query
+ + ", parameters = "
+ + replacements);
+
+ try (ResultSet resultSet = statement.executeQuery())
+ {
+ long queryEndTime = System.currentTimeMillis();
+ log.trace("query took " + (queryEndTime - startTime)
+ + " milliseconds");
List<TT> result = new ArrayList<TT>();
int rowNumber = 0;
@@ -1915,8 +1916,7 @@ public class BasePeerImpl<T> implements
}
if (criterion.isComposite())
{
- for (Criterion part
- : criterion.getParts())
+ for (Criterion part : criterion.getParts())
{
correctBooleans(criteria, part);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
