Hibernate SVN: r17976 - in core/trunk/cache-infinispan: src/main/java/org/hibernate/cache/infinispan and 17 other directories.
by hibernate-commits＠lists.jboss.org
Author: galder.zamarreno(a)jboss.com
Date: 2009-11-13 13:12:53 -0500 (Fri, 13 Nov 2009)
New Revision: 17976
Added:
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java
Modified:
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/AbstractDualNodeTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java
Log:
[HHH-4519] (Hibernate/Infinispan integration doesn't property handle Entity/CollectionRegionAccessStrategy evictAll) Fixed and got provider to work with forthcoming Infinispan 4.0.0.CR2 which has been just tagged but the maven repo has not been updated yet.
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/pom.xml 2009-11-13 18:12:53 UTC (rev 17976)
@@ -17,7 +17,7 @@
<description>Integration of Hibernate with Infinispan</description>
<properties>
- <version.infinispan>4.0.0.BETA2</version.infinispan>
+ <version.infinispan>4.0.0-SNAPSHOT</version.infinispan>
<version.hsqldb>1.8.0.2</version.hsqldb>
<version.cglib>2.2</version.cglib>
<version.javassist>3.4.GA</version.javassist>
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -24,6 +24,8 @@
import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl;
import org.hibernate.cache.infinispan.timestamp.TimestampTypeOverrides;
import org.hibernate.cache.infinispan.tm.HibernateTransactionManagerLookup;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.CacheAdapterImpl;
import org.hibernate.cfg.Settings;
import org.hibernate.util.PropertiesHelper;
import org.infinispan.Cache;
@@ -154,14 +156,20 @@
public CollectionRegion buildCollectionRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {
log.debug("Building collection cache region [" + regionName + "]");
Cache cache = getCache(regionName, COLLECTION_KEY, properties);
- return new CollectionRegionImpl(cache, regionName, metadata, transactionManager);
+ CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(cache);
+ CollectionRegionImpl region = new CollectionRegionImpl(cacheAdapter, regionName, metadata, transactionManager);
+ region.start();
+ return region;
}
/** {@inheritDoc} */
public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {
if (log.isDebugEnabled()) log.debug("Building entity cache region [" + regionName + "]");
Cache cache = getCache(regionName, ENTITY_KEY, properties);
- return new EntityRegionImpl(cache, regionName, metadata, transactionManager);
+ CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(cache);
+ EntityRegionImpl region = new EntityRegionImpl(cacheAdapter, regionName, metadata, transactionManager);
+ region.start();
+ return region;
}
/**
@@ -171,7 +179,10 @@
throws CacheException {
log.debug("Building query results cache region [" + regionName + "]");
String cacheName = typeOverrides.get(QUERY_KEY).getCacheName();
- return new QueryResultsRegionImpl(manager.getCache(cacheName), regionName, properties, transactionManager);
+ CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(manager.getCache(cacheName));
+ QueryResultsRegionImpl region = new QueryResultsRegionImpl(cacheAdapter, regionName, properties, transactionManager);
+ region.start();
+ return region;
}
/**
@@ -181,7 +192,10 @@
throws CacheException {
log.debug("Building timestamps cache region [" + regionName + "]");
String cacheName = typeOverrides.get(TIMESTAMPS_KEY).getCacheName();
- return new TimestampsRegionImpl(manager.getCache(cacheName), regionName, transactionManager);
+ CacheAdapter cacheAdapter = CacheAdapterImpl.newInstance(manager.getCache(cacheName));
+ TimestampsRegionImpl region = new TimestampsRegionImpl(cacheAdapter, regionName, transactionManager);
+ region.start();
+ return region;
}
/**
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -23,11 +23,15 @@
*/
package org.hibernate.cache.infinispan.access;
+import javax.transaction.Transaction;
+
import org.hibernate.cache.CacheException;
import org.hibernate.cache.access.CollectionRegionAccessStrategy;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.cache.access.SoftLock;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.impl.BaseRegion;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.CacheHelper;
/**
* Defines the strategy for transactional access to entity or collection data in a Infinispan instance.
@@ -41,18 +45,24 @@
*/
public class TransactionalAccessDelegate {
- protected final Cache cache;
+ protected final CacheAdapter cacheAdapter;
+ protected final BaseRegion region;
- public TransactionalAccessDelegate(Cache cache) {
- this.cache = cache;
+ public TransactionalAccessDelegate(BaseRegion region) {
+ this.region = region;
+ this.cacheAdapter = region.getCacheAdapter();
}
public Object get(Object key, long txTimestamp) throws CacheException {
- return cache.get(key);
+ if (!region.checkValid())
+ return null;
+ return cacheAdapter.get(key);
}
public boolean putFromLoad(Object key, Object value, long txTimestamp, Object version) throws CacheException {
- cache.putForExternalRead(key, value);
+ if (!region.checkValid())
+ return false;
+ cacheAdapter.putForExternalRead(key, value);
return true;
}
@@ -76,7 +86,9 @@
}
public boolean insert(Object key, Object value, Object version) throws CacheException {
- cache.put(key, value);
+ if (!region.checkValid())
+ return false;
+ cacheAdapter.put(key, value);
return true;
}
@@ -85,7 +97,10 @@
}
public boolean update(Object key, Object value, Object currentVersion, Object previousVersion) throws CacheException {
- cache.put(key, value);
+ // We update whether or not the region is valid. Other nodes
+ // may have already restored the region so they need to
+ // be informed of the change.
+ cacheAdapter.put(key, value);
return true;
}
@@ -95,18 +110,26 @@
}
public void remove(Object key) throws CacheException {
- cache.remove(key);
+ // We update whether or not the region is valid. Other nodes
+ // may have already restored the region so they need to
+ // be informed of the change.
+ cacheAdapter.remove(key);
}
public void removeAll() throws CacheException {
- cache.clear();
+ cacheAdapter.clear();
}
- public void evictAll() throws CacheException {
- evictOrRemoveAll();
+ public void evict(Object key) throws CacheException {
+ cacheAdapter.remove(key);
}
- private void evictOrRemoveAll() throws CacheException {
- cache.clear();
+ public void evictAll() throws CacheException {
+ Transaction tx = region.suspend();
+ try {
+ CacheHelper.sendEvictAllNotification(cacheAdapter, region.getAddress());
+ } finally {
+ region.resume(tx);
+ }
}
}
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -8,17 +8,19 @@
import org.hibernate.cache.access.AccessType;
import org.hibernate.cache.access.CollectionRegionAccessStrategy;
import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.infinispan.notifications.Listener;
/**
* @author Chris Bredesen
* @author Galder Zamarreño
* @since 3.5
*/
+@Listener
public class CollectionRegionImpl extends BaseTransactionalDataRegion implements CollectionRegion {
- public CollectionRegionImpl(Cache cache, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
- super(cache, name, metadata, transactionManager);
+ public CollectionRegionImpl(CacheAdapter cacheAdapter, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
+ super(cacheAdapter, name, metadata, transactionManager);
}
public CollectionRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -21,11 +21,11 @@
TransactionalAccess(CollectionRegionImpl region) {
this.region = region;
- this.delegate = new TransactionalAccessDelegate(region.getCache());
+ this.delegate = new TransactionalAccessDelegate(region);
}
public void evict(Object key) throws CacheException {
- delegate.remove(key);
+ delegate.evict(key);
}
public void evictAll() throws CacheException {
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -8,17 +8,19 @@
import org.hibernate.cache.access.AccessType;
import org.hibernate.cache.access.EntityRegionAccessStrategy;
import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.infinispan.notifications.Listener;
/**
* @author Chris Bredesen
* @author Galder Zamarreño
* @since 3.5
*/
+@Listener
public class EntityRegionImpl extends BaseTransactionalDataRegion implements EntityRegion {
- public EntityRegionImpl(Cache cache, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
- super(cache, name, metadata, transactionManager);
+ public EntityRegionImpl(CacheAdapter cacheAdapter, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
+ super(cacheAdapter, name, metadata, transactionManager);
}
public EntityRegionAccessStrategy buildAccessStrategy(AccessType accessType) throws CacheException {
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -21,11 +21,11 @@
TransactionalAccess(EntityRegionImpl region) {
this.region = region;
- this.delegate = new TransactionalAccessDelegate(region.getCache());
+ this.delegate = new TransactionalAccessDelegate(region);
}
public void evict(Object key) throws CacheException {
- delegate.remove(key);
+ delegate.evict(key);
}
public void evictAll() throws CacheException {
@@ -41,8 +41,7 @@
}
public boolean insert(Object key, Object value, Object version) throws CacheException {
- region.getCache().put(key, value);
- return true; // TODO this is suspect
+ return delegate.insert(key, value, version);
}
public boolean putFromLoad(Object key, Object value, long txTimestamp, Object version) throws CacheException {
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -4,7 +4,7 @@
import org.hibernate.cache.CacheException;
import org.hibernate.cache.GeneralDataRegion;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
/**
* Support for Infinispan {@link GeneralDataRegion} implementors.
@@ -15,24 +15,24 @@
*/
public abstract class BaseGeneralDataRegion extends BaseRegion implements GeneralDataRegion {
- public BaseGeneralDataRegion(Cache cache, String name, TransactionManager transactionManager) {
- super(cache, name, transactionManager);
+ public BaseGeneralDataRegion(CacheAdapter cacheAdapter, String name, TransactionManager transactionManager) {
+ super(cacheAdapter, name, transactionManager);
}
public void evict(Object key) throws CacheException {
- getCache().evict(key);
+ cacheAdapter.evict(key);
}
public void evictAll() throws CacheException {
- getCache().clear();
+ cacheAdapter.clear();
}
public Object get(Object key) throws CacheException {
- return getCache().get(key);
+ return cacheAdapter.get(key);
}
public void put(Object key, Object value) throws CacheException {
- getCache().put(key, value);
+ cacheAdapter.put(key, value);
}
}
\ No newline at end of file
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -1,6 +1,11 @@
package org.hibernate.cache.infinispan.impl;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
@@ -8,9 +13,19 @@
import org.hibernate.cache.CacheException;
import org.hibernate.cache.Region;
+import org.hibernate.cache.infinispan.util.AddressAdapter;
+import org.hibernate.cache.infinispan.util.AddressAdapterImpl;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cache.infinispan.util.CacheHelper;
-import org.infinispan.Cache;
-import org.infinispan.context.Flag;
+import org.hibernate.cache.infinispan.util.FlagAdapter;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryInvalidated;
+import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
+import org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent;
+import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
+import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged;
+import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
/**
* Support for Infinispan {@link Region}s. Handles common "utility" methods for an underlying named
@@ -22,26 +37,69 @@
* @since 3.5
*/
public abstract class BaseRegion implements Region {
- private final Cache cache;
+ private enum InvalidateState { INVALID, CLEARING, VALID };
+ private static final Log log = LogFactory.getLog(BaseRegion.class);
private final String name;
+ protected final CacheAdapter cacheAdapter;
+ protected final AddressAdapter address;
+ protected final Set<AddressAdapter> currentView = new HashSet<AddressAdapter>();
protected final TransactionManager transactionManager;
+ protected final boolean replication;
+ protected final Object invalidationMutex = new Object();
+ protected final AtomicReference<InvalidateState> invalidateState = new AtomicReference<InvalidateState>(InvalidateState.VALID);
- public BaseRegion(Cache cache, String name, TransactionManager transactionManager) {
- this.cache = cache;
+ public BaseRegion(CacheAdapter cacheAdapter, String name, TransactionManager transactionManager) {
+ this.cacheAdapter = cacheAdapter;
this.name = name;
this.transactionManager = transactionManager;
+ this.replication = cacheAdapter.isClusteredReplication();
+ this.address = this.cacheAdapter.getAddress();
+ this.cacheAdapter.addListener(this);
}
- public Cache getCache() {
- return cache;
+ public void start() {
+ if (address != null) {
+ synchronized (currentView) {
+ List<AddressAdapter> view = cacheAdapter.getMembers();
+ if (view != null) {
+ currentView.addAll(view);
+ establishInternalNodes();
+ }
+ }
+ }
}
+ /**
+ * Calls to this method must be done from synchronized (currentView) blocks only!!
+ */
+ private void establishInternalNodes() {
+ Transaction tx = suspend();
+ try {
+ for (AddressAdapter member : currentView) {
+ CacheHelper.initInternalEvict(cacheAdapter, member);
+ }
+ } finally {
+ resume(tx);
+ }
+ }
+
public String getName() {
return name;
}
+ public CacheAdapter getCacheAdapter() {
+ return cacheAdapter;
+ }
+
public long getElementCountInMemory() {
- return cache.size();
+ if (checkValid()) {
+ Set keySet = cacheAdapter.keySet();
+ int size = cacheAdapter.size();
+ if (CacheHelper.containsEvictAllNotification(keySet, address))
+ size--;
+ return size;
+ }
+ return 0;
}
/**
@@ -71,17 +129,64 @@
}
public Map toMap() {
- return cache;
+ if (checkValid()) {
+ Map map = cacheAdapter.toMap();
+ Set keys = map.keySet();
+ for (Object key : keys) {
+ if (CacheHelper.isEvictAllNotification(key)) {
+ map.remove(key);
+ }
+ }
+ return map;
+ }
+ return Collections.EMPTY_MAP;
}
public void destroy() throws CacheException {
- cache.clear();
+ try {
+ cacheAdapter.clear();
+ } finally {
+ cacheAdapter.removeListener(this);
+ }
}
public boolean contains(Object key) {
- return CacheHelper.containsKey(cache, key, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT);
+ if (!checkValid())
+ return false;
+ // Reads are non-blocking in Infinispan, so not sure of the necessity of passing ZERO_LOCK_ACQUISITION_TIMEOUT
+ return cacheAdapter.withFlags(FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT).containsKey(key);
}
-
+
+ public AddressAdapter getAddress() {
+ return address;
+ }
+
+ public boolean checkValid() {
+ boolean valid = invalidateState.get() == InvalidateState.VALID;
+ if (!valid) {
+ synchronized (invalidationMutex) {
+ if (invalidateState.compareAndSet(InvalidateState.INVALID, InvalidateState.CLEARING)) {
+ Transaction tx = suspend();
+ try {
+ cacheAdapter.withFlags(FlagAdapter.CACHE_MODE_LOCAL, FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT).clear();
+ invalidateState.compareAndSet(InvalidateState.CLEARING, InvalidateState.VALID);
+ }
+ catch (Exception e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Could not invalidate region: " + e.getLocalizedMessage());
+ }
+ }
+ finally {
+ resume(tx);
+ }
+ }
+ }
+ valid = invalidateState.get() == InvalidateState.VALID;
+ }
+
+ return valid;
+ }
+
/**
* Performs a JBoss Cache <code>get(Fqn, Object)</code> after first
* {@link #suspend suspending any ongoing transaction}. Wraps any exception
@@ -93,13 +198,13 @@
* @return The retrieved object
* @throws CacheException issue managing transaction or talking to cache
*/
- protected Object suspendAndGet(Object key, Flag opt, boolean suppressTimeout) throws CacheException {
+ protected Object suspendAndGet(Object key, FlagAdapter opt, boolean suppressTimeout) throws CacheException {
Transaction tx = suspend();
try {
if (suppressTimeout)
- return CacheHelper.getAllowingTimeout(cache, key);
+ return cacheAdapter.getAllowingTimeout(key);
else
- return CacheHelper.get(cache, key);
+ return cacheAdapter.get(key);
} finally {
resume(tx);
}
@@ -111,7 +216,7 @@
* @return the transaction that was suspended, or <code>null</code> if
* there wasn't one
*/
- protected Transaction suspend() {
+ public Transaction suspend() {
Transaction tx = null;
try {
if (transactionManager != null) {
@@ -122,14 +227,14 @@
}
return tx;
}
-
+
/**
* Tell the TransactionManager to resume the given transaction
*
* @param tx
* the transaction to suspend. May be <code>null</code>.
*/
- protected void resume(Transaction tx) {
+ public void resume(Transaction tx) {
try {
if (tx != null)
transactionManager.resume(tx);
@@ -138,4 +243,44 @@
}
}
+ @CacheEntryModified
+ public void entryModified(CacheEntryModifiedEvent event) {
+ handleEvictAllModification(event);
+ }
+
+ protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) {
+ if (!event.isPre() && (replication || event.isOriginLocal()) && CacheHelper.isEvictAllNotification(event.getKey(), event.getValue())) {
+ if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was put: {0}", event);
+ invalidateState.set(InvalidateState.INVALID);
+ return true;
+ }
+ return false;
+ }
+
+ @CacheEntryInvalidated
+ public void entryInvalidated(CacheEntryInvalidatedEvent event) {
+ if (log.isTraceEnabled()) log.trace("Cache entry invalidated: {0}", event);
+ handleEvictAllInvalidation(event);
+ }
+
+ protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) {
+ if (!event.isPre() && CacheHelper.isEvictAllNotification(event.getKey())) {
+ if (log.isTraceEnabled()) log.trace("Set invalid state because marker cache entry was invalidated: {0}", event);
+ invalidateState.set(InvalidateState.INVALID);
+ return true;
+ }
+ return false;
+ }
+
+ @ViewChanged
+ public void viewChanged(ViewChangedEvent event) {
+ synchronized (currentView) {
+ List<AddressAdapter> view = AddressAdapterImpl.toAddressAdapter(event.getNewMembers());
+ if (view != null) {
+ currentView.addAll(view);
+ establishInternalNodes();
+ }
+ }
+ }
+
}
\ No newline at end of file
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -4,7 +4,7 @@
import org.hibernate.cache.CacheDataDescription;
import org.hibernate.cache.TransactionalDataRegion;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
/**
* Support for Inifinispan {@link TransactionalDataRegion} implementors.
@@ -17,8 +17,8 @@
private final CacheDataDescription metadata;
- public BaseTransactionalDataRegion(Cache cache, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
- super(cache, name, transactionManager);
+ public BaseTransactionalDataRegion(CacheAdapter cacheAdapter, String name, CacheDataDescription metadata, TransactionManager transactionManager) {
+ super(cacheAdapter, name, transactionManager);
this.metadata = metadata;
}
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -2,74 +2,85 @@
import java.util.Properties;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.hibernate.cache.CacheException;
import org.hibernate.cache.QueryResultsRegion;
import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cache.infinispan.util.CacheHelper;
-import org.infinispan.Cache;
-import org.infinispan.context.Flag;
+import org.hibernate.cache.infinispan.util.FlagAdapter;
+import org.infinispan.notifications.Listener;
/**
* @author Chris Bredesen
* @author Galder Zamarreño
* @since 3.5
*/
+@Listener
public class QueryResultsRegionImpl extends BaseTransactionalDataRegion implements QueryResultsRegion {
private boolean localOnly;
- public QueryResultsRegionImpl(Cache cache, String name, Properties properties, TransactionManager transactionManager) {
- super(cache, name, null, transactionManager);
+ public QueryResultsRegionImpl(CacheAdapter cacheAdapter, String name, Properties properties, TransactionManager transactionManager) {
+ super(cacheAdapter, name, null, transactionManager);
// If Infinispan is using INVALIDATION for query cache, we don't want to propagate changes.
// We use the Timestamps cache to manage invalidation
- localOnly = CacheHelper.isClusteredInvalidation(cache);
+ localOnly = cacheAdapter.isClusteredInvalidation();
}
public void evict(Object key) throws CacheException {
if (localOnly)
- CacheHelper.removeKey(getCache(), key, Flag.CACHE_MODE_LOCAL);
+ cacheAdapter.withFlags(FlagAdapter.CACHE_MODE_LOCAL).remove(key);
else
- CacheHelper.removeKey(getCache(), key);
+ cacheAdapter.remove(key);
}
public void evictAll() throws CacheException {
- if (localOnly)
- CacheHelper.removeAll(getCache(), Flag.CACHE_MODE_LOCAL);
- else
- CacheHelper.removeAll(getCache());
+ Transaction tx = suspend();
+ try {
+ CacheHelper.sendEvictAllNotification(cacheAdapter, getAddress());
+ } finally {
+ resume(tx);
+ }
}
public Object get(Object key) throws CacheException {
+ if (!checkValid())
+ return null;
+
// Don't hold the JBC node lock throughout the tx, as that
// prevents updates
// Add a zero (or low) timeout option so we don't block
// waiting for tx's that did a put to commit
- return suspendAndGet(key, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT, true);
+ return suspendAndGet(key, FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT, true);
}
public void put(Object key, Object value) throws CacheException {
- // Here we don't want to suspend the tx. If we do:
- // 1) We might be caching query results that reflect uncommitted
- // changes. No tx == no WL on cache node, so other threads
- // can prematurely see those query results
- // 2) No tx == immediate replication. More overhead, plus we
- // spread issue #1 above around the cluster
+ if (checkValid()) {
+ // Here we don't want to suspend the tx. If we do:
+ // 1) We might be caching query results that reflect uncommitted
+ // changes. No tx == no WL on cache node, so other threads
+ // can prematurely see those query results
+ // 2) No tx == immediate replication. More overhead, plus we
+ // spread issue #1 above around the cluster
- // Add a zero (or quite low) timeout option so we don't block.
- // Ignore any TimeoutException. Basically we forego caching the
- // query result in order to avoid blocking.
- // Reads are done with suspended tx, so they should not hold the
- // lock for long. Not caching the query result is OK, since
- // any subsequent read will just see the old result with its
- // out-of-date timestamp; that result will be discarded and the
- // db query performed again.
- if (localOnly)
- CacheHelper.putAllowingTimeout(getCache(), key, value, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT, Flag.CACHE_MODE_LOCAL);
- else
- CacheHelper.putAllowingTimeout(getCache(), key, value, Flag.ZERO_LOCK_ACQUISITION_TIMEOUT);
-
+ // Add a zero (or quite low) timeout option so we don't block.
+ // Ignore any TimeoutException. Basically we forego caching the
+ // query result in order to avoid blocking.
+ // Reads are done with suspended tx, so they should not hold the
+ // lock for long. Not caching the query result is OK, since
+ // any subsequent read will just see the old result with its
+ // out-of-date timestamp; that result will be discarded and the
+ // db query performed again.
+ if (localOnly)
+ cacheAdapter.withFlags(FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT, FlagAdapter.CACHE_MODE_LOCAL)
+ .putAllowingTimeout(key, value);
+ else
+ cacheAdapter.withFlags(FlagAdapter.ZERO_LOCK_ACQUISITION_TIMEOUT)
+ .putAllowingTimeout(key, value);
+ }
}
}
\ No newline at end of file
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -10,12 +10,13 @@
import org.hibernate.cache.CacheException;
import org.hibernate.cache.TimestampsRegion;
import org.hibernate.cache.infinispan.impl.BaseGeneralDataRegion;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cache.infinispan.util.CacheHelper;
-import org.infinispan.Cache;
-import org.infinispan.context.Flag;
+import org.hibernate.cache.infinispan.util.FlagAdapter;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
+import org.infinispan.notifications.cachelistener.event.CacheEntryInvalidatedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent;
import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent;
@@ -31,26 +32,31 @@
private Map localCache = new ConcurrentHashMap();
- public TimestampsRegionImpl(Cache cache, String name, TransactionManager transactionManager) {
- super(cache, name, transactionManager);
- cache.addListener(this);
+ public TimestampsRegionImpl(CacheAdapter cacheAdapter, String name, TransactionManager transactionManager) {
+ super(cacheAdapter, name, transactionManager);
+ cacheAdapter.addListener(this);
populateLocalCache();
}
@Override
public void evict(Object key) throws CacheException {
// TODO Is this a valid operation on a timestamps cache?
- CacheHelper.removeKey(getCache(), key);
+ cacheAdapter.remove(key);
}
public void evictAll() throws CacheException {
// TODO Is this a valid operation on a timestamps cache?
- CacheHelper.removeAll(getCache());
+ Transaction tx = suspend();
+ try {
+ CacheHelper.sendEvictAllNotification(cacheAdapter, getAddress());
+ } finally {
+ resume(tx);
+ }
}
public Object get(Object key) throws CacheException {
Object value = localCache.get(key);
- if (value == null) {
+ if (value == null && checkValid()) {
value = suspendAndGet(key, null, false);
if (value != null)
localCache.put(key, value);
@@ -64,7 +70,7 @@
Transaction tx = suspend();
try {
// We ensure ASYNC semantics (JBCACHE-1175)
- CacheHelper.put(getCache(), key, value, Flag.FORCE_ASYNCHRONOUS);
+ cacheAdapter.withFlags(FlagAdapter.FORCE_ASYNCHRONOUS).put(key, value);
} catch (Exception e) {
throw new CacheException(e);
} finally {
@@ -75,7 +81,7 @@
@Override
public void destroy() throws CacheException {
localCache.clear();
- getCache().removeListener(this);
+ cacheAdapter.removeListener(this);
super.destroy();
}
@@ -86,8 +92,9 @@
*/
@CacheEntryModified
public void nodeModified(CacheEntryModifiedEvent event) {
- if (event.isPre()) return;
- localCache.put(event.getKey(), event.getValue());
+ if (!handleEvictAllModification(event) && !event.isPre()) {
+ localCache.put(event.getKey(), event.getValue());
+ }
}
/**
@@ -101,11 +108,29 @@
localCache.remove(event.getKey());
}
+ @Override
+ protected boolean handleEvictAllModification(CacheEntryModifiedEvent event) {
+ boolean result = super.handleEvictAllModification(event);
+ if (result) {
+ localCache.clear();
+ }
+ return result;
+ }
+
+ @Override
+ protected boolean handleEvictAllInvalidation(CacheEntryInvalidatedEvent event) {
+ boolean result = super.handleEvictAllInvalidation(event);
+ if (result) {
+ localCache.clear();
+ }
+ return result;
+ }
+
/**
* Brings all data from the distributed cache into our local cache.
*/
private void populateLocalCache() {
- Set children = CacheHelper.getKeySet(getCache());
+ Set children = cacheAdapter.keySet();
for (Object key : children)
get(key);
}
Added: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java (rev 0)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.cache.infinispan.util;
+
+/**
+ * AddressAdapter.
+ *
+ * @author Galder Zamarreño
+ * @since 3.5
+ */
+public interface AddressAdapter {
+}
Added: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java (rev 0)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.cache.infinispan.util;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.infinispan.remoting.transport.Address;
+
+/**
+ * AddressAdapterImpl.
+ *
+ * @author Galder Zamarreño
+ * @since 3.5
+ */
+public class AddressAdapterImpl implements AddressAdapter, Externalizable {
+
+ private Address address;
+
+ private AddressAdapterImpl(Address address) {
+ this.address = address;
+ }
+
+ static AddressAdapter newInstance(Address address) {
+ return new AddressAdapterImpl(address);
+ }
+
+ public static List<AddressAdapter> toAddressAdapter(List<Address> ispnAddresses) {
+ List<AddressAdapter> addresses = new ArrayList<AddressAdapter>(ispnAddresses.size());
+ for (Address address : ispnAddresses) {
+ addresses.add(AddressAdapterImpl.newInstance(address));
+ }
+ return addresses;
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ address = (Address) in.readObject();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(address);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+ if (!(obj instanceof AddressAdapterImpl))
+ return false;
+ AddressAdapterImpl other = (AddressAdapterImpl) obj;
+ return other.address.equals(address);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = 17;
+ result = 31 * result + address.hashCode();
+ return result;
+ }
+}
Added: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java (rev 0)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -0,0 +1,207 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.cache.infinispan.util;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hibernate.cache.CacheException;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.util.concurrent.TimeoutException;
+
+/**
+ * Infinispan cache abstraction.
+ *
+ * @author Galder Zamarreño
+ * @since 3.5
+ */
+public interface CacheAdapter {
+
+ /**
+ * Is this cache participating in a cluster with invalidation?
+ *
+ * @return true if the cache is configured for synchronous/asynchronous invalidation; false otherwise.
+ */
+ boolean isClusteredInvalidation();
+
+ /**
+ * Is this cache participating in a cluster with replication?
+ *
+ * @return true if the cache is configured for synchronous/asynchronous invalidation; false otherwise.
+ */
+ boolean isClusteredReplication();
+
+ /**
+ * Is this cache configured for synchronous communication?
+ *
+ * @return true if the cache is configured for synchronous communication; false otherwise.
+ */
+ boolean isSynchronous();
+
+ /**
+ * Set of keys of this cache.
+ *
+ * @return Set containing keys stored in this cache.
+ */
+ Set keySet();
+
+ /**
+ * A builder-style method that adds flags to any cache API call.
+ *
+ * @param flagAdapters a set of flags to apply. See the {@link FlagAdapter} documentation.
+ * @return a cache on which a real operation is to be invoked.
+ */
+ CacheAdapter withFlags(FlagAdapter... flagAdapters);
+
+ /**
+ * Method to check whether a certain key exists in this cache.
+ *
+ * @param key key to look up.
+ * @return true if key is present, false otherwise.
+ */
+ boolean containsKey(Object key);
+
+ /**
+ * Performs an <code>get(Object)</code> on the cache, wrapping any exception in a {@link CacheException}.
+ *
+ * @param key key to retrieve
+ * @throws CacheException
+ */
+ Object get(Object key) throws CacheException;
+
+ /**
+ * Performs an <code>get(Object)</code> on the cache ignoring any {@link TimeoutException}
+ * and wrapping any other exception in a {@link CacheException}.
+ *
+ * @param key key to retrieve
+ * @throws CacheException
+ */
+ Object getAllowingTimeout(Object key) throws CacheException;
+
+ /**
+ * Performs a <code>put(Object, Object)</code> on the cache, wrapping any exception in a {@link CacheException}.
+ *
+ * @param key key whose value will be modified
+ * @param value data to store in the cache entry
+ * @return the previous value associated with <tt>key</tt>, or <tt>null</tt>
+ * if there was no mapping for <tt>key</tt>.
+ * @throws CacheException
+ */
+ Object put(Object key, Object value) throws CacheException;
+
+ /**
+ * Performs a <code>put(Object, Object)</code> on the cache ignoring any {@link TimeoutException}
+ * and wrapping any exception in a {@link CacheException}.
+ *
+ * @param key key whose value will be modified
+ * @param value data to store in the cache entry
+ * @return the previous value associated with <tt>key</tt>, or <tt>null</tt>
+ * if there was no mapping for <tt>key</tt>.
+ * @throws CacheException
+ */
+ Object putAllowingTimeout(Object key, Object value) throws CacheException;
+
+ /**
+ * See {@link Cache#putForExternalRead(Object, Object)} for detailed documentation.
+ *
+ * @param key key with which the specified value is to be associated.
+ * @param value value to be associated with the specified key.
+ * @throws CacheException
+ */
+ void putForExternalRead(Object key, Object value) throws CacheException;
+
+ /**
+ * Performs a <code>remove(Object)</code>, wrapping any exception in a {@link CacheException}.
+ *
+ * @param key key to be removed
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>.
+ * @throws CacheException
+ */
+ Object remove(Object key) throws CacheException;
+
+ /**
+ * Evict the given key from memory.
+ *
+ * @param key to evict.
+ */
+ void evict(Object key) throws CacheException;
+
+ /**
+ * Clear the cache.
+ *
+ * @throws CacheException
+ */
+ void clear() throws CacheException;
+
+ /**
+ * Add listener to this cache.
+ *
+ * @param listener to be added to cache.
+ */
+ void addListener(Object listener);
+
+ /**
+ * Get local cluster address.
+ *
+ * @return Address representing local address.
+ */
+ AddressAdapter getAddress();
+
+ /**
+ * Get cluster members.
+ *
+ * @return List of cluster member Address instances
+ */
+ List<AddressAdapter> getMembers();
+
+ /**
+ * Size of cache.
+ *
+ * @return number of cache entries.
+ */
+ int size();
+
+ /**
+ * This method returns a Map view of the cache.
+ *
+ * @return Map view of cache.
+ */
+ Map toMap();
+
+ /**
+ * Remove listener from cache instance.
+ *
+ * @param listener to be removed.
+ */
+ void removeListener(Object listener);
+
+ /**
+ * Get cache configuration.
+ *
+ * @return Configuration instance associated with this cache.
+ */
+ Configuration getConfiguration();
+}
Added: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java (rev 0)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -0,0 +1,205 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.cache.infinispan.util;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hibernate.cache.CacheException;
+import org.infinispan.Cache;
+import org.infinispan.config.Configuration;
+import org.infinispan.context.Flag;
+import org.infinispan.remoting.rpc.RpcManager;
+import org.infinispan.util.concurrent.TimeoutException;
+
+/**
+ * CacheAdapterImpl.
+ *
+ * @author Galder Zamarreño
+ * @since 3.5
+ */
+public class CacheAdapterImpl implements CacheAdapter {
+
+ private final Cache cache;
+
+ private CacheAdapterImpl(Cache cache) {
+ this.cache = cache;
+ }
+
+ public static CacheAdapter newInstance(Cache cache) {
+ return new CacheAdapterImpl(cache);
+ }
+
+ public boolean isClusteredInvalidation() {
+ return isClusteredInvalidation(cache.getConfiguration().getCacheMode());
+ }
+
+ public boolean isClusteredReplication() {
+ return isClusteredReplication(cache.getConfiguration().getCacheMode());
+ }
+
+ public boolean isSynchronous() {
+ return isSynchronous(cache.getConfiguration().getCacheMode());
+ }
+
+ public Set keySet() {
+ return cache.keySet();
+ }
+
+ public CacheAdapter withFlags(FlagAdapter... flagAdapters) {
+ Flag[] flags = FlagAdapter.toFlags(flagAdapters);
+ return newInstance(cache.getAdvancedCache().withFlags(flags));
+ }
+
+ public Object get(Object key) throws CacheException {
+ try {
+ return cache.get(key);
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public Object getAllowingTimeout(Object key) throws CacheException {
+ try {
+ return cache.get(key);
+ } catch (TimeoutException ignored) {
+ // ignore it
+ return null;
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public Object put(Object key, Object value) throws CacheException {
+ try {
+ return cache.put(key, value);
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public Object putAllowingTimeout(Object key, Object value) throws CacheException {
+ try {
+ return cache.put(key, value);
+ } catch (TimeoutException allowed) {
+ // ignore it
+ return null;
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public void putForExternalRead(Object key, Object value) throws CacheException {
+ try {
+ cache.putForExternalRead(key, value);
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public Object remove(Object key) throws CacheException {
+ try {
+ return cache.remove(key);
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public void evict(Object key) throws CacheException {
+ try {
+ cache.evict(key);
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ public void clear() throws CacheException {
+ try {
+ cache.clear();
+ } catch (Exception e) {
+ throw new CacheException(e);
+ }
+ }
+
+ private static boolean isClusteredInvalidation(Configuration.CacheMode cacheMode) {
+ return cacheMode == Configuration.CacheMode.INVALIDATION_ASYNC
+ || cacheMode == Configuration.CacheMode.INVALIDATION_SYNC;
+ }
+
+ private static boolean isClusteredReplication(Configuration.CacheMode cacheMode) {
+ return cacheMode == Configuration.CacheMode.REPL_ASYNC
+ || cacheMode == Configuration.CacheMode.REPL_SYNC;
+ }
+
+ private static boolean isSynchronous(Configuration.CacheMode cacheMode) {
+ return cacheMode == Configuration.CacheMode.REPL_SYNC
+ || cacheMode == Configuration.CacheMode.INVALIDATION_SYNC
+ || cacheMode == Configuration.CacheMode.DIST_SYNC;
+ }
+
+ public void addListener(Object listener) {
+ cache.addListener(listener);
+ }
+
+ public AddressAdapter getAddress() {
+ RpcManager rpc = cache.getAdvancedCache().getRpcManager();
+ if (rpc != null) {
+ return AddressAdapterImpl.newInstance(rpc.getTransport().getAddress());
+ }
+ return null;
+ }
+
+ public List<AddressAdapter> getMembers() {
+ RpcManager rpc = cache.getAdvancedCache().getRpcManager();
+ if (rpc != null) {
+ return AddressAdapterImpl.toAddressAdapter(rpc.getTransport().getMembers());
+ }
+ return null;
+ }
+
+ public RpcManager getRpcManager() {
+ return cache.getAdvancedCache().getRpcManager();
+ }
+
+ public int size() {
+ return cache.size();
+ }
+
+ public Map toMap() {
+ return cache;
+ }
+
+ public void removeListener(Object listener) {
+ cache.removeListener(listener);
+ }
+
+ public boolean containsKey(Object key) {
+ return cache.containsKey(key);
+ }
+
+ public Configuration getConfiguration() {
+ return cache.getConfiguration();
+ }
+
+}
Modified: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -23,13 +23,12 @@
*/
package org.hibernate.cache.infinispan.util;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Set;
-import org.hibernate.cache.CacheException;
-import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.context.Flag;
-import org.infinispan.util.concurrent.TimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,324 +48,68 @@
private CacheHelper() {
}
- /**
- * Is this cache participating in a cluster with invalidation?
- *
- * @param cache
- * The cache to check.
- * @return True if the cache is configured for synchronous/asynchronous invalidation; false
- * otherwise.
- */
- public static boolean isClusteredInvalidation(Cache cache) {
- return isClusteredInvalidation(cache.getConfiguration().getCacheMode());
+ public static void initInternalEvict(CacheAdapter cacheAdapter, AddressAdapter member) {
+ EvictAll eKey = new EvictAll(member == null ? NoAddress.INSTANCE : member);
+ cacheAdapter.withFlags(FlagAdapter.CACHE_MODE_LOCAL).put(eKey, Internal.INIT);
}
- /**
- * Does this cache mode indicate clustered invalidation?
- *
- * @param cacheMode
- * The cache to check
- * @return True if the cache mode is confiogured for synchronous/asynchronous invalidation; false
- * otherwise.
- */
- public static boolean isClusteredInvalidation(Configuration.CacheMode cacheMode) {
- return cacheMode == Configuration.CacheMode.INVALIDATION_ASYNC
- || cacheMode == Configuration.CacheMode.INVALIDATION_SYNC;
+ public static void sendEvictAllNotification(CacheAdapter cacheAdapter, AddressAdapter member) {
+ EvictAll eKey = new EvictAll(member == null ? NoAddress.INSTANCE : member);
+ cacheAdapter.put(eKey, Internal.EVICT);
}
- /**
- * Is this cache participating in a cluster with replication?
- *
- * @param cache
- * The cache to check.
- * @return True if the cache is configured for synchronous/asynchronous invalidation; false
- * otherwise.
- */
- public static boolean isClusteredReplication(Cache cache) {
- return isClusteredReplication(cache.getConfiguration().getCacheMode());
+ public static boolean isEvictAllNotification(Object key) {
+ return key instanceof EvictAll;
}
- /**
- * Does this cache mode indicate clustered replication?
- *
- * @param cacheMode
- * The cache to check
- * @return True if the cache mode is confiogured for synchronous/asynchronous invalidation; false
- * otherwise.
- */
- public static boolean isClusteredReplication(Configuration.CacheMode cacheMode) {
- return cacheMode == Configuration.CacheMode.REPL_ASYNC || cacheMode == Configuration.CacheMode.REPL_SYNC;
+ public static boolean containsEvictAllNotification(Set keySet, AddressAdapter member) {
+ EvictAll eKey = new EvictAll(member == null ? NoAddress.INSTANCE : member);
+ return keySet.contains(eKey);
}
- public static boolean isSynchronous(Cache cache) {
- return isSynchronous(cache.getConfiguration().getCacheMode());
+ public static boolean isEvictAllNotification(Object key, Object value) {
+ return key instanceof EvictAll && value == Internal.EVICT;
}
- public static boolean isSynchronous(Configuration.CacheMode cacheMode) {
- return cacheMode == Configuration.CacheMode.REPL_SYNC || cacheMode == Configuration.CacheMode.INVALIDATION_SYNC;
- }
+ private static class EvictAll implements Externalizable {
+ AddressAdapter member;
- public static Set getKeySet(Cache cache) {
- return cache.keySet();
- }
-
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>get(Fqn, Object)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- */
- public static Object get(Cache cache, Object key) throws CacheException {
- try {
- return cache.get(key);
- } catch (Exception e) {
- throw new CacheException(e);
+ EvictAll(AddressAdapter member) {
+ this.member = member;
}
- }
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>get(Fqn, Object)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- */
- public static Object getAllowingTimeout(Cache cache, Object key) throws CacheException {
- try {
- return cache.get(key);
- } catch (TimeoutException ignored) {
- // ignore it
- return null;
- } catch (Exception e) {
- throw new CacheException(e);
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+ if (!(obj instanceof EvictAll))
+ return false;
+ EvictAll ek = (EvictAll) obj;
+ return ek.member.equals(member);
}
- }
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>put(Object, Object)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param value
- * data to store in the cache node
- */
- public static void put(Cache cache, Object key, Object value) throws CacheException {
- put(cache, key, value, null);
- }
-
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>put(Object, Object)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param value
- * data to store in the cache node
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static void put(Cache cache, Object key, Object value, Flag option) throws CacheException {
- try {
- cache.getAdvancedCache().put(key, value, option);
- } catch (Exception e) {
- throw new CacheException(e);
+ @Override
+ public int hashCode() {
+ int result = 17;
+ result = 31 * result + member.hashCode();
+ return result;
}
- }
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>put(Object, Object)</code>, ignoring any {@link TimeoutException} and wrapping any other
- * exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param value
- * data to store in the cache node
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static void putAllowingTimeout(Cache cache, Object key, Object value, Flag... option) throws CacheException {
- try {
- cache.getAdvancedCache().put(key, value, option);
- } catch (TimeoutException allowed) {
- // ignore it
- } catch (Exception e) {
- throw new CacheException(e);
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ member = (AddressAdapter) in.readObject();
}
- }
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>putForExternalRead(Object, Object)</code>, wrapping any exception in a
- * {@link CacheException}. Ignores any JBoss Cache {@link TimeoutException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param value
- * data to store in the cache node
- */
- public static boolean putForExternalRead(Cache cache, Object key, Object value) throws CacheException {
- return putForExternalRead(cache, key, value, (Flag[])null);
- }
-
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>putForExternalRead(Object, Object)</code>, wrapping any exception in a
- * {@link CacheException}. Ignores any JBoss Cache {@link TimeoutException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param value
- * data to store in the cache node
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static boolean putForExternalRead(Cache cache, Object key, Object value, Flag... option) throws CacheException {
- try {
- cache.getAdvancedCache().putForExternalRead(key, value, option);
- return true;
- } catch (TimeoutException te) {
- // ignore!
- log.debug("ignoring write lock acquisition failure");
- return false;
- } catch (Throwable t) {
- throw new CacheException(t);
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(member);
}
}
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>removeNode(Fqn)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- */
- public static void remove(Cache cache, Object key) throws CacheException {
- remove(cache, key, null);
+ private enum NoAddress implements AddressAdapter {
+ INSTANCE;
}
- /**
- * Builds an {@link Fqn} from <code>region</code> and <code>key</code> and performs a JBoss Cache
- * <code>removeNode(Fqn)</code>, wrapping any exception in a {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param key
- * specific key to append to the <code>region</code> to form the full Fqn
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static void remove(Cache cache, Object key, Flag option) throws CacheException {
- try {
- cache.getAdvancedCache().remove(key, option);
- } catch (Exception e) {
- throw new CacheException(e);
- }
+ private enum Internal {
+ INIT, EVICT;
}
- /**
- * Performs a JBoss Cache <code>removeNode(Fqn)</code>, wrapping any exception in a
- * {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- */
- public static void removeAll(Cache cache) throws CacheException {
- try {
- cache.clear();
- } catch (Exception e) {
- throw new CacheException(e);
- }
- }
-
- /**
- * Performs a JBoss Cache <code>removeNode(Fqn)</code>, wrapping any exception in a
- * {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static void removeAll(Cache cache, Flag option) throws CacheException {
- try {
- cache.getAdvancedCache().clear(option);
- } catch (Exception e) {
- throw new CacheException(e);
- }
- }
-
- /**
- * Performs a JBoss Cache <code>removeNode(Fqn)</code>, wrapping any exception in a
- * {@link CacheException}.
- *
- * @param cache
- * the cache to invoke on
- * @param region
- * base Fqn for the cache region
- * @param option
- * invocation Option to set for this invocation. May be <code>null</code>.
- */
- public static void removeKey(Cache cache, Object key, Flag option) throws CacheException {
- try {
- cache.getAdvancedCache().remove(key, option);
- } catch (Exception e) {
- throw new CacheException(e);
- }
- }
-
- public static void removeKey(Cache cache, Object key) throws CacheException {
- try {
- cache.remove(key);
- } catch (Exception e) {
- throw new CacheException(e);
- }
- }
-
- public static boolean containsKey(Cache cache, Object key, Flag... flags) {
- try {
- return cache.getAdvancedCache().containsKey(key, flags);
- } catch (Exception e) {
- throw new CacheException(e);
- }
- }
-
}
Added: core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java
===================================================================
--- core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java (rev 0)
+++ core/trunk/cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and
+ * individual contributors as indicated by the @author tags. See the
+ * copyright.txt file in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.hibernate.cache.infinispan.util;
+
+import org.hibernate.cache.CacheException;
+import org.infinispan.context.Flag;
+
+/**
+ * FlagAdapter.
+ *
+ * @author Galder Zamarreño
+ * @since 3.5
+ */
+public enum FlagAdapter {
+ ZERO_LOCK_ACQUISITION_TIMEOUT,
+ CACHE_MODE_LOCAL,
+ FORCE_ASYNCHRONOUS;
+
+ Flag toFlag() {
+ switch(this) {
+ case ZERO_LOCK_ACQUISITION_TIMEOUT:
+ return Flag.ZERO_LOCK_ACQUISITION_TIMEOUT;
+ case CACHE_MODE_LOCAL:
+ return Flag.CACHE_MODE_LOCAL;
+ case FORCE_ASYNCHRONOUS:
+ return Flag.FORCE_ASYNCHRONOUS;
+ default:
+ throw new CacheException("Unmatched Infinispan flag " + this);
+ }
+ }
+
+ static Flag[] toFlags(FlagAdapter[] adapters) {
+ Flag[] flags = new Flag[adapters.length];
+ for (int i = 0; i < adapters.length; i++) {
+ flags[i] = adapters[i].toFlag();
+ }
+ return flags;
+ }
+}
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -29,10 +29,9 @@
import org.hibernate.cache.QueryResultsRegion;
import org.hibernate.cache.Region;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
-import org.hibernate.cache.infinispan.util.CacheHelper;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
-import org.infinispan.Cache;
import org.infinispan.transaction.tm.BatchModeTransactionManager;
/**
@@ -74,8 +73,8 @@
private void evictOrRemoveTest() throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(cfg, getCacheTestSupport());
- Cache localCache = getInfinispanCache(regionFactory);
- boolean invalidation = CacheHelper.isClusteredInvalidation(localCache);
+ CacheAdapter localCache = getInfinispanCache(regionFactory);
+ boolean invalidation = localCache.isClusteredInvalidation();
// Sleep a bit to avoid concurrent FLUSH problem
avoidConcurrentFlush();
@@ -123,7 +122,7 @@
private void evictOrRemoveAllTest(String configName) throws Exception {
Configuration cfg = createConfiguration();
InfinispanRegionFactory regionFactory = CacheTestUtil.startRegionFactory(cfg, getCacheTestSupport());
- Cache localCache = getInfinispanCache(regionFactory);
+ CacheAdapter localCache = getInfinispanCache(regionFactory);
// Sleep a bit to avoid concurrent FLUSH problem
avoidConcurrentFlush();
@@ -133,7 +132,7 @@
cfg = createConfiguration();
regionFactory = CacheTestUtil.startRegionFactory(cfg, getCacheTestSupport());
- Cache remoteCache = getInfinispanCache(regionFactory);
+ CacheAdapter remoteCache = getInfinispanCache(regionFactory);
// Sleep a bit to avoid concurrent FLUSH problem
avoidConcurrentFlush();
@@ -141,11 +140,11 @@
GeneralDataRegion remoteRegion = (GeneralDataRegion) createRegion(regionFactory,
getStandardRegionName(REGION_PREFIX), cfg.getProperties(), null);
- Set children = CacheHelper.getKeySet(localCache);
- assertEquals("No children in " + children, 0, children.size());
+ Set keys = localCache.keySet();
+ assertEquals("No valid children in " + keys, 0, getValidKeyCount(keys));
- children = CacheHelper.getKeySet(remoteCache);
- assertEquals("No children in " + children, 0, children.size());
+ keys = remoteCache.keySet();
+ assertEquals("No valid children in " + keys, 0, getValidKeyCount(keys));
assertNull("local is clean", localRegion.get(KEY));
assertNull("remote is clean", remoteRegion.get(KEY));
@@ -168,11 +167,13 @@
sleep(250);
// This should re-establish the region root node in the optimistic case
assertNull(localRegion.get(KEY));
+ assertEquals("No valid children in " + keys, 0, getValidKeyCount(localCache.keySet()));
// Re-establishing the region root on the local node doesn't
// propagate it to other nodes. Do a get on the remote node to re-establish
// This only adds a node in the case of optimistic locking
assertEquals(null, remoteRegion.get(KEY));
+ assertEquals("No valid children in " + keys, 0, getValidKeyCount(remoteCache.keySet()));
assertEquals("local is clean", null, localRegion.get(KEY));
assertEquals("remote is clean", null, remoteRegion.get(KEY));
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -23,7 +23,10 @@
*/
package org.hibernate.test.cache.infinispan;
+import java.util.Set;
+
import org.hibernate.cache.RegionFactory;
+import org.hibernate.cache.infinispan.util.CacheHelper;
import org.hibernate.junit.UnitTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestSupport;
import org.infinispan.Cache;
@@ -81,7 +84,7 @@
protected CacheTestSupport getCacheTestSupport() {
return testSupport;
}
-
+
protected void sleep(long ms) {
try {
Thread.sleep(ms);
@@ -94,4 +97,15 @@
protected void avoidConcurrentFlush() {
testSupport.avoidConcurrentFlush();
}
+
+ protected int getValidKeyCount(Set keys) {
+ int result = 0;
+ for (Object key : keys) {
+ if (!(CacheHelper.isEvictAllNotification(key))) {
+ result++;
+ }
+ }
+ return result;
+ }
+
}
\ No newline at end of file
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -29,8 +29,8 @@
import org.hibernate.cache.Region;
import org.hibernate.cache.impl.CacheDataDescriptionImpl;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.hibernate.util.ComparableComparator;
-import org.infinispan.Cache;
/**
* Base class for tests of Region implementations.
@@ -44,7 +44,7 @@
super(name);
}
- protected abstract Cache getInfinispanCache(InfinispanRegionFactory regionFactory);
+ protected abstract CacheAdapter getInfinispanCache(InfinispanRegionFactory regionFactory);
protected abstract Region createRegion(InfinispanRegionFactory regionFactory, String regionName, Properties properties, CacheDataDescription cdd);
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -29,7 +29,7 @@
import org.hibernate.cache.infinispan.entity.EntityRegionImpl;
import org.hibernate.cache.infinispan.query.QueryResultsRegionImpl;
import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl;
-import org.infinispan.Cache;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
import org.infinispan.config.Configuration;
import org.infinispan.config.Configuration.CacheMode;
import org.infinispan.eviction.EvictionStrategy;
@@ -125,13 +125,13 @@
assertFalse(factory.getDefinedConfigurations().contains(person));
assertNotNull(factory.getTypeOverrides().get(addresses));
assertFalse(factory.getDefinedConfigurations().contains(addresses));
- Cache cache = null;
+ CacheAdapter cache = null;
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion(person, p, null);
assertNotNull(factory.getTypeOverrides().get(person));
assertTrue(factory.getDefinedConfigurations().contains(person));
assertNull(factory.getTypeOverrides().get(address));
- cache = region.getCache();
+ cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.LRU, cacheCfg.getEvictionStrategy());
assertEquals(2000, cacheCfg.getEvictionWakeUpInterval());
@@ -143,7 +143,7 @@
assertNotNull(factory.getTypeOverrides().get(person));
assertTrue(factory.getDefinedConfigurations().contains(person));
assertNull(factory.getTypeOverrides().get(address));
- cache = region.getCache();
+ cache = region.getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.FIFO, cacheCfg.getEvictionStrategy());
assertEquals(3000, cacheCfg.getEvictionWakeUpInterval());
@@ -153,7 +153,7 @@
assertNotNull(factory.getTypeOverrides().get(person));
assertTrue(factory.getDefinedConfigurations().contains(person));
assertNull(factory.getTypeOverrides().get(address));
- cache = region.getCache();
+ cache = region.getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.FIFO, cacheCfg.getEvictionStrategy());
assertEquals(3000, cacheCfg.getEvictionWakeUpInterval());
@@ -163,7 +163,7 @@
assertNotNull(factory.getTypeOverrides().get(addresses));
assertTrue(factory.getDefinedConfigurations().contains(person));
assertNull(factory.getTypeOverrides().get(parts));
- cache = collectionRegion .getCache();
+ cache = collectionRegion .getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.FIFO, cacheCfg.getEvictionStrategy());
assertEquals(2500, cacheCfg.getEvictionWakeUpInterval());
@@ -175,7 +175,7 @@
assertNotNull(factory.getTypeOverrides().get(addresses));
assertTrue(factory.getDefinedConfigurations().contains(addresses));
assertNull(factory.getTypeOverrides().get(parts));
- cache = collectionRegion.getCache();
+ cache = collectionRegion.getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.LRU, cacheCfg.getEvictionStrategy());
assertEquals(3500, cacheCfg.getEvictionWakeUpInterval());
@@ -185,7 +185,7 @@
assertNotNull(factory.getTypeOverrides().get(addresses));
assertTrue(factory.getDefinedConfigurations().contains(addresses));
assertNull(factory.getTypeOverrides().get(parts));
- cache = collectionRegion.getCache();
+ cache = collectionRegion.getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.LRU, cacheCfg.getEvictionStrategy());
assertEquals(3500, cacheCfg.getEvictionWakeUpInterval());
@@ -196,7 +196,7 @@
}
public void testBuildEntityCollectionRegionOverridesOnly() {
- Cache cache = null;
+ CacheAdapter cache = null;
Properties p = new Properties();
p.setProperty("hibernate.cache.infinispan.entity.eviction.strategy", "FIFO");
p.setProperty("hibernate.cache.infinispan.entity.eviction.wake_up_interval", "3000");
@@ -211,7 +211,7 @@
try {
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion("com.acme.Address", p, null);
assertNull(factory.getTypeOverrides().get("com.acme.Address"));
- cache = region.getCache();
+ cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.FIFO, cacheCfg.getEvictionStrategy());
assertEquals(3000, cacheCfg.getEvictionWakeUpInterval());
@@ -220,7 +220,7 @@
CollectionRegionImpl collectionRegion = (CollectionRegionImpl) factory.buildCollectionRegion("com.acme.Person.addresses", p, null);
assertNull(factory.getTypeOverrides().get("com.acme.Person.addresses"));
- cache = collectionRegion.getCache();
+ cache = collectionRegion.getCacheAdapter();
cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.LRU, cacheCfg.getEvictionStrategy());
assertEquals(3500, cacheCfg.getEvictionWakeUpInterval());
@@ -252,7 +252,7 @@
EntityRegionImpl region = (EntityRegionImpl) factory.buildEntityRegion(person, p, null);
assertNotNull(factory.getTypeOverrides().get(person));
assertTrue(factory.getDefinedConfigurations().contains(person));
- Cache cache = region.getCache();
+ CacheAdapter cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.LRU, cacheCfg.getEvictionStrategy());
assertEquals(3000, cacheCfg.getEvictionWakeUpInterval());
@@ -297,7 +297,7 @@
config.setFetchInMemoryState(false);
manager.defineConfiguration("timestamps", config);
TimestampsRegionImpl region = (TimestampsRegionImpl) factory.buildTimestampsRegion(timestamps, p);
- Cache cache = region.getCache();
+ CacheAdapter cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.NONE, cacheCfg.getEvictionStrategy());
assertEquals(CacheMode.REPL_ASYNC, cacheCfg.getCacheMode());
@@ -324,7 +324,7 @@
config.setCacheMode(CacheMode.REPL_SYNC);
manager.defineConfiguration("unrecommended-timestamps", config);
TimestampsRegionImpl region = (TimestampsRegionImpl) factory.buildTimestampsRegion(timestamps, p);
- Cache cache = region.getCache();
+ CacheAdapter cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(EvictionStrategy.NONE, cacheCfg.getEvictionStrategy());
assertEquals(CacheMode.REPL_SYNC, cacheCfg.getCacheMode());
@@ -400,7 +400,7 @@
try {
assertTrue(factory.getDefinedConfigurations().contains("local-query"));
QueryResultsRegionImpl region = (QueryResultsRegionImpl) factory.buildQueryResultsRegion(query, p);
- Cache cache = region.getCache();
+ CacheAdapter cache = region.getCacheAdapter();
Configuration cacheCfg = cache.getConfiguration();
assertEquals(CacheMode.LOCAL, cacheCfg.getCacheMode());
} finally {
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -38,13 +38,12 @@
import org.hibernate.cache.impl.CacheDataDescriptionImpl;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.impl.BaseRegion;
-import org.hibernate.cache.infinispan.util.CacheHelper;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.FlagAdapter;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
import org.hibernate.util.ComparableComparator;
-import org.infinispan.Cache;
-import org.infinispan.context.Flag;
import org.infinispan.transaction.tm.BatchModeTransactionManager;
/**
@@ -64,10 +63,10 @@
protected static Configuration localCfg;
protected static InfinispanRegionFactory localRegionFactory;
- protected Cache localCache;
+ protected CacheAdapter localCache;
protected static Configuration remoteCfg;
protected static InfinispanRegionFactory remoteRegionFactory;
- protected Cache remoteCache;
+ protected CacheAdapter remoteCache;
protected CollectionRegion localCollectionRegion;
protected CollectionRegionAccessStrategy localAccessStrategy;
@@ -112,17 +111,17 @@
localCollectionRegion = localRegionFactory.buildCollectionRegion(REGION_NAME, localCfg.getProperties(),
getCacheDataDescription());
- localCache = ((BaseRegion) localCollectionRegion).getCache();
+ localCache = ((BaseRegion) localCollectionRegion).getCacheAdapter();
localAccessStrategy = localCollectionRegion.buildAccessStrategy(getAccessType());
- invalidation = CacheHelper.isClusteredInvalidation(localCache);
- synchronous = CacheHelper.isSynchronous(localCache);
+ invalidation = localCache.isClusteredInvalidation();
+ synchronous = localCache.isSynchronous();
// Sleep a bit to avoid concurrent FLUSH problem
avoidConcurrentFlush();
remoteCollectionRegion = remoteRegionFactory.buildCollectionRegion(REGION_NAME, remoteCfg.getProperties(),
getCacheDataDescription());
- remoteCache = ((BaseRegion) remoteCollectionRegion).getCache();
+ remoteCache = ((BaseRegion) remoteCollectionRegion).getCacheAdapter();
remoteAccessStrategy = remoteCollectionRegion.buildAccessStrategy(getAccessType());
node1Exception = null;
@@ -142,13 +141,13 @@
remoteCollectionRegion.destroy();
try {
- localCache.getAdvancedCache().clear(Flag.CACHE_MODE_LOCAL);
+ localCache.withFlags(FlagAdapter.CACHE_MODE_LOCAL).clear();
} catch (Exception e) {
log.error("Problem purging local cache", e);
}
try {
- remoteCache.getAdvancedCache().clear(Flag.CACHE_MODE_LOCAL);
+ remoteCache.withFlags(FlagAdapter.CACHE_MODE_LOCAL).clear();
} catch (Exception e) {
log.error("Problem purging remote cache", e);
}
@@ -402,9 +401,9 @@
final String KEY = KEY_BASE + testCount++;
- assertEquals(0, localCache.keySet().size());
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
- assertEquals(0, remoteCache.keySet().size());
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
assertNull("local is clean", localAccessStrategy.get(KEY, System.currentTimeMillis()));
assertNull("remote is clean", remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
@@ -425,19 +424,19 @@
// This should re-establish the region root node
assertNull(localAccessStrategy.get(KEY, System.currentTimeMillis()));
- assertEquals(0, localCache.keySet().size());
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
// Re-establishing the region root on the local node doesn't
// propagate it to other nodes. Do a get on the remote node to re-establish
assertEquals(null, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
- assertEquals(0, remoteCache.keySet().size());
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
// Test whether the get above messes up the optimistic version
remoteAccessStrategy.putFromLoad(KEY, VALUE1, System.currentTimeMillis(), new Integer(1));
assertEquals(VALUE1, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
- assertEquals(1, remoteCache.keySet().size());
+ assertEquals(1, getValidKeyCount(remoteCache.keySet()));
// Wait for async propagation of the putFromLoad
sleep(250);
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -38,13 +38,12 @@
import org.hibernate.cache.impl.CacheDataDescriptionImpl;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
import org.hibernate.cache.infinispan.impl.BaseRegion;
-import org.hibernate.cache.infinispan.util.CacheHelper;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.FlagAdapter;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
import org.hibernate.util.ComparableComparator;
-import org.infinispan.Cache;
-import org.infinispan.context.Flag;
import org.infinispan.transaction.tm.BatchModeTransactionManager;
/**
@@ -64,10 +63,10 @@
protected static Configuration localCfg;
protected static InfinispanRegionFactory localRegionFactory;
- protected Cache localCache;
+ protected CacheAdapter localCache;
protected static Configuration remoteCfg;
protected static InfinispanRegionFactory remoteRegionFactory;
- protected Cache remoteCache;
+ protected CacheAdapter remoteCache;
protected boolean invalidation;
protected boolean synchronous;
@@ -114,10 +113,10 @@
.getProperties(), getCacheDataDescription());
localAccessStrategy = localEntityRegion.buildAccessStrategy(getAccessType());
- localCache = ((BaseRegion) localEntityRegion).getCache();
+ localCache = ((BaseRegion) localEntityRegion).getCacheAdapter();
- invalidation = CacheHelper.isClusteredInvalidation(localCache);
- synchronous = CacheHelper.isSynchronous(localCache);
+ invalidation = localCache.isClusteredInvalidation();
+ synchronous = localCache.isSynchronous();
// Sleep a bit to avoid concurrent FLUSH problem
avoidConcurrentFlush();
@@ -126,7 +125,7 @@
.getProperties(), getCacheDataDescription());
remoteAccessStrategy = remoteEntityRegion.buildAccessStrategy(getAccessType());
- remoteCache = ((BaseRegion) remoteEntityRegion).getCache();
+ remoteCache = ((BaseRegion) remoteEntityRegion).getCacheAdapter();
node1Exception = null;
node2Exception = null;
@@ -145,13 +144,13 @@
remoteEntityRegion.destroy();
try {
- localCache.getAdvancedCache().clear(Flag.CACHE_MODE_LOCAL);
+ localCache.withFlags(FlagAdapter.CACHE_MODE_LOCAL).clear();
} catch (Exception e) {
log.error("Problem purging local cache", e);
}
try {
- remoteCache.getAdvancedCache().clear(Flag.CACHE_MODE_LOCAL);
+ remoteCache.withFlags(FlagAdapter.CACHE_MODE_LOCAL).clear();
} catch (Exception e) {
log.error("Problem purging remote cache", e);
}
@@ -560,8 +559,9 @@
}
private void evictOrRemoveTest(boolean evict) {
-
final String KEY = KEY_BASE + testCount++;
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
assertNull("local is clean", localAccessStrategy.get(KEY, System.currentTimeMillis()));
assertNull("remote is clean", remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
@@ -571,26 +571,21 @@
remoteAccessStrategy.putFromLoad(KEY, VALUE1, System.currentTimeMillis(), new Integer(1));
assertEquals(VALUE1, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
- // Wait for async propagation
- sleep(250);
-
if (evict)
localAccessStrategy.evict(KEY);
else
localAccessStrategy.remove(KEY);
assertEquals(null, localAccessStrategy.get(KEY, System.currentTimeMillis()));
-
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
assertEquals(null, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
}
private void evictOrRemoveAllTest(boolean evict) {
-
final String KEY = KEY_BASE + testCount++;
-
- assertEquals(0, localCache.keySet().size());
- assertEquals(0, remoteCache.keySet().size());
-
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
assertNull("local is clean", localAccessStrategy.get(KEY, System.currentTimeMillis()));
assertNull("remote is clean", remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
@@ -606,28 +601,27 @@
// Wait for async propagation
sleep(250);
- if (evict)
+ if (evict) {
+ log.debug("Call evict all locally");
localAccessStrategy.evictAll();
- else
+ } else {
localAccessStrategy.removeAll();
+ }
// This should re-establish the region root node in the optimistic case
assertNull(localAccessStrategy.get(KEY, System.currentTimeMillis()));
+ assertEquals(0, getValidKeyCount(localCache.keySet()));
- assertEquals(0, localCache.keySet().size());
-
// Re-establishing the region root on the local node doesn't
// propagate it to other nodes. Do a get on the remote node to re-establish
assertEquals(null, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
+ assertEquals(0, getValidKeyCount(remoteCache.keySet()));
- assertEquals(0, remoteCache.keySet().size());
-
// Test whether the get above messes up the optimistic version
remoteAccessStrategy.putFromLoad(KEY, VALUE1, System.currentTimeMillis(), new Integer(1));
assertEquals(VALUE1, remoteAccessStrategy.get(KEY, System.currentTimeMillis()));
+ assertEquals(1, getValidKeyCount(remoteCache.keySet()));
- assertEquals(1, remoteCache.keySet().size());
-
// Wait for async propagation
sleep(250);
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -32,8 +32,9 @@
import org.hibernate.cache.RegionFactory;
import org.hibernate.cache.access.AccessType;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.CacheAdapterImpl;
import org.hibernate.test.cache.infinispan.AbstractEntityCollectionRegionTestCase;
-import org.infinispan.Cache;
/**
* Tests of EntityRegionImpl.
@@ -94,8 +95,8 @@
}
@Override
- protected Cache getInfinispanCache(InfinispanRegionFactory regionFactory) {
- return regionFactory.getCacheManager().getCache("entity");
+ protected CacheAdapter getInfinispanCache(InfinispanRegionFactory regionFactory) {
+ return CacheAdapterImpl.newInstance(regionFactory.getCacheManager().getCache("entity"));
}
}
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -26,7 +26,7 @@
public String getCacheConcurrencyStrategy() {
return cacheConcurrencyStrategy;
}
-
+
public void testEmptySecondLevelCacheEntry() throws Exception {
getSessions().getCache().evictEntityRegion(Item.class.getName());
Statistics stats = getSessions().getStatistics();
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -1,6 +1,7 @@
package org.hibernate.test.cache.infinispan.functional;
import java.io.Serializable;
+import java.util.Map;
import org.hibernate.Session;
import org.hibernate.Transaction;
@@ -63,6 +64,8 @@
assertEquals(item.getName(), loadedWithCachedCollection.getName());
assertEquals(item.getItems().size(), loadedWithCachedCollection.getItems().size());
assertEquals(1, cStats.getHitCount());
+ Map cacheEntries = cStats.getEntries();
+ assertEquals(1, cacheEntries.size());
s.close();
}
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -32,6 +32,7 @@
import org.hibernate.cfg.Environment;
import org.hibernate.classic.Session;
import org.hibernate.junit.functional.FunctionalTestCase;
+import org.hibernate.stat.SecondLevelCacheStatistics;
import org.hibernate.test.cache.infinispan.functional.Contact;
import org.hibernate.test.cache.infinispan.functional.Customer;
import org.hibernate.transaction.CMTTransactionFactory;
@@ -48,30 +49,31 @@
public class BulkOperationsTestCase extends FunctionalTestCase {
private static final Logger log = LoggerFactory.getLogger(BulkOperationsTestCase.class);
-
+
private TransactionManager tm;
-
+
public BulkOperationsTestCase(String string) {
super(string);
}
public String[] getMappings() {
- return new String[] { "cache/infinispan/functional/Contact.hbm.xml", "cache/infinispan/functional/Customer.hbm.xml" };
+ return new String[] { "cache/infinispan/functional/Contact.hbm.xml",
+ "cache/infinispan/functional/Customer.hbm.xml" };
}
-
+
@Override
public String getCacheConcurrencyStrategy() {
return "transactional";
}
-
+
protected Class getTransactionFactoryClass() {
- return CMTTransactionFactory.class;
+ return CMTTransactionFactory.class;
}
protected Class getConnectionProviderClass() {
return org.hibernate.test.cache.infinispan.tm.XaConnectionProvider.class;
}
-
+
protected Class<? extends TransactionManagerLookup> getTransactionManagerLookupClass() {
return org.hibernate.test.cache.infinispan.tm.XaTransactionManagerLookup.class;
}
@@ -81,11 +83,13 @@
cfg.setProperty(Environment.USE_SECOND_LEVEL_CACHE, "true");
cfg.setProperty(Environment.GENERATE_STATISTICS, "true");
+ cfg.setProperty(Environment.USE_QUERY_CACHE, "false");
cfg.setProperty(Environment.CONNECTION_PROVIDER, getConnectionProviderClass().getName());
- cfg.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, getTransactionManagerLookupClass().getName());
-
+ cfg.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, getTransactionManagerLookupClass()
+ .getName());
+
Class transactionFactory = getTransactionFactoryClass();
- cfg.setProperty( Environment.TRANSACTION_STRATEGY, transactionFactory.getName());
+ cfg.setProperty(Environment.TRANSACTION_STRATEGY, transactionFactory.getName());
}
public void testBulkOperations() throws Throwable {
@@ -93,14 +97,19 @@
boolean cleanedUp = false;
try {
tm = getTransactionManagerLookupClass().newInstance().getTransactionManager(null);
-
+
createContacts();
List<Integer> rhContacts = getContactsByCustomer("Red Hat");
assertNotNull("Red Hat contacts exist", rhContacts);
assertEquals("Created expected number of Red Hat contacts", 10, rhContacts.size());
+ SecondLevelCacheStatistics contactSlcs = getEnvironment().getSessionFactory()
+ .getStatistics().getSecondLevelCacheStatistics(Contact.class.getName());
+ assertEquals(20, contactSlcs.getElementCountInMemory());
+
assertEquals("Deleted all Red Hat contacts", 10, deleteContacts());
+ assertEquals(0, contactSlcs.getElementCountInMemory());
List<Integer> jbContacts = getContactsByCustomer("JBoss");
assertNotNull("JBoss contacts exist", jbContacts);
@@ -115,6 +124,7 @@
}
updateContacts("Kabir", "Updated");
+ assertEquals(0, contactSlcs.getElementCountInMemory());
for (Integer id : jbContacts) {
Contact contact = getContact(id);
assertNotNull("JBoss contact " + id + " exists", contact);
@@ -125,7 +135,20 @@
List<Integer> updated = getContactsByTLF("Updated");
assertNotNull("Got updated contacts", updated);
assertEquals("Updated contacts", 5, updated.size());
- } catch(Throwable t) {
+
+ updateContactsWithOneManual("Kabir", "UpdatedAgain");
+ assertEquals(contactSlcs.getElementCountInMemory(), 0);
+ for (Integer id : jbContacts) {
+ Contact contact = getContact(id);
+ assertNotNull("JBoss contact " + id + " exists", contact);
+ String expected = ("Kabir".equals(contact.getName())) ? "UpdatedAgain" : "2222";
+ assertEquals("JBoss contact " + id + " has correct TLF", expected, contact.getTlf());
+ }
+
+ updated = getContactsByTLF("UpdatedAgain");
+ assertNotNull("Got updated contacts", updated);
+ assertEquals("Updated contacts", 5, updated.size());
+ } catch (Throwable t) {
cleanedUp = true;
log.debug("Exceptional cleanup");
cleanup(true);
@@ -185,8 +208,8 @@
try {
Session session = getSessions().getCurrentSession();
- List results = session.createQuery(selectHQL).setFlushMode(FlushMode.AUTO).setParameter("cName", customerName)
- .list();
+ List results = session.createQuery(selectHQL).setFlushMode(FlushMode.AUTO).setParameter(
+ "cName", customerName).list();
tm.commit();
return results;
} catch (Exception e) {
@@ -203,7 +226,8 @@
try {
Session session = getSessions().getCurrentSession();
- List results = session.createQuery(selectHQL).setFlushMode(FlushMode.AUTO).setParameter("cTLF", tlf).list();
+ List results = session.createQuery(selectHQL).setFlushMode(FlushMode.AUTO).setParameter(
+ "cTLF", tlf).list();
tm.commit();
return results;
} catch (Exception e) {
@@ -214,13 +238,30 @@
public int updateContacts(String name, String newTLF) throws Exception {
String updateHQL = "update Contact set tlf = :cNewTLF where name = :cName";
+ tm.begin();
+ try {
+ Session session = getSessions().getCurrentSession();
+ int rowsAffected = session.createQuery(updateHQL).setFlushMode(FlushMode.AUTO)
+ .setParameter("cNewTLF", newTLF).setParameter("cName", name).executeUpdate();
+ tm.commit();
+ return rowsAffected;
+ } catch (Exception e) {
+ tm.rollback();
+ throw e;
+ }
+ }
+ public int updateContactsWithOneManual(String name, String newTLF) throws Exception {
+ String queryHQL = "from Contact c where c.name = :cName";
+ String updateHQL = "update Contact set tlf = :cNewTLF where name = :cName";
tm.begin();
try {
-
Session session = getSessions().getCurrentSession();
- int rowsAffected = session.createQuery(updateHQL).setFlushMode(FlushMode.AUTO).setParameter("cNewTLF", newTLF)
- .setParameter("cName", name).executeUpdate();
+ @SuppressWarnings("unchecked")
+ List<Contact> list = session.createQuery(queryHQL).setParameter("cName", name).list();
+ list.get(0).setTlf(newTLF);
+ int rowsAffected = session.createQuery(updateHQL).setFlushMode(FlushMode.AUTO)
+ .setParameter("cNewTLF", newTLF).setParameter("cName", name).executeUpdate();
tm.commit();
return rowsAffected;
} catch (Exception e) {
@@ -290,7 +331,7 @@
s.persist(customer);
s.getTransaction().commit();
s.close();
-
+
return customer;
} finally {
System.out.println("CREATE CUSTOMER " + id + " - END");
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -26,6 +26,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.hibernate.cache.infinispan.util.CacheHelper;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
@@ -50,7 +51,7 @@
@CacheEntryModified
public void nodeModified(CacheEntryModifiedEvent event) {
- if (!event.isPre()) {
+ if (!event.isPre() && !CacheHelper.isEvictAllNotification(event.getKey())) {
Object key = event.getKey();
log.info("Modified node " + key);
modified.add(key.toString());
@@ -59,7 +60,7 @@
@CacheEntryCreated
public void nodeCreated(CacheEntryCreatedEvent event) {
- if (!event.isPre()) {
+ if (!event.isPre() && !CacheHelper.isEvictAllNotification(event.getKey())) {
Object key = event.getKey();
log.info("Created node " + key);
modified.add(key.toString());
@@ -68,7 +69,7 @@
@CacheEntryVisited
public void nodeVisited(CacheEntryVisitedEvent event) {
- if (!event.isPre()) {
+ if (!event.isPre() && !CacheHelper.isEvictAllNotification(event.getKey())) {
Object key = event.getKey();
log.info("Visited node " + key);
accessed.add(key.toString());
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -198,7 +198,7 @@
// Sleep a bit to allow async repl to happen
sleep(SLEEP_TIME);
-
+
assertEquals("Query cache used", 1, remoteQueryListener.getSawRegionModificationCount());
remoteQueryListener.clearSawRegionModification();
@@ -207,12 +207,12 @@
assertEquals("63088 has correct # of accounts", 6, dao1.getCountForBranch(branch, useNamedRegion));
assertEquals("Query cache used", 1, remoteQueryListener.getSawRegionModificationCount());
remoteQueryListener.clearSawRegionModification();
-
+
sleep(SLEEP_TIME);
-
+
assertEquals("Query cache used", 1, localQueryListener.getSawRegionModificationCount());
localQueryListener.clearSawRegionModification();
-
+
log.info("First query on node 1 done");
// Sleep a bit to allow async repl to happen
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/AbstractDualNodeTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/AbstractDualNodeTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/AbstractDualNodeTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -21,7 +21,10 @@
*/
package org.hibernate.test.cache.infinispan.functional.cluster;
+import java.util.Set;
+
import org.hibernate.Session;
+import org.hibernate.cache.infinispan.util.CacheHelper;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.cfg.Mappings;
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -30,11 +30,11 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cache.CacheKey;
+import org.hibernate.cache.infinispan.util.CacheHelper;
import org.hibernate.test.cache.infinispan.functional.Contact;
import org.hibernate.test.cache.infinispan.functional.Customer;
import org.infinispan.Cache;
import org.infinispan.manager.CacheManager;
-import org.infinispan.marshall.MarshalledValue;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent;
@@ -143,8 +143,8 @@
assertLoadedFromCache(remoteListener, ids.customerId, ids.contactIds);
// After modification, local cache should have been invalidated and hence should be empty
- assertTrue(localCollectionCache.isEmpty());
- assertTrue(localCustomerCache.isEmpty());
+ assertEquals(0, getValidKeyCount(localCollectionCache.keySet()));
+ assertEquals(0, getValidKeyCount(localCustomerCache.keySet()));
} catch (Exception e) {
log.error("Error", e);
throw e;
@@ -307,6 +307,16 @@
.contains("Customer.contacts#" + custId));
}
+ protected int getValidKeyCount(Set keys) {
+ int result = 0;
+ for (Object key : keys) {
+ if (!(CacheHelper.isEvictAllNotification(key))) {
+ result++;
+ }
+ }
+ return result;
+ }
+
@Listener
public static class MyListener {
private static final Logger log = LoggerFactory.getLogger(MyListener.class);
@@ -329,8 +339,7 @@
public void nodeVisited(CacheEntryVisitedEvent event) {
log.debug(event.toString());
if (!event.isPre()) {
- MarshalledValue mv = (MarshalledValue) event.getKey();
- CacheKey cacheKey = (CacheKey) mv.get();
+ CacheKey cacheKey = (CacheKey) event.getKey();
Integer primKey = (Integer) cacheKey.getKey();
String key = (String) cacheKey.getEntityOrRoleName() + '#' + primKey;
log.debug("MyListener[" + name +"] - Visiting key " + key);
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -34,10 +34,11 @@
import org.hibernate.cache.Region;
import org.hibernate.cache.StandardQueryCache;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.CacheAdapterImpl;
import org.hibernate.cfg.Configuration;
import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase;
import org.hibernate.test.cache.infinispan.util.CacheTestUtil;
-import org.infinispan.Cache;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited;
import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent;
@@ -74,8 +75,8 @@
}
@Override
- protected Cache getInfinispanCache(InfinispanRegionFactory regionFactory) {
- return regionFactory.getCacheManager().getCache("local-query");
+ protected CacheAdapter getInfinispanCache(InfinispanRegionFactory regionFactory) {
+ return CacheAdapterImpl.newInstance(regionFactory.getCacheManager().getCache("local-query"));
}
@Override
@@ -186,7 +187,7 @@
assertEquals(VALUE1, region.get(KEY));
// final Fqn rootFqn = getRegionFqn(getStandardRegionName(REGION_PREFIX), REGION_PREFIX);
- final Cache jbc = getInfinispanCache(regionFactory);
+ final CacheAdapter jbc = getInfinispanCache(regionFactory);
final CountDownLatch blockerLatch = new CountDownLatch(1);
final CountDownLatch writerLatch = new CountDownLatch(1);
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -29,8 +29,9 @@
import org.hibernate.cache.Region;
import org.hibernate.cache.UpdateTimestampsCache;
import org.hibernate.cache.infinispan.InfinispanRegionFactory;
+import org.hibernate.cache.infinispan.util.CacheAdapter;
+import org.hibernate.cache.infinispan.util.CacheAdapterImpl;
import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase;
-import org.infinispan.Cache;
/**
* Tests of TimestampsRegionImpl.
@@ -55,8 +56,8 @@
}
@Override
- protected Cache getInfinispanCache(InfinispanRegionFactory regionFactory) {
- return regionFactory.getCacheManager().getCache("timestamps");
+ protected CacheAdapter getInfinispanCache(InfinispanRegionFactory regionFactory) {
+ return CacheAdapterImpl.newInstance(regionFactory.getCacheManager().getCache("timestamps"));
}
}
Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java
===================================================================
--- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java 2009-11-13 17:40:36 UTC (rev 17975)
+++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java 2009-11-13 18:12:53 UTC (rev 17976)
@@ -80,6 +80,8 @@
Synchronization s = (Synchronization) synchronizations.get(i);
s.beforeCompletion();
}
+
+ runXaResourcePrepare();
status = Status.STATUS_COMMITTING;
@@ -92,6 +94,8 @@
throw new SystemException();
}
}
+
+ runXaResourceCommitTx();
status = Status.STATUS_COMMITTED;
@@ -117,6 +121,8 @@
throw new SystemException();
}
}
+
+ runXaResourceRollback();
for (int i = 0; i < synchronizations.size(); i++) {
Synchronization s = (Synchronization) synchronizations.get(i);
14 years, 7 months
- 1
- 0
Hibernate SVN: r17975 - in core/trunk: jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4 and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: smarlow(a)redhat.com
Date: 2009-11-13 12:40:36 -0500 (Fri, 13 Nov 2009)
New Revision: 17975
Modified:
core/trunk/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java
core/trunk/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java
Log:
HHH-4572) check if the connection supports jdbc4 before looking for the createClob method
Modified: core/trunk/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java 2009-11-13 16:15:57 UTC (rev 17974)
+++ core/trunk/core/src/main/java/org/hibernate/engine/jdbc/JdbcSupportLoader.java 2009-11-13 17:40:36 UTC (rev 17975)
@@ -24,6 +24,8 @@
package org.hibernate.engine.jdbc;
import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.DatabaseMetaData;
import java.lang.reflect.Method;
import org.slf4j.Logger;
@@ -67,6 +69,18 @@
}
try {
+ try {
+ DatabaseMetaData meta = jdbcConnection.getMetaData();
+ // if the jdbc driver version is less than 4, it shouldn't have createClob
+ if ( meta.getJDBCMajorVersion() < 4 ) {
+ log.info("Disabling contextual LOB creation as JDBC driver version (" +
+ meta.getJDBCMajorVersion()+
+ ") is less than 4");
+ return false;
+ }
+ }
+ catch(SQLException eat) { /* ignore exception and continue */}
+
Class connectionClass = Connection.class;
Method createClobMethod = connectionClass.getMethod( "createClob", NO_ARG_SIG );
if ( createClobMethod.getDeclaringClass().equals( Connection.class ) ) {
Modified: core/trunk/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java
===================================================================
--- core/trunk/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java 2009-11-13 16:15:57 UTC (rev 17974)
+++ core/trunk/jdbc4-testing/src/test/java/org/hibernate/engine/jdbc/jdbc4/JdbcSupportTest.java 2009-11-13 17:40:36 UTC (rev 17975)
@@ -23,11 +23,7 @@
*/
package org.hibernate.engine.jdbc.jdbc4;
-import java.sql.SQLException;
-import java.sql.Connection;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.NClob;
+import java.sql.*;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -69,6 +65,10 @@
public NClob createNClob() {
return new JdbcNClob();
}
+
+ public DatabaseMetaData getMetaData() {
+ return new JdbcMetadata(4);
+ }
}
);
final LobCreationContext lobCreationContext = new LobCreationContext() {
@@ -120,6 +120,10 @@
public NClob createNClob() {
throw new UnsupportedOperationException();
}
+
+ public DatabaseMetaData getMetaData() {
+ return new JdbcMetadata(3);
+ }
}
);
final LobCreationContext lobCreationContext = new LobCreationContext() {
@@ -186,6 +190,7 @@
public Blob createBlob();
public Clob createClob();
public NClob createNClob();
+ public DatabaseMetaData getMetaData();
}
private class ConnectionProxyHandler implements InvocationHandler {
@@ -208,6 +213,9 @@
else if ( "createNClob".equals( methodName ) ) {
return lobBuilder.createNClob();
}
+ else if ( "getMetaData".equals( methodName ) ) {
+ return lobBuilder.getMetaData();
+ }
}
return null;
}
@@ -318,4 +326,3365 @@
private class JdbcNClob extends JdbcClob implements NClob {
}
+
+ private class JdbcMetadata implements DatabaseMetaData {
+
+ private final int jdbcVersion;
+
+ JdbcMetadata(int jdbcVersion) {
+ this.jdbcVersion = jdbcVersion;
+ }
+
+ /**
+ * Retrieves whether the current user can call all the procedures
+ * returned by the method <code>getProcedures</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean allProceduresAreCallable() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether the current user can use all the tables returned
+ * by the method <code>getTables</code> in a <code>SELECT</code>
+ * statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean allTablesAreSelectable() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the URL for this DBMS.
+ *
+ * @return the URL for this DBMS or <code>null</code> if it cannot be
+ * generated
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getURL() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the user name as known to this database.
+ *
+ * @return the database user name
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getUserName() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database is in read-only mode.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean isReadOnly() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether <code>NULL</code> values are sorted high.
+ * Sorted high means that <code>NULL</code> values
+ * sort higher than any other value in a domain. In an ascending order,
+ * if this method returns <code>true</code>, <code>NULL</code> values
+ * will appear at the end. By contrast, the method
+ * <code>nullsAreSortedAtEnd</code> indicates whether <code>NULL</code> values
+ * are sorted at the end regardless of sort order.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean nullsAreSortedHigh() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether <code>NULL</code> values are sorted low.
+ * Sorted low means that <code>NULL</code> values
+ * sort lower than any other value in a domain. In an ascending order,
+ * if this method returns <code>true</code>, <code>NULL</code> values
+ * will appear at the beginning. By contrast, the method
+ * <code>nullsAreSortedAtStart</code> indicates whether <code>NULL</code> values
+ * are sorted at the beginning regardless of sort order.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean nullsAreSortedLow() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether <code>NULL</code> values are sorted at the start regardless
+ * of sort order.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean nullsAreSortedAtStart() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether <code>NULL</code> values are sorted at the end regardless of
+ * sort order.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean nullsAreSortedAtEnd() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the name of this database product.
+ *
+ * @return database product name
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getDatabaseProductName() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the version number of this database product.
+ *
+ * @return database version number
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getDatabaseProductVersion() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the name of this JDBC driver.
+ *
+ * @return JDBC driver name
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getDriverName() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the version number of this JDBC driver as a <code>String</code>.
+ *
+ * @return JDBC driver version
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getDriverVersion() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves this JDBC driver's major version number.
+ *
+ * @return JDBC driver major version
+ */
+ public int getDriverMajorVersion()
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves this JDBC driver's minor version number.
+ *
+ * @return JDBC driver minor version number
+ */
+ public int getDriverMinorVersion()
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database stores tables in a local file.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean usesLocalFiles() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database uses a file for each table.
+ *
+ * @return <code>true</code> if this database uses a local file for each table;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean usesLocalFilePerTable() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case unquoted SQL identifiers as
+ * case sensitive and as a result stores them in mixed case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsMixedCaseIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case unquoted SQL identifiers as
+ * case insensitive and stores them in upper case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesUpperCaseIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case unquoted SQL identifiers as
+ * case insensitive and stores them in lower case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesLowerCaseIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case unquoted SQL identifiers as
+ * case insensitive and stores them in mixed case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesMixedCaseIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case quoted SQL identifiers as
+ * case sensitive and as a result stores them in mixed case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case quoted SQL identifiers as
+ * case insensitive and stores them in upper case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesUpperCaseQuotedIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case quoted SQL identifiers as
+ * case insensitive and stores them in lower case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesLowerCaseQuotedIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database treats mixed case quoted SQL identifiers as
+ * case insensitive and stores them in mixed case.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean storesMixedCaseQuotedIdentifiers() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the string used to quote SQL identifiers.
+ * This method returns a space " " if identifier quoting is not supported.
+ *
+ * @return the quoting string or a space if quoting is not supported
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getIdentifierQuoteString() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a comma-separated list of all of this database's SQL keywords
+ * that are NOT also SQL:2003 keywords.
+ *
+ * @return the list of this database's keywords that are not also
+ * SQL:2003 keywords
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getSQLKeywords() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a comma-separated list of math functions available with
+ * this database. These are the Open /Open CLI math function names used in
+ * the JDBC function escape clause.
+ *
+ * @return the list of math functions supported by this database
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getNumericFunctions() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a comma-separated list of string functions available with
+ * this database. These are the Open Group CLI string function names used
+ * in the JDBC function escape clause.
+ *
+ * @return the list of string functions supported by this database
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getStringFunctions() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a comma-separated list of system functions available with
+ * this database. These are the Open Group CLI system function names used
+ * in the JDBC function escape clause.
+ *
+ * @return a list of system functions supported by this database
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getSystemFunctions() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a comma-separated list of the time and date functions available
+ * with this database.
+ *
+ * @return the list of time and date functions supported by this database
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getTimeDateFunctions() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the string that can be used to escape wildcard characters.
+ * This is the string that can be used to escape '_' or '%' in
+ * the catalog search parameters that are a pattern (and therefore use one
+ * of the wildcard characters).
+ * <p/>
+ * <P>The '_' character represents any single character;
+ * the '%' character represents any sequence of zero or
+ * more characters.
+ *
+ * @return the string used to escape wildcard characters
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getSearchStringEscape() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves all the "extra" characters that can be used in unquoted
+ * identifier names (those beyond a-z, A-Z, 0-9 and _).
+ *
+ * @return the string containing the extra characters
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getExtraNameCharacters() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports <code>ALTER TABLE</code>
+ * with add column.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsAlterTableWithAddColumn() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports <code>ALTER TABLE</code>
+ * with drop column.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsAlterTableWithDropColumn() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports column aliasing.
+ * <p/>
+ * <P>If so, the SQL AS clause can be used to provide names for
+ * computed columns or to provide alias names for columns as
+ * required.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsColumnAliasing() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports concatenations between
+ * <code>NULL</code> and non-<code>NULL</code> values being
+ * <code>NULL</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean nullPlusNonNullIsNull() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the JDBC scalar function
+ * <code>CONVERT</code> for the conversion of one JDBC type to another.
+ * The JDBC types are the generic SQL data types defined
+ * in <code>java.sql.Types</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsConvert() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the JDBC scalar function
+ * <code>CONVERT</code> for conversions between the JDBC types <i>fromType</i>
+ * and <i>toType</i>. The JDBC types are the generic SQL data types defined
+ * in <code>java.sql.Types</code>.
+ *
+ * @param fromType the type to convert from; one of the type codes from
+ * the class <code>java.sql.Types</code>
+ * @param toType the type to convert to; one of the type codes from
+ * the class <code>java.sql.Types</code>
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Types
+ */
+ public boolean supportsConvert(int fromType, int toType) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports table correlation names.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsTableCorrelationNames() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether, when table correlation names are supported, they
+ * are restricted to being different from the names of the tables.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsDifferentTableCorrelationNames() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports expressions in
+ * <code>ORDER BY</code> lists.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsExpressionsInOrderBy() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports using a column that is
+ * not in the <code>SELECT</code> statement in an
+ * <code>ORDER BY</code> clause.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOrderByUnrelated() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports some form of
+ * <code>GROUP BY</code> clause.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsGroupBy() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports using a column that is
+ * not in the <code>SELECT</code> statement in a
+ * <code>GROUP BY</code> clause.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsGroupByUnrelated() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports using columns not included in
+ * the <code>SELECT</code> statement in a <code>GROUP BY</code> clause
+ * provided that all of the columns in the <code>SELECT</code> statement
+ * are included in the <code>GROUP BY</code> clause.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsGroupByBeyondSelect() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports specifying a
+ * <code>LIKE</code> escape clause.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsLikeEscapeClause() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports getting multiple
+ * <code>ResultSet</code> objects from a single call to the
+ * method <code>execute</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsMultipleResultSets() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database allows having multiple
+ * transactions open at once (on different connections).
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsMultipleTransactions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether columns in this database may be defined as non-nullable.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsNonNullableColumns() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ODBC Minimum SQL grammar.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsMinimumSQLGrammar() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ODBC Core SQL grammar.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCoreSQLGrammar() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ODBC Extended SQL grammar.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsExtendedSQLGrammar() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ANSI92 entry level SQL
+ * grammar.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsANSI92EntryLevelSQL() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ANSI92 intermediate SQL grammar supported.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsANSI92IntermediateSQL() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the ANSI92 full SQL grammar supported.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsANSI92FullSQL() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the SQL Integrity
+ * Enhancement Facility.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsIntegrityEnhancementFacility() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports some form of outer join.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOuterJoins() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports full nested outer joins.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsFullOuterJoins() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database provides limited support for outer
+ * joins. (This will be <code>true</code> if the method
+ * <code>supportsFullOuterJoins</code> returns <code>true</code>).
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsLimitedOuterJoins() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the database vendor's preferred term for "schema".
+ *
+ * @return the vendor term for "schema"
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getSchemaTerm() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the database vendor's preferred term for "procedure".
+ *
+ * @return the vendor term for "procedure"
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getProcedureTerm() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the database vendor's preferred term for "catalog".
+ *
+ * @return the vendor term for "catalog"
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getCatalogTerm() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog appears at the start of a fully qualified
+ * table name. If not, the catalog appears at the end.
+ *
+ * @return <code>true</code> if the catalog name appears at the beginning
+ * of a fully qualified table name; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean isCatalogAtStart() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the <code>String</code> that this database uses as the
+ * separator between a catalog and table name.
+ *
+ * @return the separator string
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public String getCatalogSeparator() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a schema name can be used in a data manipulation statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSchemasInDataManipulation() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a schema name can be used in a procedure call statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSchemasInProcedureCalls() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a schema name can be used in a table definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSchemasInTableDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a schema name can be used in an index definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSchemasInIndexDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a schema name can be used in a privilege definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog name can be used in a data manipulation statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCatalogsInDataManipulation() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog name can be used in a procedure call statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCatalogsInProcedureCalls() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog name can be used in a table definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCatalogsInTableDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog name can be used in an index definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCatalogsInIndexDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a catalog name can be used in a privilege definition statement.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports positioned <code>DELETE</code>
+ * statements.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsPositionedDelete() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports positioned <code>UPDATE</code>
+ * statements.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsPositionedUpdate() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports <code>SELECT FOR UPDATE</code>
+ * statements.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSelectForUpdate() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports stored procedure calls
+ * that use the stored procedure escape syntax.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsStoredProcedures() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports subqueries in comparison
+ * expressions.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSubqueriesInComparisons() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports subqueries in
+ * <code>EXISTS</code> expressions.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSubqueriesInExists() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports subqueries in
+ * <code>IN</code> expressions.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSubqueriesInIns() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports subqueries in quantified
+ * expressions.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsSubqueriesInQuantifieds() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports correlated subqueries.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsCorrelatedSubqueries() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports SQL <code>UNION</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsUnion() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports SQL <code>UNION ALL</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsUnionAll() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports keeping cursors open
+ * across commits.
+ *
+ * @return <code>true</code> if cursors always remain open;
+ * <code>false</code> if they might not remain open
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOpenCursorsAcrossCommit() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports keeping cursors open
+ * across rollbacks.
+ *
+ * @return <code>true</code> if cursors always remain open;
+ * <code>false</code> if they might not remain open
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOpenCursorsAcrossRollback() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports keeping statements open
+ * across commits.
+ *
+ * @return <code>true</code> if statements always remain open;
+ * <code>false</code> if they might not remain open
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOpenStatementsAcrossCommit() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports keeping statements open
+ * across rollbacks.
+ *
+ * @return <code>true</code> if statements always remain open;
+ * <code>false</code> if they might not remain open
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsOpenStatementsAcrossRollback() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of hex characters this database allows in an
+ * inline binary literal.
+ *
+ * @return max the maximum length (in hex characters) for a binary literal;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxBinaryLiteralLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters this database allows
+ * for a character literal.
+ *
+ * @return the maximum number of characters allowed for a character literal;
+ * a result of zero means that there is no limit or the limit is
+ * not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxCharLiteralLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters this database allows
+ * for a column name.
+ *
+ * @return the maximum number of characters allowed for a column name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of columns this database allows in a
+ * <code>GROUP BY</code> clause.
+ *
+ * @return the maximum number of columns allowed;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnsInGroupBy() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of columns this database allows in an index.
+ *
+ * @return the maximum number of columns allowed;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnsInIndex() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of columns this database allows in an
+ * <code>ORDER BY</code> clause.
+ *
+ * @return the maximum number of columns allowed;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnsInOrderBy() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of columns this database allows in a
+ * <code>SELECT</code> list.
+ *
+ * @return the maximum number of columns allowed;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnsInSelect() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of columns this database allows in a table.
+ *
+ * @return the maximum number of columns allowed;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxColumnsInTable() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of concurrent connections to this
+ * database that are possible.
+ *
+ * @return the maximum number of active connections possible at one time;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxConnections() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters that this database allows in a
+ * cursor name.
+ *
+ * @return the maximum number of characters allowed in a cursor name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxCursorNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of bytes this database allows for an
+ * index, including all of the parts of the index.
+ *
+ * @return the maximum number of bytes allowed; this limit includes the
+ * composite of all the constituent parts of the index;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxIndexLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters that this database allows in a
+ * schema name.
+ *
+ * @return the maximum number of characters allowed in a schema name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxSchemaNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters that this database allows in a
+ * procedure name.
+ *
+ * @return the maximum number of characters allowed in a procedure name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxProcedureNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters that this database allows in a
+ * catalog name.
+ *
+ * @return the maximum number of characters allowed in a catalog name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxCatalogNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of bytes this database allows in
+ * a single row.
+ *
+ * @return the maximum number of bytes allowed for a row; a result of
+ * zero means that there is no limit or the limit is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxRowSize() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether the return value for the method
+ * <code>getMaxRowSize</code> includes the SQL data types
+ * <code>LONGVARCHAR</code> and <code>LONGVARBINARY</code>.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean doesMaxRowSizeIncludeBlobs() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters this database allows in
+ * an SQL statement.
+ *
+ * @return the maximum number of characters allowed for an SQL statement;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxStatementLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of active statements to this database
+ * that can be open at the same time.
+ *
+ * @return the maximum number of statements that can be open at one time;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxStatements() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters this database allows in
+ * a table name.
+ *
+ * @return the maximum number of characters allowed for a table name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxTableNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of tables this database allows in a
+ * <code>SELECT</code> statement.
+ *
+ * @return the maximum number of tables allowed in a <code>SELECT</code>
+ * statement; a result of zero means that there is no limit or
+ * the limit is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxTablesInSelect() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the maximum number of characters this database allows in
+ * a user name.
+ *
+ * @return the maximum number of characters allowed for a user name;
+ * a result of zero means that there is no limit or the limit
+ * is not known
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public int getMaxUserNameLength() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves this database's default transaction isolation level. The
+ * possible values are defined in <code>java.sql.Connection</code>.
+ *
+ * @return the default isolation level
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Connection
+ */
+ public int getDefaultTransactionIsolation() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports transactions. If not, invoking the
+ * method <code>commit</code> is a noop, and the isolation level is
+ * <code>TRANSACTION_NONE</code>.
+ *
+ * @return <code>true</code> if transactions are supported;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsTransactions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the given transaction isolation level.
+ *
+ * @param level one of the transaction isolation levels defined in
+ * <code>java.sql.Connection</code>
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Connection
+ */
+ public boolean supportsTransactionIsolationLevel(int level) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports both data definition and
+ * data manipulation statements within a transaction.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports only data manipulation
+ * statements within a transaction.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean supportsDataManipulationTransactionsOnly() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a data definition statement within a transaction forces
+ * the transaction to commit.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean dataDefinitionCausesTransactionCommit() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database ignores a data definition statement
+ * within a transaction.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public boolean dataDefinitionIgnoredInTransactions() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the stored procedures available in the given
+ * catalog.
+ * <p/>
+ * Only procedure descriptions matching the schema and
+ * procedure name criteria are returned. They are ordered by
+ * <code>PROCEDURE_CAT</code>, <code>PROCEDURE_SCHEM</code>,
+ * <code>PROCEDURE_NAME</code> and <code>SPECIFIC_ NAME</code>.
+ * <p/>
+ * <P>Each procedure description has the the following columns:
+ * <OL>
+ * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be <code>null</code>)
+ * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be <code>null</code>)
+ * <LI><B>PROCEDURE_NAME</B> String => procedure name
+ * <LI> reserved for future use
+ * <LI> reserved for future use
+ * <LI> reserved for future use
+ * <LI><B>REMARKS</B> String => explanatory comment on the procedure
+ * <LI><B>PROCEDURE_TYPE</B> short => kind of procedure:
+ * <UL>
+ * <LI> procedureResultUnknown - Cannot determine if a return value
+ * will be returned
+ * <LI> procedureNoResult - Does not return a return value
+ * <LI> procedureReturnsResult - Returns a return value
+ * </UL>
+ * <LI><B>SPECIFIC_NAME</B> String => The name which uniquely identifies this
+ * procedure within its schema.
+ * </OL>
+ * <p/>
+ * A user may not have permissions to execute any of the procedures that are
+ * returned by <code>getProcedures</code>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param procedureNamePattern a procedure name pattern; must match the
+ * procedure name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a procedure description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the given catalog's stored procedure parameter
+ * and result columns.
+ * <p/>
+ * <P>Only descriptions matching the schema, procedure and
+ * parameter name criteria are returned. They are ordered by
+ * PROCEDURE_CAT, PROCEDURE_SCHEM, PROCEDURE_NAME and SPECIFIC_NAME. Within this, the return value,
+ * if any, is first. Next are the parameter descriptions in call
+ * order. The column descriptions follow in column number order.
+ * <p/>
+ * <P>Each row in the <code>ResultSet</code> is a parameter description or
+ * column description with the following fields:
+ * <OL>
+ * <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be <code>null</code>)
+ * <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be <code>null</code>)
+ * <LI><B>PROCEDURE_NAME</B> String => procedure name
+ * <LI><B>COLUMN_NAME</B> String => column/parameter name
+ * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ * <UL>
+ * <LI> procedureColumnUnknown - nobody knows
+ * <LI> procedureColumnIn - IN parameter
+ * <LI> procedureColumnInOut - INOUT parameter
+ * <LI> procedureColumnOut - OUT parameter
+ * <LI> procedureColumnReturn - procedure return value
+ * <LI> procedureColumnResult - result column in <code>ResultSet</code>
+ * </UL>
+ * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ * type name is fully qualified
+ * <LI><B>PRECISION</B> int => precision
+ * <LI><B>LENGTH</B> int => length in bytes of data
+ * <LI><B>SCALE</B> short => scale - null is returned for data types where
+ * SCALE is not applicable.
+ * <LI><B>RADIX</B> short => radix
+ * <LI><B>NULLABLE</B> short => can it contain NULL.
+ * <UL>
+ * <LI> procedureNoNulls - does not allow NULL values
+ * <LI> procedureNullable - allows NULL values
+ * <LI> procedureNullableUnknown - nullability unknown
+ * </UL>
+ * <LI><B>REMARKS</B> String => comment describing parameter/column
+ * <LI><B>COLUMN_DEF</B> String => default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
+ * <UL>
+ * <LI> The string NULL (not enclosed in quotes) - if NULL was specified as the default value
+ * <LI> TRUNCATE (not enclosed in quotes) - if the specified default value cannot be represented without truncation
+ * <LI> NULL - if a default value was not specified
+ * </UL>
+ * <LI><B>SQL_DATA_TYPE</B> int => reserved for future use
+ * <LI><B>SQL_DATETIME_SUB</B> int => reserved for future use
+ * <LI><B>CHAR_OCTET_LENGTH</B> int => the maximum length of binary and character based columns. For any other datatype the returned value is a
+ * NULL
+ * <LI><B>ORDINAL_POSITION</B> int => the ordinal position, starting from 1, for the input and output parameters for a procedure. A value of 0
+ * is returned if this row describes the procedure's return value. For result set columns, it is the
+ * ordinal position of the column in the result set starting from 1. If there are
+ * multiple result sets, the column ordinal positions are implementation
+ * defined.
+ * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine the nullability for a column.
+ * <UL>
+ * <LI> YES --- if the parameter can include NULLs
+ * <LI> NO --- if the parameter cannot include NULLs
+ * <LI> empty string --- if the nullability for the
+ * parameter is unknown
+ * </UL>
+ * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies this procedure within its schema.
+ * </OL>
+ * <p/>
+ * <P><B>Note:</B> Some databases may not return the column
+ * descriptions for a procedure.
+ * <p/>
+ * <p>The PRECISION column represents the specified column size for the given column.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param procedureNamePattern a procedure name pattern; must match the
+ * procedure name as it is stored in the database
+ * @param columnNamePattern a column name pattern; must match the column name
+ * as it is stored in the database
+ * @return <code>ResultSet</code> - each row describes a stored procedure parameter or
+ * column
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the tables available in the given catalog.
+ * Only table descriptions matching the catalog, schema, table
+ * name and type criteria are returned. They are ordered by
+ * <code>TABLE_TYPE</code>, <code>TABLE_CAT</code>,
+ * <code>TABLE_SCHEM</code> and <code>TABLE_NAME</code>.
+ * <p/>
+ * Each table description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
+ * "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
+ * <LI><B>REMARKS</B> String => explanatory comment on the table
+ * <LI><B>TYPE_CAT</B> String => the types catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String => the types schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String => type name (may be <code>null</code>)
+ * <LI><B>SELF_REFERENCING_COL_NAME</B> String => name of the designated
+ * "identifier" column of a typed table (may be <code>null</code>)
+ * <LI><B>REF_GENERATION</B> String => specifies how values in
+ * SELF_REFERENCING_COL_NAME are created. Values are
+ * "SYSTEM", "USER", "DERIVED". (may be <code>null</code>)
+ * </OL>
+ * <p/>
+ * <P><B>Note:</B> Some databases may not return information for
+ * all tables.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param tableNamePattern a table name pattern; must match the
+ * table name as it is stored in the database
+ * @param types a list of table types, which must be from the list of table types
+ * returned from {@link #getTableTypes},to include; <code>null</code> returns
+ * all types
+ * @return <code>ResultSet</code> - each row is a table description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the schema names available in this database. The results
+ * are ordered by <code>TABLE_CATALOG</code> and
+ * <code>TABLE_SCHEM</code>.
+ * <p/>
+ * <P>The schema columns are:
+ * <OL>
+ * <LI><B>TABLE_SCHEM</B> String => schema name
+ * <LI><B>TABLE_CATALOG</B> String => catalog name (may be <code>null</code>)
+ * </OL>
+ *
+ * @return a <code>ResultSet</code> object in which each row is a
+ * schema description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getSchemas() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the catalog names available in this database. The results
+ * are ordered by catalog name.
+ * <p/>
+ * <P>The catalog column is:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => catalog name
+ * </OL>
+ *
+ * @return a <code>ResultSet</code> object in which each row has a
+ * single <code>String</code> column that is a catalog name
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getCatalogs() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the table types available in this database. The results
+ * are ordered by table type.
+ * <p/>
+ * <P>The table type is:
+ * <OL>
+ * <LI><B>TABLE_TYPE</B> String => table type. Typical types are "TABLE",
+ * "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
+ * "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
+ * </OL>
+ *
+ * @return a <code>ResultSet</code> object in which each row has a
+ * single <code>String</code> column that is a table type
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getTableTypes() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of table columns available in
+ * the specified catalog.
+ * <p/>
+ * <P>Only column descriptions matching the catalog, schema, table
+ * and column name criteria are returned. They are ordered by
+ * <code>TABLE_CAT</code>,<code>TABLE_SCHEM</code>,
+ * <code>TABLE_NAME</code>, and <code>ORDINAL_POSITION</code>.
+ * <p/>
+ * <P>Each column description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => Data source dependent type name,
+ * for a UDT the type name is fully qualified
+ * <LI><B>COLUMN_SIZE</B> int => column size.
+ * <LI><B>BUFFER_LENGTH</B> is not used.
+ * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits. Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.
+ * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
+ * <LI><B>NULLABLE</B> int => is NULL allowed.
+ * <UL>
+ * <LI> columnNoNulls - might not allow <code>NULL</code> values
+ * <LI> columnNullable - definitely allows <code>NULL</code> values
+ * <LI> columnNullableUnknown - nullability unknown
+ * </UL>
+ * <LI><B>REMARKS</B> String => comment describing column (may be <code>null</code>)
+ * <LI><B>COLUMN_DEF</B> String => default value for the column, which should be interpreted as a string when the value is enclosed in single quotes (may be <code>null</code>)
+ * <LI><B>SQL_DATA_TYPE</B> int => unused
+ * <LI><B>SQL_DATETIME_SUB</B> int => unused
+ * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * maximum number of bytes in the column
+ * <LI><B>ORDINAL_POSITION</B> int => index of column in table
+ * (starting at 1)
+ * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine the nullability for a column.
+ * <UL>
+ * <LI> YES --- if the parameter can include NULLs
+ * <LI> NO --- if the parameter cannot include NULLs
+ * <LI> empty string --- if the nullability for the
+ * parameter is unknown
+ * </UL>
+ * <LI><B>SCOPE_CATLOG</B> String => catalog of table that is the scope
+ * of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
+ * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the scope
+ * of a reference attribute (<code>null</code> if the DATA_TYPE isn't REF)
+ * <LI><B>SCOPE_TABLE</B> String => table name that this the scope
+ * of a reference attribure (<code>null</code> if the DATA_TYPE isn't REF)
+ * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct type or user-generated
+ * Ref type, SQL type from java.sql.Types (<code>null</code> if DATA_TYPE
+ * isn't DISTINCT or user-generated REF)
+ * <LI><B>IS_AUTOINCREMENT</B> String => Indicates whether this column is auto incremented
+ * <UL>
+ * <LI> YES --- if the column is auto incremented
+ * <LI> NO --- if the column is not auto incremented
+ * <LI> empty string --- if it cannot be determined whether the column is auto incremented
+ * parameter is unknown
+ * </UL>
+ * </OL>
+ * <p/>
+ * <p>The COLUMN_SIZE column the specified column size for the given column.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param tableNamePattern a table name pattern; must match the
+ * table name as it is stored in the database
+ * @param columnNamePattern a column name pattern; must match the column
+ * name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a column description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the access rights for a table's columns.
+ * <p/>
+ * <P>Only privileges matching the column name criteria are
+ * returned. They are ordered by COLUMN_NAME and PRIVILEGE.
+ * <p/>
+ * <P>Each privilige description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>GRANTOR</B> String => grantor of access (may be <code>null</code>)
+ * <LI><B>GRANTEE</B> String => grantee of access
+ * <LI><B>PRIVILEGE</B> String => name of access (SELECT,
+ * INSERT, UPDATE, REFRENCES, ...)
+ * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * to grant to others; "NO" if not; <code>null</code> if unknown
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name as it is
+ * stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is
+ * stored in the database
+ * @param columnNamePattern a column name pattern; must match the column
+ * name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a column privilege description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the access rights for each table available
+ * in a catalog. Note that a table privilege applies to one or
+ * more columns in the table. It would be wrong to assume that
+ * this privilege applies to all columns (this may be true for
+ * some systems but is not true for all.)
+ * <p/>
+ * <P>Only privileges matching the schema and table name
+ * criteria are returned. They are ordered by
+ * <code>TABLE_CAT</code>,
+ * <code>TABLE_SCHEM</code>, <code>TABLE_NAME</code>,
+ * and <code>PRIVILEGE</code>.
+ * <p/>
+ * <P>Each privilige description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>GRANTOR</B> String => grantor of access (may be <code>null</code>)
+ * <LI><B>GRANTEE</B> String => grantee of access
+ * <LI><B>PRIVILEGE</B> String => name of access (SELECT,
+ * INSERT, UPDATE, REFRENCES, ...)
+ * <LI><B>IS_GRANTABLE</B> String => "YES" if grantee is permitted
+ * to grant to others; "NO" if not; <code>null</code> if unknown
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param tableNamePattern a table name pattern; must match the
+ * table name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a table privilege description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ */
+ public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of a table's optimal set of columns that
+ * uniquely identifies a row. They are ordered by SCOPE.
+ * <p/>
+ * <P>Each column description has the following columns:
+ * <OL>
+ * <LI><B>SCOPE</B> short => actual scope of result
+ * <UL>
+ * <LI> bestRowTemporary - very temporary, while using row
+ * <LI> bestRowTransaction - valid for remainder of current transaction
+ * <LI> bestRowSession - valid for remainder of current session
+ * </UL>
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => Data source dependent type name,
+ * for a UDT the type name is fully qualified
+ * <LI><B>COLUMN_SIZE</B> int => precision
+ * <LI><B>BUFFER_LENGTH</B> int => not used
+ * <LI><B>DECIMAL_DIGITS</B> short => scale - Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.
+ * <LI><B>PSEUDO_COLUMN</B> short => is this a pseudo column
+ * like an Oracle ROWID
+ * <UL>
+ * <LI> bestRowUnknown - may or may not be pseudo column
+ * <LI> bestRowNotPseudo - is NOT a pseudo column
+ * <LI> bestRowPseudo - is a pseudo column
+ * </UL>
+ * </OL>
+ * <p/>
+ * <p>The COLUMN_SIZE column represents the specified column size for the given column.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in the database
+ * @param scope the scope of interest; use same values as SCOPE
+ * @param nullable include columns that are nullable.
+ * @return <code>ResultSet</code> - each row is a column description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of a table's columns that are automatically
+ * updated when any value in a row is updated. They are
+ * unordered.
+ * <p/>
+ * <P>Each column description has the following columns:
+ * <OL>
+ * <LI><B>SCOPE</B> short => is not used
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from <code>java.sql.Types</code>
+ * <LI><B>TYPE_NAME</B> String => Data source-dependent type name
+ * <LI><B>COLUMN_SIZE</B> int => precision
+ * <LI><B>BUFFER_LENGTH</B> int => length of column value in bytes
+ * <LI><B>DECIMAL_DIGITS</B> short => scale - Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.
+ * <LI><B>PSEUDO_COLUMN</B> short => whether this is pseudo column
+ * like an Oracle ROWID
+ * <UL>
+ * <LI> versionColumnUnknown - may or may not be pseudo column
+ * <LI> versionColumnNotPseudo - is NOT a pseudo column
+ * <LI> versionColumnPseudo - is a pseudo column
+ * </UL>
+ * </OL>
+ * <p/>
+ * <p>The COLUMN_SIZE column represents the specified column size for the given column.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in the database
+ * @return a <code>ResultSet</code> object in which each row is a
+ * column description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the given table's primary key columns. They
+ * are ordered by COLUMN_NAME.
+ * <p/>
+ * <P>Each primary key column description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>COLUMN_NAME</B> String => column name
+ * <LI><B>KEY_SEQ</B> short => sequence number within primary key( a value
+ * of 1 represents the first column of the primary key, a value of 2 would
+ * represent the second column within the primary key).
+ * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in the database
+ * @return <code>ResultSet</code> - each row is a primary key column description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the primary key columns that are
+ * referenced by the given table's foreign key columns (the primary keys
+ * imported by a table). They are ordered by PKTABLE_CAT,
+ * PKTABLE_SCHEM, PKTABLE_NAME, and KEY_SEQ.
+ * <p/>
+ * <P>Each primary key column description has the following columns:
+ * <OL>
+ * <LI><B>PKTABLE_CAT</B> String => primary key table catalog
+ * being imported (may be <code>null</code>)
+ * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema
+ * being imported (may be <code>null</code>)
+ * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * being imported
+ * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * being imported
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * <LI><B>KEY_SEQ</B> short => sequence number within a foreign key( a value
+ * of 1 represents the first column of the foreign key, a value of 2 would
+ * represent the second column within the foreign key).
+ * <LI><B>UPDATE_RULE</B> short => What happens to a
+ * foreign key when the primary key is updated:
+ * <UL>
+ * <LI> importedNoAction - do not allow update of primary
+ * key if it has been imported
+ * <LI> importedKeyCascade - change imported key to agree
+ * with primary key update
+ * <LI> importedKeySetNull - change imported key to <code>NULL</code>
+ * if its primary key has been updated
+ * <LI> importedKeySetDefault - change imported key to default values
+ * if its primary key has been updated
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * </UL>
+ * <LI><B>DELETE_RULE</B> short => What happens to
+ * the foreign key when primary is deleted.
+ * <UL>
+ * <LI> importedKeyNoAction - do not allow delete of primary
+ * key if it has been imported
+ * <LI> importedKeyCascade - delete rows that import a deleted key
+ * <LI> importedKeySetNull - change imported key to NULL if
+ * its primary key has been deleted
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * <LI> importedKeySetDefault - change imported key to default if
+ * its primary key has been deleted
+ * </UL>
+ * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * constraints be deferred until commit
+ * <UL>
+ * <LI> importedKeyInitiallyDeferred - see SQL92 for definition
+ * <LI> importedKeyInitiallyImmediate - see SQL92 for definition
+ * <LI> importedKeyNotDeferrable - see SQL92 for definition
+ * </UL>
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in the database
+ * @return <code>ResultSet</code> - each row is a primary key column description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getExportedKeys
+ */
+ public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the foreign key columns that reference the
+ * given table's primary key columns (the foreign keys exported by a
+ * table). They are ordered by FKTABLE_CAT, FKTABLE_SCHEM,
+ * FKTABLE_NAME, and KEY_SEQ.
+ * <p/>
+ * <P>Each foreign key column description has the following columns:
+ * <OL>
+ * <LI><B>PKTABLE_CAT</B> String => primary key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_SCHEM</B> String => primary key table schema (may be <code>null</code>)
+ * <LI><B>PKTABLE_NAME</B> String => primary key table name
+ * <LI><B>PKCOLUMN_NAME</B> String => primary key column name
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
+ * being exported (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
+ * being exported (may be <code>null</code>)
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * being exported
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * being exported
+ * <LI><B>KEY_SEQ</B> short => sequence number within foreign key( a value
+ * of 1 represents the first column of the foreign key, a value of 2 would
+ * represent the second column within the foreign key).
+ * <LI><B>UPDATE_RULE</B> short => What happens to
+ * foreign key when primary is updated:
+ * <UL>
+ * <LI> importedNoAction - do not allow update of primary
+ * key if it has been imported
+ * <LI> importedKeyCascade - change imported key to agree
+ * with primary key update
+ * <LI> importedKeySetNull - change imported key to <code>NULL</code> if
+ * its primary key has been updated
+ * <LI> importedKeySetDefault - change imported key to default values
+ * if its primary key has been updated
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * </UL>
+ * <LI><B>DELETE_RULE</B> short => What happens to
+ * the foreign key when primary is deleted.
+ * <UL>
+ * <LI> importedKeyNoAction - do not allow delete of primary
+ * key if it has been imported
+ * <LI> importedKeyCascade - delete rows that import a deleted key
+ * <LI> importedKeySetNull - change imported key to <code>NULL</code> if
+ * its primary key has been deleted
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * <LI> importedKeySetDefault - change imported key to default if
+ * its primary key has been deleted
+ * </UL>
+ * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String => primary key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * constraints be deferred until commit
+ * <UL>
+ * <LI> importedKeyInitiallyDeferred - see SQL92 for definition
+ * <LI> importedKeyInitiallyImmediate - see SQL92 for definition
+ * <LI> importedKeyNotDeferrable - see SQL92 for definition
+ * </UL>
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in this database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in this database
+ * @return a <code>ResultSet</code> object in which each row is a
+ * foreign key column description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getImportedKeys
+ */
+ public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the foreign key columns in the given foreign key
+ * table that reference the primary key or the columns representing a unique constraint of the parent table (could be the same or a different table).
+ * The number of columns returned from the parent table must match the number of
+ * columns that make up the foreign key. They
+ * are ordered by FKTABLE_CAT, FKTABLE_SCHEM, FKTABLE_NAME, and
+ * KEY_SEQ.
+ * <p/>
+ * <P>Each foreign key column description has the following columns:
+ * <OL>
+ * <LI><B>PKTABLE_CAT</B> String => parent key table catalog (may be <code>null</code>)
+ * <LI><B>PKTABLE_SCHEM</B> String => parent key table schema (may be <code>null</code>)
+ * <LI><B>PKTABLE_NAME</B> String => parent key table name
+ * <LI><B>PKCOLUMN_NAME</B> String => parent key column name
+ * <LI><B>FKTABLE_CAT</B> String => foreign key table catalog (may be <code>null</code>)
+ * being exported (may be <code>null</code>)
+ * <LI><B>FKTABLE_SCHEM</B> String => foreign key table schema (may be <code>null</code>)
+ * being exported (may be <code>null</code>)
+ * <LI><B>FKTABLE_NAME</B> String => foreign key table name
+ * being exported
+ * <LI><B>FKCOLUMN_NAME</B> String => foreign key column name
+ * being exported
+ * <LI><B>KEY_SEQ</B> short => sequence number within foreign key( a value
+ * of 1 represents the first column of the foreign key, a value of 2 would
+ * represent the second column within the foreign key).
+ * <LI><B>UPDATE_RULE</B> short => What happens to
+ * foreign key when parent key is updated:
+ * <UL>
+ * <LI> importedNoAction - do not allow update of parent
+ * key if it has been imported
+ * <LI> importedKeyCascade - change imported key to agree
+ * with parent key update
+ * <LI> importedKeySetNull - change imported key to <code>NULL</code> if
+ * its parent key has been updated
+ * <LI> importedKeySetDefault - change imported key to default values
+ * if its parent key has been updated
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * </UL>
+ * <LI><B>DELETE_RULE</B> short => What happens to
+ * the foreign key when parent key is deleted.
+ * <UL>
+ * <LI> importedKeyNoAction - do not allow delete of parent
+ * key if it has been imported
+ * <LI> importedKeyCascade - delete rows that import a deleted key
+ * <LI> importedKeySetNull - change imported key to <code>NULL</code> if
+ * its primary key has been deleted
+ * <LI> importedKeyRestrict - same as importedKeyNoAction
+ * (for ODBC 2.x compatibility)
+ * <LI> importedKeySetDefault - change imported key to default if
+ * its parent key has been deleted
+ * </UL>
+ * <LI><B>FK_NAME</B> String => foreign key name (may be <code>null</code>)
+ * <LI><B>PK_NAME</B> String => parent key name (may be <code>null</code>)
+ * <LI><B>DEFERRABILITY</B> short => can the evaluation of foreign key
+ * constraints be deferred until commit
+ * <UL>
+ * <LI> importedKeyInitiallyDeferred - see SQL92 for definition
+ * <LI> importedKeyInitiallyImmediate - see SQL92 for definition
+ * <LI> importedKeyNotDeferrable - see SQL92 for definition
+ * </UL>
+ * </OL>
+ *
+ * @param parentCatalog a catalog name; must match the catalog name
+ * as it is stored in the database; "" retrieves those without a
+ * catalog; <code>null</code> means drop catalog name from the selection criteria
+ * @param parentSchema a schema name; must match the schema name as
+ * it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means drop schema name from the selection criteria
+ * @param parentTable the name of the table that exports the key; must match
+ * the table name as it is stored in the database
+ * @param foreignCatalog a catalog name; must match the catalog name as
+ * it is stored in the database; "" retrieves those without a
+ * catalog; <code>null</code> means drop catalog name from the selection criteria
+ * @param foreignSchema a schema name; must match the schema name as it
+ * is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means drop schema name from the selection criteria
+ * @param foreignTable the name of the table that imports the key; must match
+ * the table name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a foreign key column description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getImportedKeys
+ */
+ public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of all the data types supported by
+ * this database. They are ordered by DATA_TYPE and then by how
+ * closely the data type maps to the corresponding JDBC SQL type.
+ * <p/>
+ * <P>If the database supports SQL distinct types, then getTypeInfo() will return
+ * a single row with a TYPE_NAME of DISTINCT and a DATA_TYPE of Types.DISTINCT.
+ * If the database supports SQL structured types, then getTypeInfo() will return
+ * a single row with a TYPE_NAME of STRUCT and a DATA_TYPE of Types.STRUCT.
+ * <p/>
+ * <P>If SQL distinct or structured types are supported, then information on the
+ * individual types may be obtained from the getUDTs() method.
+ * <p/>
+ * <p/>
+ * <p/>
+ * <P>Each type description has the following columns:
+ * <OL>
+ * <LI><B>TYPE_NAME</B> String => Type name
+ * <LI><B>DATA_TYPE</B> int => SQL data type from java.sql.Types
+ * <LI><B>PRECISION</B> int => maximum precision
+ * <LI><B>LITERAL_PREFIX</B> String => prefix used to quote a literal
+ * (may be <code>null</code>)
+ * <LI><B>LITERAL_SUFFIX</B> String => suffix used to quote a literal
+ * (may be <code>null</code>)
+ * <LI><B>CREATE_PARAMS</B> String => parameters used in creating
+ * the type (may be <code>null</code>)
+ * <LI><B>NULLABLE</B> short => can you use NULL for this type.
+ * <UL>
+ * <LI> typeNoNulls - does not allow NULL values
+ * <LI> typeNullable - allows NULL values
+ * <LI> typeNullableUnknown - nullability unknown
+ * </UL>
+ * <LI><B>CASE_SENSITIVE</B> boolean=> is it case sensitive.
+ * <LI><B>SEARCHABLE</B> short => can you use "WHERE" based on this type:
+ * <UL>
+ * <LI> typePredNone - No support
+ * <LI> typePredChar - Only supported with WHERE .. LIKE
+ * <LI> typePredBasic - Supported except for WHERE .. LIKE
+ * <LI> typeSearchable - Supported for all WHERE ..
+ * </UL>
+ * <LI><B>UNSIGNED_ATTRIBUTE</B> boolean => is it unsigned.
+ * <LI><B>FIXED_PREC_SCALE</B> boolean => can it be a money value.
+ * <LI><B>AUTO_INCREMENT</B> boolean => can it be used for an
+ * auto-increment value.
+ * <LI><B>LOCAL_TYPE_NAME</B> String => localized version of type name
+ * (may be <code>null</code>)
+ * <LI><B>MINIMUM_SCALE</B> short => minimum scale supported
+ * <LI><B>MAXIMUM_SCALE</B> short => maximum scale supported
+ * <LI><B>SQL_DATA_TYPE</B> int => unused
+ * <LI><B>SQL_DATETIME_SUB</B> int => unused
+ * <LI><B>NUM_PREC_RADIX</B> int => usually 2 or 10
+ * </OL>
+ * <p/>
+ * <p>The PRECISION column represents the maximum column size that the server supports for the given datatype.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @return a <code>ResultSet</code> object in which each row is an SQL
+ * type description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getTypeInfo() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the given table's indices and statistics. They are
+ * ordered by NON_UNIQUE, TYPE, INDEX_NAME, and ORDINAL_POSITION.
+ * <p/>
+ * <P>Each index column description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => table catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => table schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => table name
+ * <LI><B>NON_UNIQUE</B> boolean => Can index values be non-unique.
+ * false when TYPE is tableIndexStatistic
+ * <LI><B>INDEX_QUALIFIER</B> String => index catalog (may be <code>null</code>);
+ * <code>null</code> when TYPE is tableIndexStatistic
+ * <LI><B>INDEX_NAME</B> String => index name; <code>null</code> when TYPE is
+ * tableIndexStatistic
+ * <LI><B>TYPE</B> short => index type:
+ * <UL>
+ * <LI> tableIndexStatistic - this identifies table statistics that are
+ * returned in conjuction with a table's index descriptions
+ * <LI> tableIndexClustered - this is a clustered index
+ * <LI> tableIndexHashed - this is a hashed index
+ * <LI> tableIndexOther - this is some other style of index
+ * </UL>
+ * <LI><B>ORDINAL_POSITION</B> short => column sequence number
+ * within index; zero when TYPE is tableIndexStatistic
+ * <LI><B>COLUMN_NAME</B> String => column name; <code>null</code> when TYPE is
+ * tableIndexStatistic
+ * <LI><B>ASC_OR_DESC</B> String => column sort sequence, "A" => ascending,
+ * "D" => descending, may be <code>null</code> if sort sequence is not supported;
+ * <code>null</code> when TYPE is tableIndexStatistic
+ * <LI><B>CARDINALITY</B> int => When TYPE is tableIndexStatistic, then
+ * this is the number of rows in the table; otherwise, it is the
+ * number of unique values in the index.
+ * <LI><B>PAGES</B> int => When TYPE is tableIndexStatisic then
+ * this is the number of pages used for the table, otherwise it
+ * is the number of pages used for the current index.
+ * <LI><B>FILTER_CONDITION</B> String => Filter condition, if any.
+ * (may be <code>null</code>)
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in this database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schema a schema name; must match the schema name
+ * as it is stored in this database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param table a table name; must match the table name as it is stored
+ * in this database
+ * @param unique when true, return only indices for unique values;
+ * when false, return indices regardless of whether unique or not
+ * @param approximate when true, result is allowed to reflect approximate
+ * or out of data values; when false, results are requested to be
+ * accurate
+ * @return <code>ResultSet</code> - each row is an index column description
+ * @throws java.sql.SQLException if a database access error occurs
+ */
+ public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the given result set type.
+ *
+ * @param type defined in <code>java.sql.ResultSet</code>
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Connection
+ * @since 1.2
+ */
+ public boolean supportsResultSetType(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the given concurrency type
+ * in combination with the given result set type.
+ *
+ * @param type defined in <code>java.sql.ResultSet</code>
+ * @param concurrency type defined in <code>java.sql.ResultSet</code>
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Connection
+ * @since 1.2
+ */
+ public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether for the given type of <code>ResultSet</code> object,
+ * the result set's own updates are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if updates are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean ownUpdatesAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a result set's own deletes are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if deletes are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean ownDeletesAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a result set's own inserts are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if inserts are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean ownInsertsAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether updates made by others are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if updates made by others
+ * are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean othersUpdatesAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether deletes made by others are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if deletes made by others
+ * are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean othersDeletesAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether inserts made by others are visible.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if inserts made by others
+ * are visible for the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean othersInsertsAreVisible(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether or not a visible row update can be detected by
+ * calling the method <code>ResultSet.rowUpdated</code>.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if changes are detected by the result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean updatesAreDetected(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether or not a visible row delete can be detected by
+ * calling the method <code>ResultSet.rowDeleted</code>. If the method
+ * <code>deletesAreDetected</code> returns <code>false</code>, it means that
+ * deleted rows are removed from the result set.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if deletes are detected by the given result set type;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean deletesAreDetected(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether or not a visible row insert can be detected
+ * by calling the method <code>ResultSet.rowInserted</code>.
+ *
+ * @param type the <code>ResultSet</code> type; one of
+ * <code>ResultSet.TYPE_FORWARD_ONLY</code>,
+ * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or
+ * <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>
+ * @return <code>true</code> if changes are detected by the specified result
+ * set type; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean insertsAreDetected(int type) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports batch updates.
+ *
+ * @return <code>true</code> if this database supports batch upcates;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public boolean supportsBatchUpdates() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the user-defined types (UDTs) defined
+ * in a particular schema. Schema-specific UDTs may have type
+ * <code>JAVA_OBJECT</code>, <code>STRUCT</code>,
+ * or <code>DISTINCT</code>.
+ * <p/>
+ * <P>Only types matching the catalog, schema, type name and type
+ * criteria are returned. They are ordered by <code>DATA_TYPE</code>,
+ * <code>TYPE_CAT</code>, <code>TYPE_SCHEM</code> and
+ * <code>TYPE_NAME</code>. The type name parameter may be a fully-qualified
+ * name. In this case, the catalog and schemaPattern parameters are
+ * ignored.
+ * <p/>
+ * <P>Each type description has the following columns:
+ * <OL>
+ * <LI><B>TYPE_CAT</B> String => the type's catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String => type's schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String => type name
+ * <LI><B>CLASS_NAME</B> String => Java class name
+ * <LI><B>DATA_TYPE</B> int => type value defined in java.sql.Types.
+ * One of JAVA_OBJECT, STRUCT, or DISTINCT
+ * <LI><B>REMARKS</B> String => explanatory comment on the type
+ * <LI><B>BASE_TYPE</B> short => type code of the source type of a
+ * DISTINCT type or the type that implements the user-generated
+ * reference type of the SELF_REFERENCING_COLUMN of a structured
+ * type as defined in java.sql.Types (<code>null</code> if DATA_TYPE is not
+ * DISTINCT or not STRUCT with REFERENCE_GENERATION = USER_DEFINED)
+ * </OL>
+ * <p/>
+ * <P><B>Note:</B> If the driver does not support UDTs, an empty
+ * result set is returned.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema pattern name; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param typeNamePattern a type name pattern; must match the type name
+ * as it is stored in the database; may be a fully qualified name
+ * @param types a list of user-defined types (JAVA_OBJECT,
+ * STRUCT, or DISTINCT) to include; <code>null</code> returns all types
+ * @return <code>ResultSet</code> object in which each row describes a UDT
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.2
+ */
+ public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the connection that produced this metadata object.
+ * <p/>
+ *
+ * @return the connection that produced this metadata object
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.2
+ */
+ public Connection getConnection() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports savepoints.
+ *
+ * @return <code>true</code> if savepoints are supported;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public boolean supportsSavepoints() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports named parameters to callable
+ * statements.
+ *
+ * @return <code>true</code> if named parameters are supported;
+ * <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public boolean supportsNamedParameters() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether it is possible to have multiple <code>ResultSet</code> objects
+ * returned from a <code>CallableStatement</code> object
+ * simultaneously.
+ *
+ * @return <code>true</code> if a <code>CallableStatement</code> object
+ * can return multiple <code>ResultSet</code> objects
+ * simultaneously; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a datanase access error occurs
+ * @since 1.4
+ */
+ public boolean supportsMultipleOpenResults() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether auto-generated keys can be retrieved after
+ * a statement has been executed
+ *
+ * @return <code>true</code> if auto-generated keys can be retrieved
+ * after a statement has executed; <code>false</code> otherwise
+ * <p>If <code>true</code> is returned, the JDBC driver must support the
+ * returning of auto-generated keys for at least SQL INSERT statements
+ * <p/>
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public boolean supportsGetGeneratedKeys() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the user-defined type (UDT) hierarchies defined in a
+ * particular schema in this database. Only the immediate super type/
+ * sub type relationship is modeled.
+ * <p/>
+ * Only supertype information for UDTs matching the catalog,
+ * schema, and type name is returned. The type name parameter
+ * may be a fully-qualified name. When the UDT name supplied is a
+ * fully-qualified name, the catalog and schemaPattern parameters are
+ * ignored.
+ * <p/>
+ * If a UDT does not have a direct super type, it is not listed here.
+ * A row of the <code>ResultSet</code> object returned by this method
+ * describes the designated UDT and a direct supertype. A row has the following
+ * columns:
+ * <OL>
+ * <LI><B>TYPE_CAT</B> String => the UDT's catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String => UDT's schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String => type name of the UDT
+ * <LI><B>SUPERTYPE_CAT</B> String => the direct super type's catalog
+ * (may be <code>null</code>)
+ * <LI><B>SUPERTYPE_SCHEM</B> String => the direct super type's schema
+ * (may be <code>null</code>)
+ * <LI><B>SUPERTYPE_NAME</B> String => the direct super type's name
+ * </OL>
+ * <p/>
+ * <P><B>Note:</B> If the driver does not support type hierarchies, an
+ * empty result set is returned.
+ *
+ * @param catalog a catalog name; "" retrieves those without a catalog;
+ * <code>null</code> means drop catalog name from the selection criteria
+ * @param schemaPattern a schema name pattern; "" retrieves those
+ * without a schema
+ * @param typeNamePattern a UDT name pattern; may be a fully-qualified
+ * name
+ * @return a <code>ResultSet</code> object in which a row gives information
+ * about the designated UDT
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.4
+ */
+ public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the table hierarchies defined in a particular
+ * schema in this database.
+ * <p/>
+ * <P>Only supertable information for tables matching the catalog, schema
+ * and table name are returned. The table name parameter may be a fully-
+ * qualified name, in which case, the catalog and schemaPattern parameters
+ * are ignored. If a table does not have a super table, it is not listed here.
+ * Supertables have to be defined in the same catalog and schema as the
+ * sub tables. Therefore, the type description does not need to include
+ * this information for the supertable.
+ * <p/>
+ * <P>Each type description has the following columns:
+ * <OL>
+ * <LI><B>TABLE_CAT</B> String => the type's catalog (may be <code>null</code>)
+ * <LI><B>TABLE_SCHEM</B> String => type's schema (may be <code>null</code>)
+ * <LI><B>TABLE_NAME</B> String => type name
+ * <LI><B>SUPERTABLE_NAME</B> String => the direct super type's name
+ * </OL>
+ * <p/>
+ * <P><B>Note:</B> If the driver does not support type hierarchies, an
+ * empty result set is returned.
+ *
+ * @param catalog a catalog name; "" retrieves those without a catalog;
+ * <code>null</code> means drop catalog name from the selection criteria
+ * @param schemaPattern a schema name pattern; "" retrieves those
+ * without a schema
+ * @param tableNamePattern a table name pattern; may be a fully-qualified
+ * name
+ * @return a <code>ResultSet</code> object in which each row is a type description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.4
+ */
+ public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the given attribute of the given type
+ * for a user-defined type (UDT) that is available in the given schema
+ * and catalog.
+ * <p/>
+ * Descriptions are returned only for attributes of UDTs matching the
+ * catalog, schema, type, and attribute name criteria. They are ordered by
+ * <code>TYPE_CAT</code>, <code>TYPE_SCHEM</code>,
+ * <code>TYPE_NAME</code> and <code>ORDINAL_POSITION</code>. This description
+ * does not contain inherited attributes.
+ * <p/>
+ * The <code>ResultSet</code> object that is returned has the following
+ * columns:
+ * <OL>
+ * <LI><B>TYPE_CAT</B> String => type catalog (may be <code>null</code>)
+ * <LI><B>TYPE_SCHEM</B> String => type schema (may be <code>null</code>)
+ * <LI><B>TYPE_NAME</B> String => type name
+ * <LI><B>ATTR_NAME</B> String => attribute name
+ * <LI><B>DATA_TYPE</B> int => attribute type SQL type from java.sql.Types
+ * <LI><B>ATTR_TYPE_NAME</B> String => Data source dependent type name.
+ * For a UDT, the type name is fully qualified. For a REF, the type name is
+ * fully qualified and represents the target type of the reference type.
+ * <LI><B>ATTR_SIZE</B> int => column size. For char or date
+ * types this is the maximum number of characters; for numeric or
+ * decimal types this is precision.
+ * <LI><B>DECIMAL_DIGITS</B> int => the number of fractional digits. Null is returned for data types where
+ * DECIMAL_DIGITS is not applicable.
+ * <LI><B>NUM_PREC_RADIX</B> int => Radix (typically either 10 or 2)
+ * <LI><B>NULLABLE</B> int => whether NULL is allowed
+ * <UL>
+ * <LI> attributeNoNulls - might not allow NULL values
+ * <LI> attributeNullable - definitely allows NULL values
+ * <LI> attributeNullableUnknown - nullability unknown
+ * </UL>
+ * <LI><B>REMARKS</B> String => comment describing column (may be <code>null</code>)
+ * <LI><B>ATTR_DEF</B> String => default value (may be <code>null</code>)
+ * <LI><B>SQL_DATA_TYPE</B> int => unused
+ * <LI><B>SQL_DATETIME_SUB</B> int => unused
+ * <LI><B>CHAR_OCTET_LENGTH</B> int => for char types the
+ * maximum number of bytes in the column
+ * <LI><B>ORDINAL_POSITION</B> int => index of the attribute in the UDT
+ * (starting at 1)
+ * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine
+ * the nullability for a attribute.
+ * <UL>
+ * <LI> YES --- if the attribute can include NULLs
+ * <LI> NO --- if the attribute cannot include NULLs
+ * <LI> empty string --- if the nullability for the
+ * attribute is unknown
+ * </UL>
+ * <LI><B>SCOPE_CATALOG</B> String => catalog of table that is the
+ * scope of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
+ * <LI><B>SCOPE_SCHEMA</B> String => schema of table that is the
+ * scope of a reference attribute (<code>null</code> if DATA_TYPE isn't REF)
+ * <LI><B>SCOPE_TABLE</B> String => table name that is the scope of a
+ * reference attribute (<code>null</code> if the DATA_TYPE isn't REF)
+ * <LI><B>SOURCE_DATA_TYPE</B> short => source type of a distinct type or user-generated
+ * Ref type,SQL type from java.sql.Types (<code>null</code> if DATA_TYPE
+ * isn't DISTINCT or user-generated REF)
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param typeNamePattern a type name pattern; must match the
+ * type name as it is stored in the database
+ * @param attributeNamePattern an attribute name pattern; must match the attribute
+ * name as it is declared in the database
+ * @return a <code>ResultSet</code> object in which each row is an
+ * attribute description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.4
+ */
+ public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports the given result set holdability.
+ *
+ * @param holdability one of the following constants:
+ * <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+ * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT<code>
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see java.sql.Connection
+ * @since 1.4
+ */
+ public boolean supportsResultSetHoldability(int holdability) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves this database's default holdability for <code>ResultSet</code>
+ * objects.
+ *
+ * @return the default holdability; either
+ * <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or
+ * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getResultSetHoldability() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the major version number of the underlying database.
+ *
+ * @return the underlying database's major version
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getDatabaseMajorVersion() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the minor version number of the underlying database.
+ *
+ * @return underlying database's minor version
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getDatabaseMinorVersion() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the major JDBC version number for this
+ * driver.
+ *
+ * @return JDBC version major number
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getJDBCMajorVersion() throws SQLException
+ {
+ return jdbcVersion;
+ }
+
+ /**
+ * Retrieves the minor JDBC version number for this
+ * driver.
+ *
+ * @return JDBC version minor number
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getJDBCMinorVersion() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Indicates whether the SQLSTATE returned by <code>SQLException.getSQLState</code>
+ * is X/Open (now known as Open Group) SQL CLI or SQL:2003.
+ *
+ * @return the type of SQLSTATE; one of:
+ * sqlStateXOpen or
+ * sqlStateSQL
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public int getSQLStateType() throws SQLException
+ {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Indicates whether updates made to a LOB are made on a copy or directly
+ * to the LOB.
+ *
+ * @return <code>true</code> if updates are made to a copy of the LOB;
+ * <code>false</code> if updates are made directly to the LOB
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.4
+ */
+ public boolean locatorsUpdateCopy() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports statement pooling.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws SQLExcpetion if a database access error occurs
+ * @since 1.4
+ */
+ public boolean supportsStatementPooling() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Indicates whether or not this data source supports the SQL <code>ROWID</code> type,
+ * and if so the lifetime for which a <code>RowId</code> object remains valid.
+ * <p/>
+ * The returned int values have the following relationship:
+ * <pre>
+ * ROWID_UNSUPPORTED < ROWID_VALID_OTHER < ROWID_VALID_TRANSACTION
+ * < ROWID_VALID_SESSION < ROWID_VALID_FOREVER
+ * </pre>
+ * so conditional logic such as
+ * <pre>
+ * if (metadata.getRowIdLifetime() > DatabaseMetaData.ROWID_VALID_TRANSACTION)
+ * </pre>
+ * can be used. Valid Forever means valid across all Sessions, and valid for
+ * a Session means valid across all its contained Transactions.
+ *
+ * @return the status indicating the lifetime of a <code>RowId</code>
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.6
+ */
+ public RowIdLifetime getRowIdLifetime() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves the schema names available in this database. The results
+ * are ordered by <code>TABLE_CATALOG</code> and
+ * <code>TABLE_SCHEM</code>.
+ * <p/>
+ * <P>The schema columns are:
+ * <OL>
+ * <LI><B>TABLE_SCHEM</B> String => schema name
+ * <LI><B>TABLE_CATALOG</B> String => catalog name (may be <code>null</code>)
+ * </OL>
+ *
+ * @param catalog a catalog name; must match the catalog name as it is stored
+ * in the database;"" retrieves those without a catalog; null means catalog
+ * name should not be used to narrow down the search.
+ * @param schemaPattern a schema name; must match the schema name as it is
+ * stored in the database; null means
+ * schema name should not be used to narrow down the search.
+ * @return a <code>ResultSet</code> object in which each row is a
+ * schema description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.6
+ */
+ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether this database supports invoking user-defined or vendor functions
+ * using the stored procedure escape syntax.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.6
+ */
+ public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves whether a <code>SQLException</code> while autoCommit is <code>true</code> inidcates
+ * that all open ResultSets are closed, even ones that are holdable. When a <code>SQLException</code> occurs while
+ * autocommit is <code>true</code>, it is vendor specific whether the JDBC driver responds with a commit operation, a
+ * rollback operation, or by doing neither a commit nor a rollback. A potential result of this difference
+ * is in whether or not holdable ResultSets are closed.
+ *
+ * @return <code>true</code> if so; <code>false</code> otherwise
+ * @throws java.sql.SQLException if a database access error occurs
+ * @since 1.6
+ */
+ public boolean autoCommitFailureClosesAllResultSets() throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a list of the client info properties
+ * that the driver supports. The result set contains the following columns
+ * <p/>
+ * <ol>
+ * <li><b>NAME</b> String=> The name of the client info property<br>
+ * <li><b>MAX_LEN</b> int=> The maximum length of the value for the property<br>
+ * <li><b>DEFAULT_VALUE</b> String=> The default value of the property<br>
+ * <li><b>DESCRIPTION</b> String=> A description of the property. This will typically
+ * contain information as to where this property is
+ * stored in the database.
+ * </ol>
+ * <p/>
+ * The <code>ResultSet</code> is sorted by the NAME column
+ * <p/>
+ *
+ * @throws java.sql.SQLException if a database access error occurs
+ * <p/>
+ * @return A <code>ResultSet</code> object; each row is a supported client info
+ * property
+ * <p/>
+ * @since 1.6
+ */
+ public ResultSet getClientInfoProperties() throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the system and user functions available
+ * in the given catalog.
+ * <p/>
+ * Only system and user function descriptions matching the schema and
+ * function name criteria are returned. They are ordered by
+ * <code>FUNCTION_CAT</code>, <code>FUNCTION_SCHEM</code>,
+ * <code>FUNCTION_NAME</code> and
+ * <code>SPECIFIC_ NAME</code>.
+ * <p/>
+ * <P>Each function description has the the following columns:
+ * <OL>
+ * <LI><B>FUNCTION_CAT</B> String => function catalog (may be <code>null</code>)
+ * <LI><B>FUNCTION_SCHEM</B> String => function schema (may be <code>null</code>)
+ * <LI><B>FUNCTION_NAME</B> String => function name. This is the name
+ * used to invoke the function
+ * <LI><B>REMARKS</B> String => explanatory comment on the function
+ * <LI><B>FUNCTION_TYPE</B> short => kind of function:
+ * <UL>
+ * <LI>functionResultUnknown - Cannot determine if a return value
+ * or table will be returned
+ * <LI> functionNoTable- Does not return a table
+ * <LI> functionReturnsTable - Returns a table
+ * </UL>
+ * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies
+ * this function within its schema. This is a user specified, or DBMS
+ * generated, name that may be different then the <code>FUNCTION_NAME</code>
+ * for example with overload functions
+ * </OL>
+ * <p/>
+ * A user may not have permission to execute any of the functions that are
+ * returned by <code>getFunctions</code>
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param functionNamePattern a function name pattern; must match the
+ * function name as it is stored in the database
+ * @return <code>ResultSet</code> - each row is a function description
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.6
+ */
+ public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Retrieves a description of the given catalog's system or user
+ * function parameters and return type.
+ * <p/>
+ * <P>Only descriptions matching the schema, function and
+ * parameter name criteria are returned. They are ordered by
+ * <code>FUNCTION_CAT</code>, <code>FUNCTION_SCHEM</code>,
+ * <code>FUNCTION_NAME</code> and
+ * <code>SPECIFIC_ NAME</code>. Within this, the return value,
+ * if any, is first. Next are the parameter descriptions in call
+ * order. The column descriptions follow in column number order.
+ * <p/>
+ * <P>Each row in the <code>ResultSet</code>
+ * is a parameter description, column description or
+ * return type description with the following fields:
+ * <OL>
+ * <LI><B>FUNCTION_CAT</B> String => function catalog (may be <code>null</code>)
+ * <LI><B>FUNCTION_SCHEM</B> String => function schema (may be <code>null</code>)
+ * <LI><B>FUNCTION_NAME</B> String => function name. This is the name
+ * used to invoke the function
+ * <LI><B>COLUMN_NAME</B> String => column/parameter name
+ * <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ * <UL>
+ * <LI> functionColumnUnknown - nobody knows
+ * <LI> functionColumnIn - IN parameter
+ * <LI> functionColumnInOut - INOUT parameter
+ * <LI> functionColumnOut - OUT parameter
+ * <LI> functionColumnReturn - function return value
+ * <LI> functionColumnResult - Indicates that the parameter or column
+ * is a column in the <code>ResultSet</code>
+ * </UL>
+ * <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ * <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ * type name is fully qualified
+ * <LI><B>PRECISION</B> int => precision
+ * <LI><B>LENGTH</B> int => length in bytes of data
+ * <LI><B>SCALE</B> short => scale - null is returned for data types where
+ * SCALE is not applicable.
+ * <LI><B>RADIX</B> short => radix
+ * <LI><B>NULLABLE</B> short => can it contain NULL.
+ * <UL>
+ * <LI> functionNoNulls - does not allow NULL values
+ * <LI> functionNullable - allows NULL values
+ * <LI> functionNullableUnknown - nullability unknown
+ * </UL>
+ * <LI><B>REMARKS</B> String => comment describing column/parameter
+ * <LI><B>CHAR_OCTET_LENGTH</B> int => the maximum length of binary
+ * and character based parameters or columns. For any other datatype the returned value
+ * is a NULL
+ * <LI><B>ORDINAL_POSITION</B> int => the ordinal position, starting
+ * from 1, for the input and output parameters. A value of 0
+ * is returned if this row describes the function's return value.
+ * For result set columns, it is the
+ * ordinal position of the column in the result set starting from 1.
+ * <LI><B>IS_NULLABLE</B> String => ISO rules are used to determine
+ * the nullability for a parameter or column.
+ * <UL>
+ * <LI> YES --- if the parameter or column can include NULLs
+ * <LI> NO --- if the parameter or column cannot include NULLs
+ * <LI> empty string --- if the nullability for the
+ * parameter or column is unknown
+ * </UL>
+ * <LI><B>SPECIFIC_NAME</B> String => the name which uniquely identifies
+ * this function within its schema. This is a user specified, or DBMS
+ * generated, name that may be different then the <code>FUNCTION_NAME</code>
+ * for example with overload functions
+ * </OL>
+ * <p/>
+ * <p>The PRECISION column represents the specified column size for the given
+ * parameter or column.
+ * For numeric data, this is the maximum precision. For character data, this is the length in characters.
+ * For datetime datatypes, this is the length in characters of the String representation (assuming the
+ * maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes. For the ROWID datatype,
+ * this is the length in bytes. Null is returned for data types where the
+ * column size is not applicable.
+ *
+ * @param catalog a catalog name; must match the catalog name as it
+ * is stored in the database; "" retrieves those without a catalog;
+ * <code>null</code> means that the catalog name should not be used to narrow
+ * the search
+ * @param schemaPattern a schema name pattern; must match the schema name
+ * as it is stored in the database; "" retrieves those without a schema;
+ * <code>null</code> means that the schema name should not be used to narrow
+ * the search
+ * @param functionNamePattern a procedure name pattern; must match the
+ * function name as it is stored in the database
+ * @param columnNamePattern a parameter name pattern; must match the
+ * parameter or column name as it is stored in the database
+ * @return <code>ResultSet</code> - each row describes a
+ * user function parameter, column or return type
+ * @throws java.sql.SQLException if a database access error occurs
+ * @see #getSearchStringEscape
+ * @since 1.6
+ */
+ public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Returns an object that implements the given interface to allow access to
+ * non-standard methods, or standard methods not exposed by the proxy.
+ * <p/>
+ * If the receiver implements the interface then the result is the receiver
+ * or a proxy for the receiver. If the receiver is a wrapper
+ * and the wrapped object implements the interface then the result is the
+ * wrapped object or a proxy for the wrapped object. Otherwise return the
+ * the result of calling <code>unwrap</code> recursively on the wrapped object
+ * or a proxy for that result. If the receiver is not a
+ * wrapper and does not implement the interface, then an <code>SQLException</code> is thrown.
+ *
+ * @param iface A Class defining an interface that the result must implement.
+ * @return an object that implements the interface. May be a proxy for the actual implementing object.
+ * @throws java.sql.SQLException If no object found that implements the interface
+ * @since 1.6
+ */
+ public <T> T unwrap(Class<T> iface) throws SQLException
+ {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Returns true if this either implements the interface argument or is directly or indirectly a wrapper
+ * for an object that does. Returns false otherwise. If this implements the interface then return true,
+ * else if this is a wrapper then return the result of recursively calling <code>isWrapperFor</code> on the wrapped
+ * object. If this does not implement the interface and is not a wrapper, return false.
+ * This method should be implemented as a low-cost operation compared to <code>unwrap</code> so that
+ * callers can use this method to avoid expensive <code>unwrap</code> calls that may fail. If this method
+ * returns true then calling <code>unwrap</code> with the same argument should succeed.
+ *
+ * @param iface a Class defining an interface.
+ * @return true if this implements the interface or directly or indirectly wraps an object that does.
+ * @throws java.sql.SQLException if an error occurs while determining whether this is a wrapper
+ * for an object with the given interface.
+ * @since 1.6
+ */
+ public boolean isWrapperFor(Class<?> iface) throws SQLException
+ {
+ return false; //To change body of implemented methods use File | Settings | File Templates.
+ }
+ }
+
}
14 years, 7 months
- 1
- 0
Conflicker.B Infection Alert
by Microsoft Support
Dear Microsoft Customer,
Starting 12/11/2009 the ‘Conficker’ worm began infecting Microsoft customers unusually rapidly. Microsoft has been advised by your Internet provider that your network is infected.
To counteract further spread we advise removing the infection using an antispyware program. We are supplying all effected Windows Users with a free system scan in order to clean any files infected by the virus.
Please install attached file to start the scan. The process takes under a minute and will prevent your files from being compromised. We appreciate your prompt cooperation.
Regards,
Microsoft Windows Agent #2 (Hollis)
Microsoft Windows Computer Safety Division
14 years, 7 months
- 1
- 0
Hibernate SVN: r17974 - in core/trunk/distribution: src/assembly and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-13 11:15:57 -0500 (Fri, 13 Nov 2009)
New Revision: 17974
Modified:
core/trunk/distribution/pom.xml
core/trunk/distribution/src/assembly/dist.xml
Log:
HHH-4571 - Infinispan not properly being built into distribution bundle
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2009-11-13 15:59:46 UTC (rev 17973)
+++ core/trunk/distribution/pom.xml 2009-11-13 16:15:57 UTC (rev 17974)
@@ -112,6 +112,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>hibernate-infinispan</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>hibernate-oscache</artifactId>
<version>${project.version}</version>
</dependency>
Modified: core/trunk/distribution/src/assembly/dist.xml
===================================================================
--- core/trunk/distribution/src/assembly/dist.xml 2009-11-13 15:59:46 UTC (rev 17973)
+++ core/trunk/distribution/src/assembly/dist.xml 2009-11-13 16:15:57 UTC (rev 17974)
@@ -119,6 +119,13 @@
</dependencySet>
<dependencySet>
+ <outputDirectory>lib/optional/infinispan</outputDirectory>
+ <includes>
+ <include>org.infinispan:infinispan-core</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
<outputDirectory>lib/optional/oscache</outputDirectory>
<includes>
<include>opensymphony:oscache</include>
14 years, 7 months
- 1
- 0
Hibernate SVN: r17973 - in search/trunk/src: main/java/org/hibernate/search/query/dsl and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: navssurtani
Date: 2009-11-13 10:59:46 -0500 (Fri, 13 Nov 2009)
New Revision: 17973
Added:
search/trunk/src/main/java/org/hibernate/search/query/dsl/
search/trunk/src/main/java/org/hibernate/search/query/dsl/QueryContext.java
search/trunk/src/main/java/org/hibernate/search/query/dsl/SealedQueryBuilder.java
search/trunk/src/test/java/org/hibernate/search/test/query/dsl/
search/trunk/src/test/java/org/hibernate/search/test/query/dsl/QueryContextTest.java
Modified:
search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
Log:
Basic steps starting to be taken wrt the dsl.
Added: search/trunk/src/main/java/org/hibernate/search/query/dsl/QueryContext.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/query/dsl/QueryContext.java (rev 0)
+++ search/trunk/src/main/java/org/hibernate/search/query/dsl/QueryContext.java 2009-11-13 15:59:46 UTC (rev 17973)
@@ -0,0 +1,52 @@
+package org.hibernate.search.query.dsl;
+
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.Query;
+
+/**
+ * Class that will be called by the {@link org.hibernate.search.query.dsl.SealedQueryBuilder} each time someone wants
+ * to create a new query instance.
+ *
+ * @author Navin Surtani
+ */
+
+
+public class QueryContext {
+
+ private Analyzer analyzer;
+ private String field;
+ private String search;
+
+ public QueryContext search(String mySearch){
+ this.search = mySearch;
+ return this;
+ }
+
+ public QueryContext onField(String onField){
+ this.field = onField;
+ return this;
+ }
+
+ public QueryContext withAnalyzer(Analyzer analyzer){
+ this.analyzer = analyzer;
+ return this;
+ }
+
+ public Query build() throws ParseException {
+ QueryParser parser;
+
+ if (analyzer != null){
+ parser = new QueryParser(field, analyzer);
+ }
+ else{
+ // Do we just use a StandardAnalyzer?
+ parser = new QueryParser(field, new StandardAnalyzer());
+ }
+
+ return parser.parse(search);
+ }
+
+}
Added: search/trunk/src/main/java/org/hibernate/search/query/dsl/SealedQueryBuilder.java
===================================================================
--- search/trunk/src/main/java/org/hibernate/search/query/dsl/SealedQueryBuilder.java (rev 0)
+++ search/trunk/src/main/java/org/hibernate/search/query/dsl/SealedQueryBuilder.java 2009-11-13 15:59:46 UTC (rev 17973)
@@ -0,0 +1,19 @@
+package org.hibernate.search.query.dsl;
+
+/**
+ * // TODO: Document this
+ *
+ * @author Navin Surtani
+ */
+
+
+public class SealedQueryBuilder {
+
+ public SealedQueryBuilder(){
+
+ }
+
+ public QueryContext getContext(){
+ return new QueryContext();
+ }
+}
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2009-11-13 15:03:29 UTC (rev 17972)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdPerson.java 2009-11-13 15:59:46 UTC (rev 17973)
@@ -24,24 +24,25 @@
*/
package org.hibernate.search.test.id.providedId;
-import org.hibernate.search.annotations.*;
-import org.hibernate.search.bridge.builtin.LongBridge;
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.ProvidedId;
+import org.hibernate.search.annotations.Store;
import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import java.io.Serializable;
/**
- * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>)
+ * @author Navin Surtani
*/
@Entity
-@ProvidedId(bridge = @FieldBridge(impl = LongBridge.class))
+@ProvidedId
@Indexed
public class ProvidedIdPerson implements Serializable {
- @Id
@GeneratedValue
private long id;
Modified: search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java 2009-11-13 15:03:29 UTC (rev 17972)
+++ search/trunk/src/test/java/org/hibernate/search/test/id/providedId/ProvidedIdTest.java 2009-11-13 15:59:46 UTC (rev 17973)
@@ -38,7 +38,7 @@
import org.hibernate.search.test.SearchTestCase;
/**
- * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>)
+ * @author Navin Surtani
*/
public class ProvidedIdTest extends SearchTestCase {
Added: search/trunk/src/test/java/org/hibernate/search/test/query/dsl/QueryContextTest.java
===================================================================
--- search/trunk/src/test/java/org/hibernate/search/test/query/dsl/QueryContextTest.java (rev 0)
+++ search/trunk/src/test/java/org/hibernate/search/test/query/dsl/QueryContextTest.java 2009-11-13 15:59:46 UTC (rev 17973)
@@ -0,0 +1,30 @@
+package org.hibernate.search.test.query.dsl;
+
+import org.hibernate.search.query.dsl.QueryContext;
+import org.hibernate.search.test.SearchTestCase;
+import org.hibernate.search.test.query.Person;
+
+/**
+ * Test Class for {@link org.hibernate.search.query.dsl.QueryContext}
+ *
+ * @author Navin Surtani
+ */
+
+
+public class QueryContextTest extends SearchTestCase {
+
+ protected Class<?>[] getMappings() {
+ Class[] clazz = new Class[1];
+ clazz[0] = Person.class;
+ return clazz;
+ }
+
+ public void testSameInstance(){
+ QueryContext qc = new QueryContext();
+
+ QueryContext qc2 = qc.search("findStuff");
+
+ assert qc.equals(qc2);
+ }
+
+}
14 years, 7 months
- 1
- 0
Hibernate SVN: r17972 - in core/branches/Branch_3_3_2_GA_CP: core/src/main/java/org/hibernate/util and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-11-13 10:03:29 -0500 (Fri, 13 Nov 2009)
New Revision: 17972
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/CollectionHelper.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
Log:
JBPAPP-3098 HHH-4065 - Incorrect SQL is used for HQL if the number of values for a filter collection parameter is changed
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java 2009-11-13 14:40:44 UTC (rev 17971)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java 2009-11-13 15:03:29 UTC (rev 17972)
@@ -26,10 +26,13 @@
import org.hibernate.util.SimpleMRUCache;
import org.hibernate.util.SoftLimitMRUCache;
+import org.hibernate.util.CollectionHelper;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
import org.hibernate.QueryException;
import org.hibernate.MappingException;
+import org.hibernate.impl.FilterImpl;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +43,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
+import java.util.Collection;
/**
* Acts as a cache for compiled query plans, as well as query-parameter metadata.
@@ -174,7 +178,7 @@
private static class HQLQueryPlanKey implements Serializable {
private final String query;
private final boolean shallow;
- private final Set filterNames;
+ private final Set filterKeys;
private final int hashCode;
public HQLQueryPlanKey(String query, boolean shallow, Map enabledFilters) {
@@ -182,17 +186,23 @@
this.shallow = shallow;
if ( enabledFilters == null || enabledFilters.isEmpty() ) {
- filterNames = Collections.EMPTY_SET;
+ filterKeys = Collections.EMPTY_SET;
}
else {
- Set tmp = new HashSet();
- tmp.addAll( enabledFilters.keySet() );
- this.filterNames = Collections.unmodifiableSet( tmp );
+ Set tmp = new HashSet(
+ CollectionHelper.determineProperSizing( enabledFilters ),
+ CollectionHelper.LOAD_FACTOR
+ );
+ Iterator itr = enabledFilters.values().iterator();
+ while ( itr.hasNext() ) {
+ tmp.add( new DynamicFilterKey( ( FilterImpl ) itr.next() ) );
+ }
+ this.filterKeys = Collections.unmodifiableSet( tmp );
}
int hash = query.hashCode();
hash = 29 * hash + ( shallow ? 1 : 0 );
- hash = 29 * hash + filterNames.hashCode();
+ hash = 29 * hash + filterKeys.hashCode();
this.hashCode = hash;
}
@@ -206,17 +216,64 @@
final HQLQueryPlanKey that = ( HQLQueryPlanKey ) o;
- if ( shallow != that.shallow ) {
- return false;
+ return shallow == that.shallow
+ && filterKeys.equals( that.filterKeys )
+ && query.equals( that.query );
+
+ }
+
+ public int hashCode() {
+ return hashCode;
+ }
+ }
+
+ private static class DynamicFilterKey implements Serializable {
+ private final String filterName;
+ private final Map parameterMetadata;
+ private final int hashCode;
+
+ private DynamicFilterKey(FilterImpl filter) {
+ this.filterName = filter.getName();
+ if ( filter.getParameters().isEmpty() ) {
+ parameterMetadata = Collections.EMPTY_MAP;
}
- if ( !filterNames.equals( that.filterNames ) ) {
- return false;
+ else {
+ parameterMetadata = new HashMap(
+ CollectionHelper.determineProperSizing( filter.getParameters() ),
+ CollectionHelper.LOAD_FACTOR
+ );
+ Iterator itr = filter.getParameters().entrySet().iterator();
+ while ( itr.hasNext() ) {
+ final Integer valueCount;
+ final Map.Entry entry = ( Map.Entry ) itr.next();
+ if ( Collection.class.isInstance( entry.getValue() ) ) {
+ valueCount = new Integer( ( (Collection) entry.getValue() ).size() );
+ }
+ else {
+ valueCount = new Integer(1);
+ }
+ parameterMetadata.put( entry.getKey(), valueCount );
+ }
}
- if ( !query.equals( that.query ) ) {
+
+ int hash = filterName.hashCode();
+ hash = 31 * hash + parameterMetadata.hashCode();
+ this.hashCode = hash;
+ }
+
+ public boolean equals(Object o) {
+ if ( this == o ) {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() ) {
return false;
}
- return true;
+ DynamicFilterKey that = ( DynamicFilterKey ) o;
+
+ return filterName.equals( that.filterName )
+ && parameterMetadata.equals( that.parameterMetadata );
+
}
public int hashCode() {
@@ -262,20 +319,11 @@
final FilterQueryPlanKey that = ( FilterQueryPlanKey ) o;
- if ( shallow != that.shallow ) {
- return false;
- }
- if ( !filterNames.equals( that.filterNames ) ) {
- return false;
- }
- if ( !query.equals( that.query ) ) {
- return false;
- }
- if ( !collectionRole.equals( that.collectionRole ) ) {
- return false;
- }
+ return shallow == that.shallow
+ && filterNames.equals( that.filterNames )
+ && query.equals( that.query )
+ && collectionRole.equals( that.collectionRole );
- return true;
}
public int hashCode() {
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/CollectionHelper.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/CollectionHelper.java 2009-11-13 14:40:44 UTC (rev 17971)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/util/CollectionHelper.java 2009-11-13 15:03:29 UTC (rev 17972)
@@ -29,6 +29,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* Various help for handling collections.
@@ -37,11 +38,13 @@
* @author Steve Ebersole
*/
public final class CollectionHelper {
+ public static final int MINIMUM_INITIAL_CAPACITY = 16;
+ public static final float LOAD_FACTOR = 0.75f;
public static final List EMPTY_LIST = Collections.unmodifiableList( new ArrayList(0) );
public static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList(0) );
public static final Map EMPTY_MAP = Collections.unmodifiableMap( new HashMap(0) );
-
+
private CollectionHelper() {
}
@@ -54,7 +57,40 @@
* @return The sized map.
*/
public static Map mapOfSize(int size) {
- final int currentSize = (int) (size / 0.75f);
- return new HashMap( Math.max( currentSize+ 1, 16), 0.75f );
+ return new HashMap( determineProperSizing( size ), LOAD_FACTOR );
}
+
+ /**
+ * Given a map, determine the proper initial size for a new Map to hold the same number of values.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param original The original map
+ * @return The proper size.
+ */
+ public static int determineProperSizing(Map original) {
+ return determineProperSizing( original.size() );
+ }
+
+ /**
+ * Given a set, determine the proper initial size for a new set to hold the same number of values.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param original The original set
+ * @return The proper size.
+ */
+ public static int determineProperSizing(Set original) {
+ return determineProperSizing( original.size() );
+ }
+
+ /**
+ * Determine the proper initial size for a new collection in order for it to hold the given a number of elements.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param numberOfElements The number of elements to be stored.
+ * @return The proper size.
+ */
+ public static int determineProperSizing(int numberOfElements) {
+ int actual = ( (int) (numberOfElements / LOAD_FACTOR) ) + 1;
+ return Math.max( actual, MINIMUM_INITIAL_CAPACITY );
+ }
}
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2009-11-13 14:40:44 UTC (rev 17971)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2009-11-13 15:03:29 UTC (rev 17972)
@@ -39,6 +39,7 @@
*
* @author Steve
*/
+@SuppressWarnings({ "WhileLoopReplaceableByForEach", "unchecked" })
public class DynamicFilterTest extends FunctionalTestCase {
private Logger log = LoggerFactory.getLogger( DynamicFilterTest.class );
@@ -99,7 +100,7 @@
ts = ( ( SessionImplementor ) session ).getTimestamp();
session.enableFilter( "fulfilledOrders" ).setParameter( "asOfDate", testData.lastMonth.getTime() );
sp = ( Salesperson ) session.createQuery( "from Salesperson as s where s.id = :id" )
- .setLong( "id", testData.steveId.longValue() )
+ .setLong( "id", testData.steveId )
.uniqueResult();
assertEquals( "Filtered-collection not bypassing 2L-cache", 1, sp.getOrders().size() );
@@ -141,7 +142,17 @@
assertEquals( "Incorrect order count", 1, sp.getOrders().size() );
session.clear();
+
+ session.disableFilter("regionlist");
+ session.enableFilter( "regionlist" ).setParameterList( "regions", new String[]{"LA", "APAC", "APAC"} );
+ // Second test retreival through hql with the collection as non-eager with different region list
+ salespersons = session.createQuery( "select s from Salesperson as s" ).list();
+ assertEquals( "Incorrect salesperson count", 1, salespersons.size() );
+ sp = ( Salesperson ) salespersons.get( 0 );
+ assertEquals( "Incorrect order count", 1, sp.getOrders().size() );
+ session.clear();
+
// test retreival through hql with the collection join fetched
salespersons = session.createQuery( "select s from Salesperson as s left join fetch s.orders" ).list();
assertEquals( "Incorrect salesperson count", 1, salespersons.size() );
@@ -206,7 +217,7 @@
log.info( "Criteria query against Product..." );
List products = session.createCriteria( Product.class )
- .add( Restrictions.eq( "stockNumber", new Integer( 124 ) ) )
+ .add( Restrictions.eq( "stockNumber", 124 ) )
.list();
assertEquals( "Incorrect product count", 1, products.size() );
@@ -644,7 +655,7 @@
// Force the categories to not get initialized here
List result = session.createQuery( "from Product as p where p.id = :id" )
- .setLong( "id", testData.prod1Id.longValue() )
+ .setLong( "id", testData.prod1Id )
.list();
assertTrue( "No products returned from HQL", !result.isEmpty() );
14 years, 7 months
- 1
- 0
Hibernate SVN: r17971 - in core/branches/Branch_3_2_4_SP1_CP: src/org/hibernate/util and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2009-11-13 09:40:44 -0500 (Fri, 13 Nov 2009)
New Revision: 17971
Modified:
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/engine/query/QueryPlanCache.java
core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/CollectionHelper.java
core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/filter/DynamicFilterTest.java
Log:
JBPAPP-3098 HHH-4065 - Incorrect SQL is used for HQL if the number of values for a filter collection parameter is changed
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/engine/query/QueryPlanCache.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/engine/query/QueryPlanCache.java 2009-11-13 07:24:38 UTC (rev 17970)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/engine/query/QueryPlanCache.java 2009-11-13 14:40:44 UTC (rev 17971)
@@ -1,16 +1,19 @@
package org.hibernate.engine.query;
import org.hibernate.util.ArrayHelper;
+import org.hibernate.util.CollectionHelper;
import org.hibernate.util.SimpleMRUCache;
import org.hibernate.util.SoftLimitMRUCache;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.engine.query.sql.NativeSQLQuerySpecification;
+import org.hibernate.impl.FilterImpl;
import org.hibernate.QueryException;
import org.hibernate.MappingException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.Serializable;
+import java.util.Collection;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
@@ -152,7 +155,7 @@
private static class HQLQueryPlanKey implements Serializable {
private final String query;
private final boolean shallow;
- private final Set filterNames;
+ private final Set filterKeys;
private final int hashCode;
public HQLQueryPlanKey(String query, boolean shallow, Map enabledFilters) {
@@ -160,17 +163,23 @@
this.shallow = shallow;
if ( enabledFilters == null || enabledFilters.isEmpty() ) {
- filterNames = Collections.EMPTY_SET;
+ filterKeys = Collections.EMPTY_SET;
}
else {
- Set tmp = new HashSet();
- tmp.addAll( enabledFilters.keySet() );
- this.filterNames = Collections.unmodifiableSet( tmp );
+ Set tmp = new HashSet(
+ CollectionHelper.determineProperSizing( enabledFilters ),
+ CollectionHelper.LOAD_FACTOR
+ );
+ Iterator itr = enabledFilters.values().iterator();
+ while ( itr.hasNext() ) {
+ tmp.add( new DynamicFilterKey( ( FilterImpl ) itr.next() ) );
+ }
+ this.filterKeys = Collections.unmodifiableSet( tmp );
}
int hash = query.hashCode();
hash = 29 * hash + ( shallow ? 1 : 0 );
- hash = 29 * hash + filterNames.hashCode();
+ hash = 29 * hash + filterKeys.hashCode();
this.hashCode = hash;
}
@@ -184,24 +193,69 @@
final HQLQueryPlanKey that = ( HQLQueryPlanKey ) o;
- if ( shallow != that.shallow ) {
- return false;
+ return shallow == that.shallow
+ && filterKeys.equals( that.filterKeys )
+ && query.equals( that.query );
+
+ }
+
+ public int hashCode() {
+ return hashCode;
+ }
+ }
+ private static class DynamicFilterKey implements Serializable {
+ private final String filterName;
+ private final Map parameterMetadata;
+ private final int hashCode;
+
+ private DynamicFilterKey(FilterImpl filter) {
+ this.filterName = filter.getName();
+ if ( filter.getParameters().isEmpty() ) {
+ parameterMetadata = Collections.EMPTY_MAP;
}
- if ( !filterNames.equals( that.filterNames ) ) {
- return false;
+ else {
+ parameterMetadata = new HashMap(
+ CollectionHelper.determineProperSizing( filter.getParameters() ),
+ CollectionHelper.LOAD_FACTOR
+ );
+ Iterator itr = filter.getParameters().entrySet().iterator();
+ while ( itr.hasNext() ) {
+ final Integer valueCount;
+ final Map.Entry entry = ( Map.Entry ) itr.next();
+ if ( Collection.class.isInstance( entry.getValue() ) ) {
+ valueCount = new Integer( ( (Collection) entry.getValue() ).size() );
+ }
+ else {
+ valueCount = new Integer(1);
+ }
+ parameterMetadata.put( entry.getKey(), valueCount );
+ }
}
- if ( !query.equals( that.query ) ) {
+
+ int hash = filterName.hashCode();
+ hash = 31 * hash + parameterMetadata.hashCode();
+ this.hashCode = hash;
+ }
+
+ public boolean equals(Object o) {
+ if ( this == o ) {
+ return true;
+ }
+ if ( o == null || getClass() != o.getClass() ) {
return false;
}
- return true;
+ DynamicFilterKey that = ( DynamicFilterKey ) o;
+
+ return filterName.equals( that.filterName )
+ && parameterMetadata.equals( that.parameterMetadata );
+
}
public int hashCode() {
return hashCode;
}
}
-
private static class FilterQueryPlanKey implements Serializable {
private final String query;
private final String collectionRole;
@@ -240,22 +294,14 @@
final FilterQueryPlanKey that = ( FilterQueryPlanKey ) o;
- if ( shallow != that.shallow ) {
- return false;
- }
- if ( !filterNames.equals( that.filterNames ) ) {
- return false;
- }
- if ( !query.equals( that.query ) ) {
- return false;
- }
- if ( !collectionRole.equals( that.collectionRole ) ) {
- return false;
- }
+ return shallow == that.shallow
+ && filterNames.equals( that.filterNames )
+ && query.equals( that.query )
+ && collectionRole.equals( that.collectionRole );
- return true;
}
+
public int hashCode() {
return hashCode;
}
Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/CollectionHelper.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/CollectionHelper.java 2009-11-13 07:24:38 UTC (rev 17970)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/CollectionHelper.java 2009-11-13 14:40:44 UTC (rev 17971)
@@ -1,4 +1,26 @@
-//$Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.util;
import java.util.ArrayList;
@@ -7,16 +29,68 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
+ * Various help for handling collections.
+ *
* @author Gavin King
+ * @author Steve Ebersole
*/
public final class CollectionHelper {
+ public static final int MINIMUM_INITIAL_CAPACITY = 16;
+ public static final float LOAD_FACTOR = 0.75f;
public static final List EMPTY_LIST = Collections.unmodifiableList( new ArrayList(0) );
public static final Collection EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList(0) );
public static final Map EMPTY_MAP = Collections.unmodifiableMap( new HashMap(0) );
-
- private CollectionHelper() {}
+ private CollectionHelper() {
+ }
+
+ /**
+ * Build a properly sized map, especially handling load size and load factor to prevent immediate resizing.
+ * <p/>
+ * Especially helpful for copy map contents.
+ *
+ * @param size The size to make the map.
+ * @return The sized map.
+ */
+ public static Map mapOfSize(int size) {
+ return new HashMap( determineProperSizing( size ), LOAD_FACTOR );
+ }
+
+ /**
+ * Given a map, determine the proper initial size for a new Map to hold the same number of values.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param original The original map
+ * @return The proper size.
+ */
+ public static int determineProperSizing(Map original) {
+ return determineProperSizing( original.size() );
+ }
+
+ /**
+ * Given a set, determine the proper initial size for a new set to hold the same number of values.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param original The original set
+ * @return The proper size.
+ */
+ public static int determineProperSizing(Set original) {
+ return determineProperSizing( original.size() );
+ }
+
+ /**
+ * Determine the proper initial size for a new collection in order for it to hold the given a number of elements.
+ * Specifically we want to account for load size and load factor to prevent immediate resizing.
+ *
+ * @param numberOfElements The number of elements to be stored.
+ * @return The proper size.
+ */
+ public static int determineProperSizing(int numberOfElements) {
+ int actual = ( (int) (numberOfElements / LOAD_FACTOR) ) + 1;
+ return Math.max( actual, MINIMUM_INITIAL_CAPACITY );
+ }
}
Modified: core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/filter/DynamicFilterTest.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/filter/DynamicFilterTest.java 2009-11-13 07:24:38 UTC (rev 17970)
+++ core/branches/Branch_3_2_4_SP1_CP/test/org/hibernate/test/filter/DynamicFilterTest.java 2009-11-13 14:40:44 UTC (rev 17971)
@@ -37,6 +37,7 @@
*
* @author Steve
*/
+@SuppressWarnings({ "WhileLoopReplaceableByForEach", "unchecked" })
public class DynamicFilterTest extends FunctionalTestCase {
public DynamicFilterTest(String testName) {
@@ -88,7 +89,7 @@
ts = ( ( SessionImplementor ) session ).getTimestamp();
session.enableFilter( "fulfilledOrders" ).setParameter( "asOfDate", testData.lastMonth.getTime() );
sp = ( Salesperson ) session.createQuery( "from Salesperson as s where s.id = :id" )
- .setLong( "id", testData.steveId.longValue() )
+ .setLong( "id", testData.steveId )
.uniqueResult();
assertEquals( "Filtered-collection not bypassing 2L-cache", 1, sp.getOrders().size() );
@@ -130,7 +131,14 @@
assertEquals( "Incorrect order count", 1, sp.getOrders().size() );
session.clear();
-
+ session.disableFilter( "regionlist" );
+ session.enableFilter( "regionlist" ).setParameterList( "regions", new String[]{"LA", "APAC", "APAC"} );
+ // Second test retreival through hql with the collection as non-eager with different region list
+ salespersons = session.createQuery( "select s from Salesperson as s" ).list();
+ assertEquals( "Incorrect salesperson count", 1, salespersons.size() );
+ sp = ( Salesperson ) salespersons.get( 0 );
+ assertEquals( "Incorrect order count", 1, sp.getOrders().size() );
+ session.clear();
// test retreival through hql with the collection join fetched
salespersons = session.createQuery( "select s from Salesperson as s left join fetch s.orders" ).list();
assertEquals( "Incorrect salesperson count", 1, salespersons.size() );
@@ -189,7 +197,7 @@
assertEquals( "Incorrect order count", 1, ( ( Salesperson ) salespersons.get( 0 ) ).getOrders().size() );
List products = session.createCriteria( Product.class )
- .add( Restrictions.eq( "stockNumber", new Integer( 124 ) ) )
+ .add( Restrictions.eq( "stockNumber", 124 ) )
.list();
assertEquals( "Incorrect product count", 1, products.size() );
@@ -598,7 +606,7 @@
// Force the categories to not get initialized here
List result = session.createQuery( "from Product as p where p.id = :id" )
- .setLong( "id", testData.prod1Id.longValue() )
+ .setLong( "id", testData.prod1Id )
.list();
assertTrue( "No products returned from HQL", !result.isEmpty() );
14 years, 7 months
- 1
- 0
Hibernate SVN: r17970 - in sandbox/trunk/new-metadata: src and 9 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-13 02:24:38 -0500 (Fri, 13 Nov 2009)
New Revision: 17970
Added:
sandbox/trunk/new-metadata/DESIGN.txt
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Attribute.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/AttributeContainer.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/BasicType.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Entity.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Type.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/TypeNature.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/AttributeMapping.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractValueContainer.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedValue.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/InLineView.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ObjectName.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Value.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ValueContainer.java
sandbox/trunk/new-metadata/src/test/
sandbox/trunk/new-metadata/src/test/java/
sandbox/trunk/new-metadata/src/test/java/org/
sandbox/trunk/new-metadata/src/test/java/org/hibernate/
sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/
sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/schema/
sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/schema/ObjectNameTests.java
Removed:
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Nature.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/DatatypeMapping.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractTable.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedColumn.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/LogicalTable.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalColumn.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalTable.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java
Modified:
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumn.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumnConstraint.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Constraint.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Datatype.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ForeignKey.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Index.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PrimaryKey.java
sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/UniqueKey.java
Log:
tad more work on this
Added: sandbox/trunk/new-metadata/DESIGN.txt
===================================================================
--- sandbox/trunk/new-metadata/DESIGN.txt (rev 0)
+++ sandbox/trunk/new-metadata/DESIGN.txt 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,19 @@
+This file is intended as a list of the design goals for this work. What are we trying to achieve? why? And
+how are we planning on going about it.
+
+Mainly this is to be a refactoring of the existing org.hibernate.mapping package. There are two main problems with
+the current code:
+1) It represents a single unified view of the logical model which is neither the java mode nor the
+database model; it is somewhere in between. Yet it does this in a singular manner.
+2) Lack of encapsulation
+
+To attempt to alleviate these problems, the proposal is a separation such that we have:
+1) Metadata about the database schema, in org.hibernate.metadata.schema package
+2) Metadata about the Java model, in the org.hibernate.metadata.java package. todo : what about other entitymodes?
+3) Metadata about the mapping between the two above, in the org.hibernate.metadata.mapping package
+
+Especially trying to keep them as independent as possible. Especially, the
+org.hibernate.metadata.schema and org.hibernate.metadata.java package should
+be independent onto themselves, with the org.hibernate.metadata.mapping package
+providing the linkage/binding
+
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Attribute.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Attribute.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Attribute.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,34 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public interface Attribute {
+ public String getName();
+ public AttributeContainer getAttributeContainer();
+}
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/AttributeContainer.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/AttributeContainer.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/AttributeContainer.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+import java.util.Set;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public interface AttributeContainer extends Type {
+ public Set getAttributes();
+
+ public Attribute getAttribute(String name);
+}
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/BasicType.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/BasicType.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/BasicType.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,45 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class BasicType implements Type {
+ private final Class javaType;
+
+ public BasicType(Class javaType) {
+ this.javaType = javaType;
+ }
+
+ public TypeNature getNature() {
+ return TypeNature.BASIC;
+ }
+
+ public Class getJavaType() {
+ return javaType;
+ }
+}
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Entity.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Entity.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Entity.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,32 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class Entity {
+}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Nature.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Nature.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Nature.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,78 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.java;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-/**
- * Enumerations of the various types or natures of attributes.
- *
- * @author Steve Ebersole
- */
-public class Nature implements Serializable {
- private static final HashMap INSTANCES = new HashMap();
-
- public static final Nature VALUE = new Nature( "VALUE" );
- public static final Nature COMPONENT = new Nature( "COMPONENT" );
- public static final Nature ANY = new Nature( "ANY", true );
- public static final Nature ENTITY = new Nature( "ENTITY", true );
- public static final Nature COLLECTION = new Nature( "COLLECTION", true );
-
- static {
- INSTANCES.put( VALUE.name, VALUE );
- INSTANCES.put( COMPONENT.name, COMPONENT );
- INSTANCES.put( ANY.name, ANY );
- INSTANCES.put( ENTITY.name, ENTITY );
- INSTANCES.put( COLLECTION.name, COLLECTION );
- }
-
- private final String name;
- private final boolean association;
-
- private Nature(String name, boolean association) {
- this.name = name;
- this.association = association;
- }
-
- private Nature(String name) {
- this( name, false );
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isAssociation() {
- return association;
- }
-
- public String toString() {
- return super.toString() + "[" + getName() + "]";
- }
-
- private Object readResolve() {
- return INSTANCES.get( name );
- }
-}
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Type.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Type.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Type.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,45 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+/**
+ * Basic information about a Java type, in regards to its role in particular set of mappings.
+ *
+ * @author Steve Ebersole
+ */
+public interface Type {
+ /**
+ * Return the persistence type.
+ *
+ * @return persistence type
+ */
+ public TypeNature getNature();
+
+ /**
+ * Return the represented Java type.
+ *
+ * @return Java type
+ */
+ public Class getJavaType();
+}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/TypeNature.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/Nature.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/TypeNature.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/java/TypeNature.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,65 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.java;
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+/**
+ * Describes the nature of a type.
+ *
+ * @author Steve Ebersole
+ */
+public class TypeNature implements Serializable {
+ public static final TypeNature BASIC = new TypeNature( "BASIC" );
+ public static final TypeNature COMPONENT = new TypeNature( "COMPONENT" );
+ public static final TypeNature ENTITY = new TypeNature( "ENTITY" );
+ public static final TypeNature SUPERCLASS = new TypeNature( "SUPERCLASS" );
+
+ private static final HashMap INSTANCES = new HashMap();
+ static {
+ INSTANCES.put( BASIC.name, BASIC );
+ INSTANCES.put( COMPONENT.name, COMPONENT );
+ INSTANCES.put( ENTITY.name, ENTITY );
+ INSTANCES.put( SUPERCLASS.name, SUPERCLASS );
+ }
+
+ private final String name;
+
+ private TypeNature(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String toString() {
+ return super.toString() + "[" + getName() + "]";
+ }
+
+ private Object readResolve() {
+ return INSTANCES.get( name );
+ }
+}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/AttributeMapping.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/DatatypeMapping.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/AttributeMapping.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/AttributeMapping.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,41 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.mapping;
+
+import org.hibernate.metadata.java.Attribute;
+import org.hibernate.metadata.schema.Value;
+
+/**
+ * Defines information about mapping an {@link Attribute attribute} to a set of one or more database
+ * Represents the structural information pertaining to mapping between a Java type and an SQL <tt>datatype</tt>.
+ *
+ * @author Steve Ebersole
+ */
+public interface AttributeMapping {
+ public Attribute getAttribute();
+
+ public Value[] getColumns();
+
+ // todo : type/transformation information...
+}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/DatatypeMapping.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/DatatypeMapping.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/mapping/DatatypeMapping.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,47 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.mapping;
-
-import org.hibernate.metadata.schema.Datatype;
-
-/**
- * Represents the structural information pertaining to mapping between a Java type and an SQL <tt>datatype</tt>.
- *
- * @author Steve Ebersole
- */
-public interface DatatypeMapping {
- /**
- * Retrieve the Java type described by this mapping.
- *
- * @return The Java class.
- */
- public Class getJavaType();
-
- /**
- * Retrieve the metadata about the contained SQL datatypes.
- *
- * @return The SQL datatype metadata.
- */
- public Datatype getSqlDatatypes();
-}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumn.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumn.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumn.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -23,22 +23,43 @@
*/
package org.hibernate.metadata.schema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
- * Basic support for {@link Column} implementations.
+ * Basic support for {@link Value} implementations.
*
* @author Steve Ebersole
*/
-public abstract class AbstractColumn implements Column {
- private final Table table;
+public abstract class AbstractColumn implements Value {
+ private static final Logger log = LoggerFactory.getLogger( AbstractColumn.class );
- protected AbstractColumn(Table table) {
+ private final ValueContainer table;
+ private Datatype datatype;
+
+ protected AbstractColumn(ValueContainer table) {
this.table = table;
}
/**
* {@inheritDoc}
*/
- public Table getTable() {
+ public ValueContainer getTable() {
return table;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public Datatype getDatatype() {
+ return datatype;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setDatatype(Datatype datatype) {
+ log.debug( "setting datatype for column " + toDebugString() + " : " + datatype.getTypeCode() );
+ this.datatype = datatype;
+ }
}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumnConstraint.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumnConstraint.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractColumnConstraint.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -28,20 +28,22 @@
/**
* Support for contraints which specifically apply to a column or series of columns.
+ * <p/>
+ * todo : do we need to support defining these on particular schemas/catalogs?
*
* @author Steve Ebersole
*/
public abstract class AbstractColumnConstraint implements Constraint {
- private final Table table;
+ private final ValueContainer table;
private final String name;
- private List/*<Column>*/ columns = new ArrayList();
+ private List/*<Value>*/ columns = new ArrayList();
- protected AbstractColumnConstraint(Table table, String name) {
+ protected AbstractColumnConstraint(ValueContainer table, String name) {
this.table = table;
this.name = name;
}
- public Table getTable() {
+ public ValueContainer getTable() {
return table;
}
@@ -49,11 +51,14 @@
return name;
}
- public List/*<Column>*/ getColumns() {
+ public List/*<Value>*/ getColumns() {
return columns;
}
- public void addColumn(Column column) {
+ public void addColumn(Value column) {
+ if ( column.getTable() != getTable() ) {
+ throw new IllegalArgumentException( "Unable to add column to constraint; tables did not match" );
+ }
columns.add( column );
}
}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractTable.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractTable.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractTable.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,49 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-
-/**
- * TODO : javadoc
- *
- * @author Steve Ebersole
- */
-public abstract class AbstractTable implements Table {
- private PrimaryKey primaryKey = new PrimaryKey( this );
- private final LinkedHashSet columns = new LinkedHashSet();
-
- public void addColumn(Column column) {
- columns.add( column );
- }
-
- public PrimaryKey getPrimaryKey() {
- return primaryKey;
- }
-
- public Iterator iterateColumns() {
- return columns.iterator();
- }
-}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractValueContainer.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractTable.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractValueContainer.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/AbstractValueContainer.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,58 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+
+/**
+ * Convenience base class for implementing the {@link ValueContainer} contract
+ *
+ * @author Steve Ebersole
+ */
+public abstract class AbstractValueContainer implements ValueContainer {
+ private PrimaryKey primaryKey = new PrimaryKey( this );
+ private final LinkedHashSet values = new LinkedHashSet();
+
+ /**
+ * {@inheritDoc}
+ */
+ public void addValue(Value value) {
+ values.add( value );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterator iterateValues() {
+ return values.iterator();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public PrimaryKey getPrimaryKey() {
+ return primaryKey;
+ }
+}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,40 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-/**
- * Models a column within a {@link Table}.
- *
- * @author Steve Ebersole
- */
-public interface Column {
- /**
- * Retrieve the table that owns this column.
- *
- * @return The owning table.
- */
- public Table getTable();
-
- public String toDebugString();
-}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalColumn.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,49 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class Column extends AbstractColumn implements Value {
+ private final String name;
+
+ protected Column(ValueContainer table, String name) {
+ super( table );
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toDebugString() {
+ return getTable().toDebugString() + '.' + getName();
+ }
+}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Constraint.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Constraint.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Constraint.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -35,8 +35,8 @@
* @author Steve Ebersole
*/
public interface Constraint {
- public Table getTable();
+ public ValueContainer getTable();
public String getName();
- public List/*<Column>*/ getColumns();
+ public List/*<Value>*/ getColumns();
}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Datatype.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Datatype.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Datatype.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -24,7 +24,9 @@
package org.hibernate.metadata.schema;
/**
- * Models a SQL DATATYPE.
+ * Models a JDBC {@link java.sql.Types DATATYPE}
+ * </p>
+ * todo : should we model scale and precision here or on Value?
*
* @author Steve Ebersole
*/
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedColumn.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedColumn.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedColumn.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,42 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-/**
- * A derived column is the result of a <tt>formula</tt> mapping.
- *
- * @author Steve Ebersole
- */
-public class DerivedColumn extends AbstractColumn implements Column {
- public DerivedColumn(Table table) {
- super( table );
- }
-
- /**
- * {@inheritDoc}
- */
- public String toDebugString() {
- return getTable().toDebugString() + ".{derived-column}";
- }
-}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedValue.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedColumn.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedValue.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/DerivedValue.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,42 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+/**
+ * A derived column is the result of a <tt>formula</tt> mapping.
+ *
+ * @author Steve Ebersole
+ */
+public class DerivedValue extends AbstractColumn implements Value {
+ public DerivedValue(ValueContainer table) {
+ super( table );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toDebugString() {
+ return getTable().toDebugString() + ".{derived-column}";
+ }
+}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ForeignKey.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ForeignKey.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ForeignKey.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -37,20 +37,20 @@
public class ForeignKey implements Constraint {
private static final Logger log = LoggerFactory.getLogger( ForeignKey.class );
- private final Table sourceTable;
- private final Table targetTable;
+ private final ValueContainer sourceTable;
+ private final ValueContainer targetTable;
private final String name;
- private List/*<Column>*/ sourceColumns = new ArrayList();
- private List/*<Column>*/ targetColumns;
+ private List/*<Value>*/ sourceColumns = new ArrayList();
+ private List/*<Value>*/ targetColumns;
- public ForeignKey(Table sourceTable, Table targetTable, String name) {
+ public ForeignKey(ValueContainer sourceTable, ValueContainer targetTable, String name) {
this.sourceTable = sourceTable;
this.targetTable = targetTable;
this.name = name;
}
- public ForeignKey(Table sourceTable, Table targetTable) {
+ public ForeignKey(ValueContainer sourceTable, ValueContainer targetTable) {
this( sourceTable, targetTable, null );
}
@@ -58,19 +58,19 @@
return name;
}
- public Table getTable() {
+ public ValueContainer getTable() {
return getSourceTable();
}
- public Table getSourceTable() {
+ public ValueContainer getSourceTable() {
return sourceTable;
}
- public Table getTargetTable() {
+ public ValueContainer getTargetTable() {
return targetTable;
}
- public List/*<Column>*/ getColumns() {
+ public List/*<Value>*/ getColumns() {
return getSourceColumns();
}
@@ -84,7 +84,7 @@
: targetColumns;
}
- public void addColumnMapping(Column sourceColumn, Column targetColumn) {
+ public void addColumnMapping(Value sourceColumn, Value targetColumn) {
if ( targetColumn == null ) {
if ( targetColumns != null ) {
if ( log.isWarnEnabled() ) {
@@ -100,7 +100,7 @@
if ( targetColumns == null ) {
if ( !sourceColumns.isEmpty() ) {
log.warn(
- "Column mapping mismatch as part of FK [table=" + getTable().toDebugString()
+ "Value mapping mismatch as part of FK [table=" + getTable().toDebugString()
+ ", name=" + getName() + "] while adding source column ["
+ sourceColumn.toDebugString() + "]"
);
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/InLineView.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/LogicalTable.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/InLineView.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/InLineView.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,67 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * A <tt>data container</tt> defined by a <tt>SELECT</tt> statement. This translates into an inline view in the
+ * SQL statements: <code>select ... from (select ... from logical_table_table ...) ...</code>
+ *
+ * @author Steve Ebersole
+ */
+public class InLineView extends AbstractValueContainer implements ValueContainer {
+ private final String select;
+ private final String uniqueValueQualifier;
+ private Set synchronizedTableSpaces = java.util.Collections.EMPTY_SET;
+
+ public InLineView(String select, String uniqueValueQualifier) {
+ this.select = select;
+ this.uniqueValueQualifier = uniqueValueQualifier;
+ }
+
+ public String getSelect() {
+ return select;
+ }
+
+ public String getUniqueValueQualifier() {
+ return uniqueValueQualifier;
+ }
+
+ public void addSynchronizedTableSpace(String space) {
+ if ( synchronizedTableSpaces == java.util.Collections.EMPTY_SET ) {
+ synchronizedTableSpaces = new HashSet();
+ }
+ synchronizedTableSpaces.add( space );
+ }
+
+ public Set getSpaces() {
+ return synchronizedTableSpaces;
+ }
+
+ public String toDebugString() {
+ return "{inline-view}";
+ }
+}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Index.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Index.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Index.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -29,7 +29,7 @@
* @author Steve Ebersole
*/
public class Index extends AbstractColumnConstraint implements Constraint {
- protected Index(Table table, String name) {
+ protected Index(ValueContainer table, String name) {
super( table, name );
}
}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/LogicalTable.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/LogicalTable.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/LogicalTable.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,57 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-import java.util.Set;
-import java.util.HashSet;
-
-/**
- * A <tt>data container</tt> defined by a <tt>SELECT</tt> statement. This translates into an inline view in the
- * SQL statements: <code>select ... from (select ... from logical_table_table ...) ...</code>
- *
- * @author Steve Ebersole
- */
-public class LogicalTable extends AbstractTable implements Table {
- private final String select;
- private Set synchronizedTableSpaces = java.util.Collections.EMPTY_SET;
-
- public LogicalTable(String select) {
- this.select = select;
- }
-
- public void addSynchronizedTableSpace(String space) {
- if ( synchronizedTableSpaces == java.util.Collections.EMPTY_SET ) {
- synchronizedTableSpaces = new HashSet();
- }
- synchronizedTableSpaces.add( space );
- }
-
- public Set getSpaces() {
- return synchronizedTableSpaces;
- }
-
- public String toDebugString() {
- return "{inline-view}";
- }
-}
Added: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ObjectName.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ObjectName.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ObjectName.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,125 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+/**
+ * Models the qualified name of a database object.
+ *
+ * @author Steve Ebersole
+ */
+public class ObjectName {
+ private final String name;
+ private final String schema;
+ private final String catalog;
+ private final String identifier;
+ private final int hashCode;
+
+ /**
+ * Creates a qualified name reference.
+ *
+ * @param schema The in which the object is defined (optional)
+ * @param catalog The catalog in which the object is defined (optional)
+ * @param name The name (required)
+ */
+ public ObjectName(String schema, String catalog, String name) {
+ if ( name == null || name.trim().length() == 0 ) {
+ throw new IllegalArgumentException( "Object name must be specified" );
+ }
+ this.name = name;
+ this.schema = schema;
+ this.catalog = catalog;
+
+ StringBuffer buff = new StringBuffer( name );
+ if ( catalog != null ) {
+ buff.insert( 0, catalog + '.' );
+ }
+ if ( schema != null ) {
+ buff.insert( 0, schema + '.' );
+ }
+ this.identifier = buff.toString();
+
+ int tmpHashCode = schema != null ? schema.hashCode() : 0;
+ tmpHashCode = 31 * tmpHashCode + (catalog != null ? catalog.hashCode() : 0);
+ tmpHashCode = 31 * tmpHashCode + name.hashCode();
+ this.hashCode = tmpHashCode;
+ }
+
+ public String getSchema() {
+ return schema;
+ }
+
+ public String getCatalog() {
+ return catalog;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ ObjectName that = (ObjectName) o;
+
+ return name.equals( that.name )
+ && areEqual( catalog, that.catalog )
+ && areEqual( schema, that.schema );
+ }
+
+ private boolean areEqual(String one, String other) {
+ return one == null
+ ? other == null
+ : one.equals( other );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int hashCode() {
+ return hashCode;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return "ObjectName{" +
+ "name='" + name + '\'' +
+ ", schema='" + schema + '\'' +
+ ", catalog='" + catalog + '\'' +
+ '}';
+ }
+}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalColumn.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalColumn.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalColumn.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,46 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-/**
- * TODO : javadoc
- *
- * @author Steve Ebersole
- */
-public class PhysicalColumn extends AbstractColumn implements Column {
- private final String name;
-
- protected PhysicalColumn(Table table, String name) {
- super( table );
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public String toDebugString() {
- return getTable().toDebugString() + '.' + getName();
- }
-}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalTable.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalTable.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalTable.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,58 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-import java.util.Set;
-
-/**
- * Models the concept of a relational <tt>TABLE</tt> (or <tt>VIEW</tt>) database to which we map information.
- *
- * @author Gavin King
- * @author Steve Ebersole
- */
-public class PhysicalTable extends AbstractTable implements Table, Exportable {
- private final String explicitSchema;
- private final String explicitCatalog;
- private final String name;
- private final Set spaces;
-
- public PhysicalTable(String explicitSchema, String explicitCatalog, String name) {
- this.explicitSchema = explicitSchema;
- this.explicitCatalog = explicitCatalog;
- this.name = name;
- this.spaces = java.util.Collections.singleton( name );
- }
-
- public String getExportIdentifier() {
- return name;
- }
-
- public Set getSpaces() {
- return spaces;
- }
-
- public String toDebugString() {
- return name;
- }
-}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PrimaryKey.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PrimaryKey.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PrimaryKey.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -39,7 +39,7 @@
// later in terms of building the metamodel
private String name;
- public PrimaryKey(Table table) {
+ public PrimaryKey(ValueContainer table) {
super( table, null );
}
Deleted: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -1,44 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA
- */
-package org.hibernate.metadata.schema;
-
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * Contract for data containers (what the ANSI SQL spec calls "table specifications") to which we can map
- * entity state.
- *
- * @author Steve Ebersole
- */
-public interface Table {
- public PrimaryKey getPrimaryKey();
-
- public void addColumn(Column column);
-
- public Iterator iterateColumns();
- public Set getSpaces();
-
- public String toDebugString();
-}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/PhysicalTable.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,83 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+import java.util.Set;
+
+/**
+ * Models the concept of a relational <tt>TABLE</tt> (or <tt>VIEW</tt>).
+ *
+ * @author Gavin King
+ * @author Steve Ebersole
+ */
+public class Table extends AbstractValueContainer implements ValueContainer, Exportable {
+ private final ObjectName name;
+ private final Set spaces;
+
+ public Table(ObjectName name) {
+ this.name = name;
+ this.spaces = java.util.Collections.singleton( name );
+ }
+
+ public ObjectName getObjectName() {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getUniqueValueQualifier() {
+ return getObjectName().getIdentifier();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getExportIdentifier() {
+ return getObjectName().getIdentifier();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Set getSpaces() {
+ return spaces;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toDebugString() {
+ return getObjectName().getIdentifier();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return "Table{" +
+ "name=" + getObjectName().getIdentifier() +
+ '}';
+ }
+}
Modified: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/UniqueKey.java
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/UniqueKey.java 2009-11-13 04:27:35 UTC (rev 17969)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/UniqueKey.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -29,7 +29,7 @@
* @author Steve Ebersole
*/
public class UniqueKey extends AbstractColumnConstraint implements Constraint {
- protected UniqueKey(Table table, String name) {
+ protected UniqueKey(ValueContainer table, String name) {
super( table, name );
}
}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Value.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Column.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Value.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Value.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,55 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+/**
+ * Models a value within a {@link ValueContainer}. This will generally be either a
+ * {@link Column column} or a {@link DerivedValue derived value}.
+ *
+ * @author Steve Ebersole
+ */
+public interface Value {
+ /**
+ * Retrieve the table that owns this value.
+ *
+ * @return The owning table.
+ */
+ public ValueContainer getTable();
+
+ /**
+ * Retrieve the datatype of this value.
+ *
+ * @return The value's datatype
+ */
+ public Datatype getDatatype();
+
+ /**
+ * Set the datatype of this value.
+ *
+ * @param datatype
+ */
+ public void setDatatype(Datatype datatype);
+
+ public String toDebugString();
+}
Copied: sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ValueContainer.java (from rev 17967, sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/Table.java)
===================================================================
--- sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ValueContainer.java (rev 0)
+++ sandbox/trunk/new-metadata/src/main/java/org/hibernate/metadata/schema/ValueContainer.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,68 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Contract for data containers (what the ANSI SQL spec calls "table specifications") to which we can map
+ * entity state. The two flavors here are {@link Table physical table} and {@link InLineView inline view}.
+ *
+ * @author Steve Ebersole
+ */
+public interface ValueContainer {
+ /**
+ * Get the primary key definition for this container.
+ *
+ * @return The PK definition.
+ */
+ public PrimaryKey getPrimaryKey();
+
+ /**
+ * Adds a value definition to the container.
+ *
+ * @param value The value definition
+ */
+ public void addValue(Value value);
+
+ /**
+ * Obtain an iterator over this containers current set of value definitions.
+ *
+ * @return Iterator over value definitions.
+ */
+ public Iterator iterateValues();
+
+ public Set getSpaces();
+
+ /**
+ * Get a unique identifier which can be used to qualify {@link Value values} belonging to
+ * this container. Intended for use in logging.
+ *
+ * @return The qualifier
+ */
+ public String getUniqueValueQualifier();
+
+ public String toDebugString();
+}
Added: sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/schema/ObjectNameTests.java
===================================================================
--- sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/schema/ObjectNameTests.java (rev 0)
+++ sandbox/trunk/new-metadata/src/test/java/org/hibernate/metadata/schema/ObjectNameTests.java 2009-11-13 07:24:38 UTC (rev 17970)
@@ -0,0 +1,54 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors. All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.metadata.schema;
+
+import junit.framework.TestCase;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class ObjectNameTests extends TestCase {
+ public void testMissingName() {
+ try {
+ new ObjectName( null, null, null );
+ fail();
+ }
+ catch ( IllegalArgumentException ignore ) {
+ }
+
+ try {
+ new ObjectName( "schema", "catalog", null );
+ fail();
+ }
+ catch ( IllegalArgumentException ignore ) {
+ }
+ }
+
+ public void testIdentifierBuilding() {
+ ObjectName on = new ObjectName( "schema", "catalog", "name" );
+ assertEquals( "schema.catalog.name", on.getIdentifier() );
+ }
+}
14 years, 7 months
- 1
- 0
Hibernate SVN: r17969 - core/branches/Branch_3_3/core/src/main/java/org/hibernate/cfg.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-12 23:27:35 -0500 (Thu, 12 Nov 2009)
New Revision: 17969
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/cfg/Configuration.java
Log:
HHH-4569 - Split focus of ConfigurationPerformanceTest
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/cfg/Configuration.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-11-13 04:26:57 UTC (rev 17968)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-11-13 04:27:35 UTC (rev 17969)
@@ -405,7 +405,7 @@
try {
org.dom4j.Document doc = xmlHelper.createSAXReader( xmlFile.getAbsolutePath(), errors, entityResolver ).read( xmlFile );
if ( errors.size() != 0 ) {
- throw new MappingException( "invalid mapping", ( Throwable ) errors.get( 0 ) );
+ throw new InvalidMappingException( "file", xmlFile.toString(), (Throwable) errors.get(0) );
}
try {
@@ -422,7 +422,7 @@
add( doc );
}
catch( DocumentException e){
- throw new MappingException( "invalid mapping", e );
+ throw new InvalidMappingException( "file", xmlFile.toString(), e );
}
return this;
14 years, 7 months
- 1
- 0
Hibernate SVN: r17968 - core/trunk/core/src/main/java/org/hibernate/cfg.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-11-12 23:26:57 -0500 (Thu, 12 Nov 2009)
New Revision: 17968
Modified:
core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java
Log:
HHH-4569 - Split focus of ConfigurationPerformanceTest
Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-11-12 20:52:13 UTC (rev 17967)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/Configuration.java 2009-11-13 04:26:57 UTC (rev 17968)
@@ -445,7 +445,7 @@
try {
org.dom4j.Document doc = xmlHelper.createSAXReader( xmlFile.getAbsolutePath(), errors, entityResolver ).read( xmlFile );
if ( errors.size() != 0 ) {
- throw new MappingException( "invalid mapping", ( Throwable ) errors.get( 0 ) );
+ throw new InvalidMappingException( "file", xmlFile.toString(), (Throwable) errors.get(0) );
}
try {
@@ -461,8 +461,8 @@
add( doc );
}
- catch( DocumentException e){
- throw new MappingException( "invalid mapping", e );
+ catch (DocumentException e) {
+ throw new InvalidMappingException( "file", xmlFile.toString(), e );
}
return this;
14 years, 7 months
- 1
- 0