/ - Diff - Application: gvSIG desktop - gvSIG

Revision 31128

     	private JDBCHelper helper = null;
     	private int defaultFetchSize = 1000;
     	private long limit = -1l;
     	public JDBCSetProvider(JDBCStoreProvider store, FeatureQuery query,
     			FeatureType featureType) throws DataException {
     		super(store, query, featureType);
-...
     		} else {
     			setOrder(null);
+    		}
     		if (query != null) {
     			limit = query.getLimit();
+    		}
+    	}
     	/**
     	 * @return the defaultFetchSize
     	 */
     	public int getDefaultFetchSize() {
     		return defaultFetchSize;
+    	}
     	/**
     	 * @param defaultFetchSize
     	 *            the defaultFetchSize to set
     	 */
     	public void setDefaultFetchSize(int defaultFetchSize) {
     		this.defaultFetchSize = defaultFetchSize;
+    	}
     	protected String getSqlForEvaluator(Evaluator filter) {
     		if (filter == null) {
     			return null;
-...
     	protected String getSQL(long fromIndex) throws DataException {
     		return getJDBCStoreProvider().compoundSelect(getFeatureType(), filter,
     				order, 0, fromIndex);
     				order, limit, fromIndex);
+    	}
-...
     				String sql =
     						store.compoundSelect(getFeatureType(), filter, null, 1,
 );
     				int rsID = store.createResultSet(sql);
     				int rsID = store.createResultSet(sql, getFetchSize());
     				isEmpty = new Boolean(store.resulsetNext(rsID));
     				store.closeResulset(rsID);
     			} else {
-...
     		return isEmpty.booleanValue();
+    	}
     	protected int getFetchSize() {
     		long pageSize = -1;
     		if (getQuery() != null) {
     			pageSize = getQuery().getPageSize();
     			pageSize =
     					pageSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : pageSize;
+    		}
     		return (pageSize > 0 ? (int) pageSize : defaultFetchSize);
+    	}
     	protected JDBCIterator createFastIterator(long index) throws DataException {
     		if (isEmpty != null && isEmpty.booleanValue()) {
     			return new EmptyJDBCIterator();
+    		}
     		int rsID = getJDBCStoreProvider().createResultSet(getSQL(index));
     		int rsID =
     				getJDBCStoreProvider().createResultSet(getSQL(index),
     						getFetchSize());
     		return createDefaultFastIterator(rsID);
+    	}
-...
     		if (isEmpty != null && isEmpty.booleanValue()) {
     			return new EmptyJDBCIterator();
+    		}
     		int rsID = getJDBCStoreProvider().createResultSet(getSQL(index));
     		int rsID =
     				getJDBCStoreProvider().createResultSet(getSQL(index),
     						getFetchSize());
     		return createDefaultIterator(rsID);
+    	}

     	 */
     	public void loadFeatureProvider(final FeatureProvider data, final int resultsetID)
     			throws DataException {
     //		this.resourcesBegin();
     //		try {
     		getResource().execute(new ResourceAction() {
     			public Object run() throws Exception {
     				ResultSet rs = getResultSet(resultsetID);
-...
     				return null;
+    			}
     		});
     //		} finally {
     //			this.resourcesEnd();
     //		}
+    	}
-...
+    		}
+    	}
     	public final int createResultSet(String sql)
     	public final int createResultSet(String sql, int fetchSize)
     			throws DataException {
     		return createResultSet(sql, null);
     		return createResultSet(sql, null, -1);
+    	}
     	public final int createResultSet(final String sql, final Object[] values)
     	public final int createResultSet(final String sql, final Object[] values,
     			final int fetchSize)
     			throws DataException {
     		synchronized (this) {
     			checksResulsets();
     			// resourcesBegin();
     			// try {
     			return ((Integer) getResource().execute(new ResourceAction() {
     				public Object run() throws Exception {
     					ResultSetInfo newRs =
     							new ResultSetInfo(createNewResultSet(sql, values));
     							new ResultSetInfo(createNewResultSet(sql, values,
     									fetchSize));
     					int newId = getNewId();
     					if (newId < 0) {
     						newId = resulsetList.size();
-...
     					return Integer.valueOf(newId);
+    				}
     			})).intValue();
     			// } finally {
     			// resourcesEnd();
     			// }
+    		}
+    	}
-...
     				return Boolean.valueOf(getResultSet(resultsetID).next());
+    			}
     		})).booleanValue();
     		// ResultSet rs = getResultSet(resultsetID);
     		//
     		// resourcesBegin();
     		// try {
     		// return rs.next();
     		// } catch (SQLException e) {
     		// throw new JDBCSQLException(e);
     		// } finally {
     		// resourcesEnd();
     		// }
+    	}
     	public final void closeResulset(final int resultsetID)
     			throws JDBCException,
     			InvalidResultSetIdException, ResourceExecuteException {
     		synchronized (this) {
     			// resourcesBegin();
     			// try {
     			getResource().execute(new ResourceAction() {
     				public Object run() throws Exception {
     					ResultSet rs = dropResultSet(resultsetID);
-...
     				logger.debug(" id: " + resultsetID + " (total "
     						+ getResultsetOpenCount() + ")");
+    			}
     // } finally {
     			// resourcesEnd();
     			// }
     			checksResulsets();
+    		}
+    	}
-...
     	public final void checksResulsets() throws JDBCException,
     			InvalidResultSetIdException, ResourceExecuteException {
     		synchronized (this) {
     			// resourcesBegin();
     			// try {
     			getResource().execute(new ResourceAction() {
     				public Object run() throws Exception {
     					ResultSetInfo rsInfo;
-...
     					return null;
+    				}
     			});
     // } finally {
     			// resourcesEnd();
     			// }
+    		}
+    	}
     	private int getResultsetOpenCount() {
     		int count = 0;
     		Iterator iter = resulsetList.iterator();
-...
     	protected void closeResulset(final ResultSet rs) throws JDBCException,
     			ResourceExecuteException {
     //		resourcesBegin();
     //		try {
     		getResource().execute(new ResourceAction() {
     			public Object run() throws Exception {
     				Statement st = rs.getStatement();
-...
     				return null;
+    			}
     		});
     //		} catch (SQLException e) {
     //			throw new JDBCSQLException(e);
     //		} finally {
     //			resourcesEnd();
     //		}
+    	}
     	protected final int openResulsetCount() {
-...
     	 * @return
     	 * @throws DataException
     	 */
     	protected long getCount(String filter) throws DataException {
     	protected long getCount(String filter)
     			throws DataException {
     		this.open();
     		if (filter == null && totalCount != null) {
     			return totalCount.longValue();
+    		}
     		final String sql = compoundCountSelect(filter);
     		// resourcesBegin();
     		// try {
     		long count = ((Long) getResource().execute(new ResourceAction() {
     			public Object run() throws Exception {
     				long count = 0;
     				ResultSet rs = createNewResultSet(sql, null);
     				ResultSet rs = createNewResultSet(sql, null, 1);
     				try {
     					if (rs.next()) {
     						count = rs.getLong(1);
-...
     				return Long.valueOf(count);
+    			}
     		})).longValue();
     		// } finally {
     		// resourcesEnd();
     		// }
     		if (filter == null) {
     			totalCount = new Long(count);
+    		}
-...
     		helper.open();
+    	}
     	@Override
     	protected FeatureProvider internalGetFeatureProviderByReference(
     			FeatureReferenceProviderServices reference) throws DataException {
-...
     	@Override
     	protected FeatureProvider internalGetFeatureProviderByReference(
     			FeatureReferenceProviderServices reference, FeatureType featureType)
     			FeatureReferenceProviderServices reference,
     			FeatureType featureType)
     			throws DataException {
     		StringBuilder filter = new StringBuilder();
     		FeatureAttributeDescriptor[] pk =
-...
     		String sql = compoundSelect(featureType, filter.toString(), null, 1, 0);
     		FeatureProvider data;
     		int rsId = createResultSet(sql, values.toArray());
     		int rsId = createResultSet(sql, values.toArray(), 1);
     		try {
     			if (!resulsetNext(rsId)) {
     				// FIXME Exception
-...
+    	}
     	protected ResultSet createNewResultSet(final String sql,
     			final Object[] values) throws DataException {
     			final Object[] values, final int fetchSize)
     			throws DataException {
     		this.open();
     		return (ResultSet) getResource().execute(new ResourceAction() {
     			public Object run() throws Exception {
-...
     				try {
     					conn = helper.getConnection();
     					conn.setAutoCommit(false);
     					st = conn.prepareStatement(sql);
     					if (values != null) {
-...
+    						}
+    					}
     					if (fetchSize > 0) {
     						st.setFetchSize(fetchSize);
+    					}
     					rs = st.executeQuery();
     					rs.setFetchSize(5000); // TODO add to params?
     					if (fetchSize > 0) {
     						rs.setFetchSize(fetchSize);
+    					}
     					return rs;
     				} catch (SQLException e) {
     					// TODO throw exception ???
-...
+    			}
+    		}
     		// limit offset
     		if (limit >= 1 || offset >= 1) {
     		if (limit > 0 || offset > 0) {
     			sql.append(helper.compoundLimitAndOffset(limit,offset));
+    		}
     		return sql.toString();
-...
     	public ResourceProvider getResource() {
     		return getHelper().getResource();
+    	}
     	// public void resourcesBegin() throws ResourceExecuteException {
     	// this.helper.begin();
     	// }
     	//
     	// public void resourcesEnd() {
     	// this.helper.end();
     	// }
+    }

     	public String compoundLimitAndOffset(long limit, long offset) {
     		StringBuilder sql = new StringBuilder();
     		// limit
     		if (limit >= 1) {
     		if (limit > 0) {
     			sql.append(" limit ");
     			sql.append(limit);
     			sql.append(' ');
+    		}
     		// offset
     		if (offset >= 1) {
     		if (offset > 0) {
     			sql.append(" offset ");
     			sql.append(offset);
     			sql.append(' ');

Also available in: Unified diff