lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-06-04 21:51:31 +08:00
parent fe3bdb7979
commit c7eb18bac5
4 changed files with 153 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/com/wentch/redkale/source/DataJDBCSource.java
View File

@@ -877,103 +877,103 @@ public final class DataJDBCSource implements DataSource {
} }
} }
//-----------------------getSingleResult----------------------------- //-----------------------getNumberResult-----------------------------
//-----------------------------MAX----------------------------- //-----------------------------MAX-----------------------------
@Override @Override
public Number getMaxSingleResult(final Class entityClass, final String column) { public Number getMaxNumberResult(final Class entityClass, final String column) {
return getMaxSingleResult(entityClass, column, (FilterNode) null); return getMaxNumberResult(entityClass, column, (FilterNode) null);
} }
@Override @Override
public Number getMaxSingleResult(final Class entityClass, final String column, FilterBean bean) { public Number getMaxNumberResult(final Class entityClass, final String column, FilterBean bean) {
return getSingleResult(ReckonType.MAX, entityClass, column, null, bean); return getNumberResult(ReckonType.MAX, entityClass, column, null, bean);
} }
@Override @Override
public Number getMaxSingleResult(final Class entityClass, final String column, FilterNode node) { public Number getMaxNumberResult(final Class entityClass, final String column, FilterNode node) {
return getSingleResult(ReckonType.MAX, entityClass, column, node, null); return getNumberResult(ReckonType.MAX, entityClass, column, node, null);
} }
//-----------------------------MIN----------------------------- //-----------------------------MIN-----------------------------
@Override @Override
public Number getMinSingleResult(final Class entityClass, final String column) { public Number getMinNumberResult(final Class entityClass, final String column) {
return getMinSingleResult(entityClass, column, (FilterNode) null); return getMinNumberResult(entityClass, column, (FilterNode) null);
} }
@Override @Override
public Number getMinSingleResult(final Class entityClass, final String column, FilterBean bean) { public Number getMinNumberResult(final Class entityClass, final String column, FilterBean bean) {
return getSingleResult(ReckonType.MIN, entityClass, column, null, bean); return getNumberResult(ReckonType.MIN, entityClass, column, null, bean);
} }
@Override @Override
public Number getMinSingleResult(final Class entityClass, final String column, FilterNode node) { public Number getMinNumberResult(final Class entityClass, final String column, FilterNode node) {
return getSingleResult(ReckonType.MIN, entityClass, column, node, null); return getNumberResult(ReckonType.MIN, entityClass, column, node, null);
} }
//-----------------------------SUM----------------------------- //-----------------------------SUM-----------------------------
@Override @Override
public Number getSumSingleResult(final Class entityClass, final String column) { public Number getSumNumberResult(final Class entityClass, final String column) {
return getSumSingleResult(entityClass, column, (FilterNode) null); return getSumNumberResult(entityClass, column, (FilterNode) null);
} }
@Override @Override
public Number getSumSingleResult(final Class entityClass, final String column, FilterBean bean) { public Number getSumNumberResult(final Class entityClass, final String column, FilterBean bean) {
return getSingleResult(ReckonType.SUM, entityClass, column, null, bean); return getNumberResult(ReckonType.SUM, entityClass, column, null, bean);
} }
@Override @Override
public Number getSumSingleResult(final Class entityClass, final String column, FilterNode node) { public Number getSumNumberResult(final Class entityClass, final String column, FilterNode node) {
return getSingleResult(ReckonType.SUM, entityClass, column, node, null); return getNumberResult(ReckonType.SUM, entityClass, column, node, null);
} }
//----------------------------COUNT---------------------------- //----------------------------COUNT----------------------------
@Override @Override
public Number getCountSingleResult(final Class entityClass) { public Number getCountNumberResult(final Class entityClass) {
return getCountSingleResult(entityClass, (FilterNode) null); return getCountNumberResult(entityClass, (FilterNode) null);
} }
@Override @Override
public Number getCountSingleResult(final Class entityClass, FilterBean bean) { public Number getCountNumberResult(final Class entityClass, FilterBean bean) {
return getSingleResult(ReckonType.COUNT, entityClass, null, null, bean); return getNumberResult(ReckonType.COUNT, entityClass, null, null, bean);
} }
@Override @Override
public Number getCountSingleResult(final Class entityClass, FilterNode node) { public Number getCountNumberResult(final Class entityClass, FilterNode node) {
return getSingleResult(ReckonType.COUNT, entityClass, null, node, null); return getNumberResult(ReckonType.COUNT, entityClass, null, node, null);
} }
@Override @Override
public Number getCountDistinctSingleResult(final Class entityClass, String column) { public Number getCountDistinctNumberResult(final Class entityClass, String column) {
return getCountDistinctSingleResult(entityClass, column, (FilterNode) null); return getCountDistinctNumberResult(entityClass, column, (FilterNode) null);
} }
@Override @Override
public Number getCountDistinctSingleResult(final Class entityClass, String column, FilterBean bean) { public Number getCountDistinctNumberResult(final Class entityClass, String column, FilterBean bean) {
return getSingleResult(ReckonType.DISTINCTCOUNT, entityClass, column, null, bean); return getNumberResult(ReckonType.DISTINCTCOUNT, entityClass, column, null, bean);
} }
@Override @Override
public Number getCountDistinctSingleResult(final Class entityClass, final String column, FilterNode node) { public Number getCountDistinctNumberResult(final Class entityClass, final String column, FilterNode node) {
return getSingleResult(ReckonType.DISTINCTCOUNT, entityClass, column, node, null); return getNumberResult(ReckonType.DISTINCTCOUNT, entityClass, column, node, null);
} }
//-----------------------------AVG----------------------------- //-----------------------------AVG-----------------------------
@Override @Override
public Number getAvgSingleResult(final Class entityClass, final String column) { public Number getAvgNumberResult(final Class entityClass, final String column) {
return getAvgSingleResult(entityClass, column, (FilterNode) null); return getAvgNumberResult(entityClass, column, (FilterNode) null);
} }
@Override @Override
public Number getAvgSingleResult(final Class entityClass, final String column, FilterBean bean) { public Number getAvgNumberResult(final Class entityClass, final String column, FilterBean bean) {
return getSingleResult(ReckonType.AVG, entityClass, column, null, bean); return getNumberResult(ReckonType.AVG, entityClass, column, null, bean);
} }
@Override @Override
public Number getAvgSingleResult(final Class entityClass, final String column, FilterNode node) { public Number getAvgNumberResult(final Class entityClass, final String column, FilterNode node) {
return getSingleResult(ReckonType.AVG, entityClass, column, node, null); return getNumberResult(ReckonType.AVG, entityClass, column, node, null);
} }
private <T> Number getSingleResult(final ReckonType type, final Class<T> entityClass, final String column, FilterNode node, FilterBean bean) { private <T> Number getNumberResult(final ReckonType type, final Class<T> entityClass, final String column, FilterNode node, FilterBean bean) {
final Connection conn = createReadSQLConnection(); final Connection conn = createReadSQLConnection();
try { try {
final EntityInfo<T> info = loadEntityInfo(entityClass); final EntityInfo<T> info = loadEntityInfo(entityClass);
@@ -982,7 +982,7 @@ public final class DataJDBCSource implements DataSource {
if (cache != null && cache.isFullLoaded()) { if (cache != null && cache.isFullLoaded()) {
Predicate<T> filter = node == null ? null : node.createFilterPredicate(info, bean); Predicate<T> filter = node == null ? null : node.createFilterPredicate(info, bean);
if (node == null || node.isJoinAllCached()) { if (node == null || node.isJoinAllCached()) {
return cache.getSingleResult(type, column == null ? null : info.getAttribute(column), filter); return cache.getNumberResult(type, column == null ? null : info.getAttribute(column), filter);
} }
} }
final String sql = "SELECT " + type.getReckonColumn("a." + column) + " FROM " + info.getTable() + " a" final String sql = "SELECT " + type.getReckonColumn("a." + column) + " FROM " + info.getTable() + " a"

90
src/com/wentch/redkale/source/DataJPASource.java
View File

@@ -177,6 +177,96 @@ final class DataJPASource implements DataSource {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
} }
@Override
public Number getMaxNumberResult(Class entityClass, String column) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getMaxNumberResult(Class entityClass, String column, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getMaxNumberResult(Class entityClass, String column, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getMinNumberResult(Class entityClass, String column) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getMinNumberResult(Class entityClass, String column, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getMinNumberResult(Class entityClass, String column, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getSumNumberResult(Class entityClass, String column) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getSumNumberResult(Class entityClass, String column, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getSumNumberResult(Class entityClass, String column, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountNumberResult(Class entityClass) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountNumberResult(Class entityClass, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountNumberResult(Class entityClass, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountDistinctNumberResult(Class entityClass, String column) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountDistinctNumberResult(Class entityClass, String column, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getCountDistinctNumberResult(Class entityClass, String column, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getAvgNumberResult(Class entityClass, String column) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getAvgNumberResult(Class entityClass, String column, FilterBean bean) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
@Override
public Number getAvgNumberResult(Class entityClass, String column, FilterNode node) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
}
private static class DataJPAConnection extends DataConnection { private static class DataJPAConnection extends DataConnection {
private final EntityManager manager; private final EntityManager manager;

38
src/com/wentch/redkale/source/DataSource.java
View File

@@ -91,48 +91,48 @@ public interface DataSource {
public <T> void updateColumnIncrement(final DataConnection conn, Class<T> clazz, Serializable id, String column, long incvalue); public <T> void updateColumnIncrement(final DataConnection conn, Class<T> clazz, Serializable id, String column, long incvalue);
//-----------------------getSingleResult----------------------------- //-----------------------getNumberResult-----------------------------
//-----------------------------MAX----------------------------- //-----------------------------MAX-----------------------------
public Number getMaxSingleResult(final Class entityClass, final String column); public Number getMaxNumberResult(final Class entityClass, final String column);
public Number getMaxSingleResult(final Class entityClass, final String column, FilterBean bean); public Number getMaxNumberResult(final Class entityClass, final String column, FilterBean bean);
public Number getMaxSingleResult(final Class entityClass, final String column, FilterNode node); public Number getMaxNumberResult(final Class entityClass, final String column, FilterNode node);
//-----------------------------MIN----------------------------- //-----------------------------MIN-----------------------------
public Number getMinSingleResult(final Class entityClass, final String column); public Number getMinNumberResult(final Class entityClass, final String column);
public Number getMinSingleResult(final Class entityClass, final String column, FilterBean bean); public Number getMinNumberResult(final Class entityClass, final String column, FilterBean bean);
public Number getMinSingleResult(final Class entityClass, final String column, FilterNode node); public Number getMinNumberResult(final Class entityClass, final String column, FilterNode node);
//-----------------------------SUM----------------------------- //-----------------------------SUM-----------------------------
public Number getSumSingleResult(final Class entityClass, final String column); public Number getSumNumberResult(final Class entityClass, final String column);
public Number getSumSingleResult(final Class entityClass, final String column, FilterBean bean); public Number getSumNumberResult(final Class entityClass, final String column, FilterBean bean);
public Number getSumSingleResult(final Class entityClass, final String column, FilterNode node); public Number getSumNumberResult(final Class entityClass, final String column, FilterNode node);
//----------------------------COUNT---------------------------- //----------------------------COUNT----------------------------
public Number getCountSingleResult(final Class entityClass); public Number getCountNumberResult(final Class entityClass);
public Number getCountSingleResult(final Class entityClass, FilterBean bean); public Number getCountNumberResult(final Class entityClass, FilterBean bean);
public Number getCountSingleResult(final Class entityClass, FilterNode node); public Number getCountNumberResult(final Class entityClass, FilterNode node);
//----------------------------DISTINCT COUNT---------------------------- //----------------------------DISTINCT COUNT----------------------------
public Number getCountDistinctSingleResult(final Class entityClass, String column); public Number getCountDistinctNumberResult(final Class entityClass, String column);
public Number getCountDistinctSingleResult(final Class entityClass, String column, FilterBean bean); public Number getCountDistinctNumberResult(final Class entityClass, String column, FilterBean bean);
public Number getCountDistinctSingleResult(final Class entityClass, String column, FilterNode node); public Number getCountDistinctNumberResult(final Class entityClass, String column, FilterNode node);
//-----------------------------AVG----------------------------- //-----------------------------AVG-----------------------------
public Number getAvgSingleResult(final Class entityClass, final String column); public Number getAvgNumberResult(final Class entityClass, final String column);
public Number getAvgSingleResult(final Class entityClass, final String column, FilterBean bean); public Number getAvgNumberResult(final Class entityClass, final String column, FilterBean bean);
public Number getAvgSingleResult(final Class entityClass, final String column, FilterNode node); public Number getAvgNumberResult(final Class entityClass, final String column, FilterNode node);
//-----------------------find---------------------------- //-----------------------find----------------------------
/** /**

10
src/com/wentch/redkale/source/EntityCache.java
View File

@@ -99,7 +99,7 @@ final class EntityCache<T> {
return (filter != null) && listStream().filter(filter).findFirst().isPresent(); return (filter != null) && listStream().filter(filter).findFirst().isPresent();
} }
public <V> Number getSingleResult(final ReckonType type, final Attribute<T, V> attr, final Predicate<T> filter) { public <V> Number getNumberResult(final ReckonType type, final Attribute<T, V> attr, final Predicate<T> filter) {
Stream<T> stream = listStream(); Stream<T> stream = listStream();
if (filter != null) stream = stream.filter(filter); if (filter != null) stream = stream.filter(filter);
switch (type) { switch (type) {
@@ -115,7 +115,7 @@ final class EntityCache<T> {
} else if (attr.type() == double.class || attr.type() == Double.class) { } else if (attr.type() == double.class || attr.type() == Double.class) {
return stream.mapToDouble(x -> (Double) attr.get(x)).average().orElse(0); return stream.mapToDouble(x -> (Double) attr.get(x)).average().orElse(0);
} }
throw new RuntimeException("getSingleResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type()); throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
case COUNT: return stream.count(); case COUNT: return stream.count();
case DISTINCTCOUNT: return stream.map(x -> attr.get(x)).distinct().count(); case DISTINCTCOUNT: return stream.map(x -> attr.get(x)).distinct().count();
@@ -131,7 +131,7 @@ final class EntityCache<T> {
} else if (attr.type() == double.class || attr.type() == Double.class) { } else if (attr.type() == double.class || attr.type() == Double.class) {
return stream.mapToDouble(x -> (Double) attr.get(x)).max().orElse(0); return stream.mapToDouble(x -> (Double) attr.get(x)).max().orElse(0);
} }
throw new RuntimeException("getSingleResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type()); throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
case MIN: case MIN:
if (attr.type() == int.class || attr.type() == Integer.class) { if (attr.type() == int.class || attr.type() == Integer.class) {
@@ -145,7 +145,7 @@ final class EntityCache<T> {
} else if (attr.type() == double.class || attr.type() == Double.class) { } else if (attr.type() == double.class || attr.type() == Double.class) {
return stream.mapToDouble(x -> (Double) attr.get(x)).min().orElse(0); return stream.mapToDouble(x -> (Double) attr.get(x)).min().orElse(0);
} }
throw new RuntimeException("getSingleResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type()); throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
case SUM: case SUM:
if (attr.type() == int.class || attr.type() == Integer.class) { if (attr.type() == int.class || attr.type() == Integer.class) {
@@ -159,7 +159,7 @@ final class EntityCache<T> {
} else if (attr.type() == double.class || attr.type() == Double.class) { } else if (attr.type() == double.class || attr.type() == Double.class) {
return stream.mapToDouble(x -> (Double) attr.get(x)).sum(); return stream.mapToDouble(x -> (Double) attr.get(x)).sum();
} }
throw new RuntimeException("getSingleResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type()); throw new RuntimeException("getNumberResult error(type:" + type + ", attr.declaringClass: " + attr.declaringClass() + ", attr.field: " + attr.field() + ", attr.type: " + attr.type());
} }
return -1; return -1;
} }