Commit Graph

188 Commits

Author SHA1 Message Date
Steve Ebersole 2cff88cac7 Merge pull request #910 from rvansa/HHH-9632_2
HHH-9632 Upgrade to Infinispan 7.1.0.Final
2015-03-20 12:26:16 -05:00
rvansa 1b7e112994 HHH-9632 Upgrade to Infinispan 7.1.0.Final
* fixed default configuration path
* set schema to 7.1
2015-03-18 11:15:59 +01:00
Steve Ebersole 9caca0ce37 HHH-9490 - Migrate from dom4j to jaxb for XML processing;
HHH-9492 - Migrate to new bootstrap API (MetadataSources, etc);
HHH-7078 - Split NamingStrategy into ImplicitNamingStrategy/PhysicalNamingStrategy;
HHH-6005 - Better handling of implicit column naming with @ElementCollection of @Embeddables;
HHH-9633 - Add tests that explicitly test the "main" NamingStrategy impls
2015-03-10 16:53:51 -05:00
Galder Zamarreño 260ff03ae5 HHH-9632 Update to Infinispan 7.1.0.Final 2015-03-02 09:54:02 +01:00
Paul Ferraro b8923b1e39 HHH-9337 Region.destroy() attempts to remove a cache listener, but region class is not annotated with @Listener
(cherry picked from commit 2f881c38b4)
2015-01-05 23:37:22 -08:00
Gail Badner f9a49efd17 HHH-9231 : Uncommitted data can remain in transactional collection cache after rollback if collection is initialized after flush 2014-07-07 19:03:58 -07:00
Galder Zamarreño 36e35207f6 HHH-9231 Avoid updating collection 2LC if contains entity added in tx
(cherry picked from commit 3b098a94d3463086a230d6dbc1254e9ecbf76cda)

Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java
2014-07-07 19:03:58 -07:00
Gail Badner af5791f6dd HHH-9231 HHH-5690 : Test cases for transactional cache strategy 2014-06-04 13:45:04 -07:00
Gail Badner dad4c64d56 HHH-5690 : Entity cache after persist, flush, rollback (test case) 2014-06-03 21:28:24 -07:00
Brett Meyer 96b9366f14 HHH-8923 corrected test case 2014-03-26 10:36:01 -04:00
Brett Meyer 8358914331 HHH-9010: Revert "HHH-8961 corrected test failure"
This reverts commit 0dc24f1081.
2014-02-28 14:00:02 -05:00
Brett Meyer 0dc24f1081 HHH-8961 corrected test failure
Conflicts:
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java
2014-02-18 16:00:56 -05:00
Galder Zamarreño faba70203a HHH-8772 Remove removal test for PutFromLoadValidatorTest 2013-12-13 16:17:31 +01:00
Galder Zamarreño 3883d7ca2d HHH-8772 Bigger naked invalidation timeout for PutFromLoad unit test
* Test expects that the two invalidteKey calls happen within the naked
invalidation timeout. If they don't, the test would fail since the
second invalidate key would be removed. Increase the timeout
considerably to avoid the issue.
2013-12-09 17:48:07 +01:00
Steve Ebersole 055a750a53 HHH-8733 - General build cleanup 2013-12-02 20:57:57 -06:00
Steve Ebersole 14d0116af2 Revert "HHH-8733 - General build cleanup - hibernate-testing"
This reverts commit bc2855b323.
2013-11-26 17:48:25 -06:00
Steve Ebersole bc2855b323 HHH-8733 - General build cleanup - hibernate-testing 2013-11-26 13:53:18 -06:00
Steve Ebersole d1023821b1 HHH-8733 - General build cleanup 2013-11-26 13:04:55 -05:00
Steve Ebersole cd590470c0 HHH-8741 - More checkstyle cleanups 2013-11-24 09:44:55 -06:00
Galder Zamarreño c7fa16abe9 HHH-8623 Cache should be up to date after region eviction
* Region clear now happens within the transaction of the caller,
if any. Otherwise, a new transaction is started in order to do the
clear within a transaction and so deal with situations where cache
statistics are queried outside of a transaction.
* Cache updates after the region eviction should be allowed to
happen, so if region eviction happened within the transaction, a
putFromLoad() is mapped to a normal put instead of a PFER call,
so that the data is accessible for the current transaction. This is
not an issue for situations where region has not evicted because
the session cache will have data that's been accessed in the
transaction.
* Transaction manager could be null, if region non-transactional
2013-11-21 13:41:39 +01:00
Galder Zamarreño 7788092173 HHH-8624 Update to Infinispan 6.0 snapshot
* Snapshot update is only to verify that the testsuite passes with
the latest Infinispan fixes for ISPN-3639.
2013-11-21 13:41:38 +01:00
Steve Ebersole 859eaaa1c5 HHH-8619 - Account for "shadow" services as part of ServiceRegistry impls 2013-10-17 15:19:35 -05:00
Brett Meyer 90532087d5 HHH-7959 gracefully handle non-transactional entity cache 2013-08-07 11:44:44 -04:00
Steve Ebersole 8e3770235b HHH-8211 - Checkstyle and FindBugs fix-ups 2013-05-09 19:51:10 -05:00
Galder Zamarreño 23b6f6ab06 Add missing javadocs and fix rest of Checkstyle failures 2013-05-06 11:48:42 +01:00
Steve Ebersole bfbc0b88a8 HHH-8159 - Apply fixups indicated by analysis tools 2013-05-01 18:53:55 -05:00
Brett Meyer f83a2013b1 HHH-7943 test fix 2013-05-01 15:34:16 -04:00
Brett Meyer 489ee4a734 HHH-7943 Added support for ehcache and infinispan strategies and OSGi
services.  Numerous ehcache and infinispan CL fixes.
2013-05-01 15:05:31 -04:00
Brett Meyer 398000517f HHH-7943 Reworked "Availability" concepts into "strategy registration
providers".  Updated proxool and c3p0 to use strategy selection.
2013-04-29 11:51:01 -04:00
Steve Ebersole 8eeef7af3b HHH-8146 - Update to use maven-publishing plugin 2013-04-16 18:26:02 -05:00
Nikolay Shestakov cbbadea538 HHH-7908 Logging level checking
Conflicts:
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
2013-04-12 09:56:41 -04:00
Brett Meyer cc4ef44670 HHH-8160 Updated for Gradle 1.5 OSGi plugin changes and package
versioning issues
2013-04-09 09:57:36 -04:00
Brett Meyer 394458f6a6 HHH-8010 Support app-managed EntityManagerFactory and SessionFactory
creation by OSGi bundles

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
	hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java
	hibernate-osgi/src/main/java/org/hibernate/osgi/HibernateBundleActivator.java
2013-02-28 10:28:23 -05:00
Brett Meyer 4d68ddf7b0 HHH-7991 Correct all instances of
Thread.currentThread().getContextClassLoader()
2013-02-14 10:44:36 -05:00
Brett Meyer 56867417e2 HHH-7527 Enterprise OSGi JPA support 2013-02-14 10:44:35 -05:00
Strong Liu d54a60448a HHH-7580 compile error
Conflicts:
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
	hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java
2013-01-29 13:58:58 -05:00
Steve Ebersole 7976e2396a HHH-7580 - Complete 2-phase SessionFactory building design
Conflicts:
	hibernate-core/src/main/java/org/hibernate/SessionFactory.java
	hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java
	hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/MetadataSources.java
	hibernate-core/src/main/java/org/hibernate/metamodel/SessionFactoryBuilder.java
	hibernate-core/src/main/java/org/hibernate/metamodel/internal/SessionFactoryBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/JaxbHelper.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataBuilderImpl.java
	hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java
	hibernate-core/src/main/java/org/hibernate/service/spi/ServiceContributor.java
	hibernate-core/src/test/java/org/hibernate/cfg/beanvalidation/ApplySchemaConstraintTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/AssertSourcesTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BaseAnnotationBindingTestCase.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/xml/OrmXmlParserTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/source/internal/MetadataImplTest.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractBasicBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/AbstractUnsavedValueTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/JoinedSubclassBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/basiccollections/AbstractBasicCollectionBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/onetomany/AbstractUnidirectionalOneToManyBindingTests.java
	hibernate-core/src/test/java/org/hibernate/metamodel/spi/relational/AbstractGeneratedIdColumnTests.java
	hibernate-core/src/test/java/org/hibernate/test/jdbc/internal/BatchingTest.java
	hibernate-core/src/test/java/org/hibernate/test/service/schema/internal/ExistingDatabaseMetaDataImplTest.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
	hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderUsingMetamodelImpl.java
	hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
	hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
2013-01-29 13:58:58 -05:00
Strong Liu c1cf5cd6e6 HHH-7947 remove not maintained 2LC from doc 2013-01-28 13:30:38 +08:00
Strong Liu 6c6df69535 refactor, remove redundant type cast 2012-12-25 19:25:47 +08:00
Galder Zamarreño b0efdb4d14 HHH-7871 Write cache should not using LOCAL flag
* Flags were not being applied in clustered environments because of
the use of classloader aware cache which was not forwarding them.
2012-12-18 09:44:45 +01:00
Galder Zamarreño 49ea5d65df HHH-7763 No need to clear caches when these are going to be stopped
* Make sure failures in stop won't affect other crucial stop operations
that could leave nodes unstopped.
2012-11-08 10:16:36 +01:00
Galder Zamarreño e57c822cbc HHH-7553 Use new Infinispan configuration exclusively 2012-10-26 17:46:05 +02:00
Galder Zamarreño cf9ef94f8e HHH-7553 Upgrade to Infinispan 5.2.0.Beta2 and fix testsuite 2012-10-26 17:46:03 +02:00
Galder Zamarreño d7e58c794d HHH-7554 Transform global statistics override to new configuration 2012-10-26 17:46:02 +02:00
Galder Zamarreño a074d3244d HHH-7640 Improve single node Infinispan 2LC performance
* Use an Infinispan cache to maintain pending puts, which avoids
the need to control it's memory consumption in the critical path
of putFromLoad.
* This cache is shared by all regions, and it's configured with
aggressive expiration settings to avoid piling up pending put
operations.
* Added a 2LC stress test that tests behaivour and performance
of 2LC under multiple situations, such as entity inserts, updates,
find via PK, find via query and deletes.
* Some other minor performance enhancements, such as avoiding
classloader aware cache wrapper if using 2LC locally.
* Remove cache adapter to reduce construction of useless objects.
* Cache flagged caches in order to avoid recomputing decorated
caches all the time, which reduces memory consumption.
* Skip locking for timestamp updates and separate timestamp region
implementations for local vs clustered scenarios.
2012-10-18 15:57:15 +02:00
Steve Ebersole ab64f5c3be HHH-7552 - New StrategySelectorService : initial auto-detection 2012-08-31 16:20:05 -05:00
Steve Ebersole 37542fe1f1 HHH-6823 - Short-name config values 2012-08-29 10:49:06 -05:00
Steve Ebersole 4ad49a02c9 HHH-7556 - Clean up packages 2012-08-28 14:12:15 -05:00
Strong Liu 7a82349f75 HHH-7385 change to use gradle 1.1 2012-08-08 17:09:11 +08:00
Strong Liu fe7a5d74c5 HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
Strong Liu a203ea65aa HHH-7350 read-only entities can not be deleted from 2LC 2012-05-31 00:54:08 +08:00
andrigtmiller 27df736412 HHH-7350 - Fixed up the unit tests, to allow the lock of the cache region for an access strategy of READ_ONLY. 2012-05-31 00:54:07 +08:00
andrigtmiller 665798339d HHH-7350 - removed overridden methods in ReadOnlyAccess lock/unlock an instance and/or region of the cache, since inserts and deletes are allowed with a CacheConcurrencyStrategy of READ_ONLY. 2012-05-31 00:54:07 +08:00
Galder Zamarreño 61a8416463 ISPN-7350 Read only entities can be inserted and deleted 2012-05-25 10:29:47 +02:00
Galder Zamarreño 6417ffa1a4 HHH-7280 Upgrade to Infinispan 5.1.4.FINAL 2012-04-26 16:56:47 +02:00
Galder Zamarreño 55de90ec42 HHH-7256 Use minimalPuts in Infinispan
putFromLoad now checks for minimalPuts to verify whether the entry
is already present in the cache. By doing this, Hibernate stats
appear more precise since putForExternalReads that are no-op because
the cache already contains the entry are not counted as puts. This
avoids confusion amongst users. This should be reverted to checking
PFER's return value when https://issues.jboss.org/browse/ISPN-1986
has been implemented.
2012-04-17 19:50:37 +02:00
Galder Zamarreño a334b9f0af HHH-7238 Remove unneeded cache listeners 2012-04-13 18:09:51 +02:00
Scott Marlow 52d5d374e5 HHH-7179 QueryResultsRegionImpl needs the @Listener annotation (otherwise org.jboss.as.test.integration.jpa.secondlevelcache.JPA2LCTestCase will fail) 2012-04-03 11:05:51 -04:00
Galder Zamarreño 5fa28e87ea HHH-7179 Complete support for Natural Id caching for Infinispan 2012-04-02 11:10:36 +02:00
Strong Liu 2afa747ef9 HHH-7179 impl natural id region in hibernate-infinispan 2012-04-02 11:10:34 +02:00
Galder Zamarreño 9c55dde595 HHH-7204 Clear only regions created by the given region factory
Upgraded to Infinispan 5.1.3.FINAL too.
2012-03-28 20:39:11 +02:00
Strong Liu d3b640cb75 HHH-7197 reimport imports 2012-03-26 16:17:45 +08:00
Galder Zamarreño 41b9f2558f HHH-7176 Upgrade to Infinispan 5.1.2.FINAL 2012-03-15 12:52:12 +01:00
Galder Zamarreño 25487f2401 HHH-7166 Support multiple custom command factories 2012-03-15 12:51:48 +01:00
Strong Liu c943285bbd HHH-7156 Make Hibernate ORM compile and run tests using JDK 7 (and JDK 6) 2012-03-13 23:19:08 +08:00
Steve Ebersole dceda48ff1 HHH-7162 - Use concise artifact syntax in build scripts 2012-03-09 13:40:26 -06:00
Galder Zamarreño bc643ddb7c Increase concurrent write test timeout 2012-03-01 12:21:40 +01:00
Galder Zamarreño 8fccb62a6b HHH-7128 Upgrade to Infinispan 5.1.2.CR1 2012-02-29 18:41:34 +01:00
Galder Zamarreño 3449752493 HHH-7127 Fix query cache evictAll in single node 2012-02-29 17:58:56 +01:00
Eric Dalquist 72fe79a3f2 HHH-6974 Addition of NaturalIdRegion SPI
Adds NaturalIdRegion to RegionFactory
Adds creation of NaturalIdRegions to SessionFactoryImpl setup
Basic copy of collection cache region behavior for first pass at naturalId region support in ehcache
2012-02-07 08:34:23 -06:00
Strong Liu 6a22085e5b HHH-7206 upgrade to infinispan 5.1.1.FINAL 2012-02-06 18:06:11 -06:00
Galder Zamarreño 13c9dbfc21 HHH-7007 Evict all should work now in multi-region factory environments 2012-02-02 11:12:05 +01:00
Galder Zamarreño 5eee526234 HHH-1706 Support evictAll for LOCAL second level cache environments 2012-02-02 11:06:49 +01:00
Galder Zamarreño 4a323a4415 HHH-6980 Upgrade to Infinispan 5.1.0.CR4 2012-01-18 13:19:01 +00:00
Paul Ferraro 5a8060ae8b HHH-6952 Allow extensions of InfinispanRegionFactory to override classloader logic 2012-01-11 17:24:57 +01:00
Galder Zamarreño 8a4d604d9c ISPN-6955 Add guarantees that the cluster forms 2012-01-11 16:12:58 +01:00
Galder Zamarreño 81c505c70c HHH-6955 Use Infinispan's test JGroups stack that uses TEST_PING
By doing this, discovery of nodes is not timed and instead is done
in-memory which is much more reliable from a testing perspective.
Due to timing issues, some tests would randomly fail because the
cluster did not form in time, so changing to this JGroups stack for
testing solves random test failures due to invalidation messages
not being sent around.
2012-01-10 19:17:26 +01:00
Galder Zamarreño cc9fbf42a9 HHH-6955 Upgrade to Infinispan 5.1.0.CR3
* Switch to autoCommit=false so that unnecessary transactions
are not created.
* Mark timestamps cache explicitly non-transactional.
* Move away from using caches as a way to send evict all
notifications. Instead, use custom commands provided by Infinispan.
* Get rid of the JDBC transaction test because it does not make
sense configuring JDBC transactions with Infinispan 2LC.
2012-01-10 13:55:30 +01:00
Galder Zamarreño 6491724972 HHH-6729 Upgraded to Infinispan 5.1.0.CR1
* Made the configuration file explicitly define optimistic as locking
mode.
* Make sure a transaction manager that hooks to Hibernate's TM
is configured.
2011-12-08 16:16:44 +01:00
Gail Badner af3767b82a HHH-6872 : Test failures with hibernate.jdbc.batch_versioned_data=true 2011-12-02 02:19:58 -08:00
Strong Liu f8e347dabd HHH-6827 code format and javadoc, logging 2011-11-21 20:02:09 +08:00
Steve Ebersole d4e138eb13 HHH-6833 - Eable SQL logging for tests 2011-11-20 10:27:47 -06:00
Strong Liu 93f6ad6e2e HHH-6818 update dependencies management 2011-11-14 17:12:51 +08:00
Strong Liu 98e68aab4b HHH-6742 move unit tests back to src/test 2011-10-18 21:47:19 +08:00
Strong Liu 0f1d6c189b HHH-6626 ignore PutFromLoadValidatorUnitTestCase for now 2011-10-14 15:16:02 +08:00
Steve Ebersole f4fa176255 HHH-6683 - Consolidate (consistency) building of service registries 2011-09-27 11:49:17 -05:00
Galder Zamarreño 4a3a59047f HHH-6674 Upgraded to Infinispan 5.0.1.FINAL 2011-09-27 11:37:32 +02:00
Steve Ebersole 9f214d8018 HHH-6640 - Add ability for Integrator to prepare ServiceRegistryBuilder and MetadataImplementor as part of lifecycle 2011-09-13 18:46:28 -05:00
Sanne Grinovero d71a15d1c1 HHH-6626 Improve PutFromLoadValidatorUnitTestCase to be less timesensitive 2011-09-06 18:21:04 +02:00
Galder Zamarreño c678392e30 HHH-6219 Nullify pending put map or singleton to avoid leaks 2011-06-07 12:16:21 +02:00
Galder Zamarreño f78c79d676 HHH-6062 Infinispan now integrates as a synchronization
* A new property has been defined to control whether it hooks as a
synchronization or as an XA resource.
* Updated Infinispan to 5.0.0.CR4.
2011-06-07 10:22:05 +02:00
Galder Zamarreño f01505591d HHH-6186 Upgraded to latest Infinispan 5.0 CR 2011-05-17 13:59:56 +02:00
Steve Ebersole fb44ad936d HHH-6196 - Split org.hibernate.engine package into api/spi/internal 2011-05-04 17:15:47 -05:00
Steve Ebersole c930ebcd7d HHH-6191 - repackage org.hibernate.cache per api/spi/internal split 2011-05-04 14:43:04 -05:00
Steve Ebersole a6b8d62209 HHH-6094 - Test failures in hibernate-infinispan dealing with query caching 2011-05-03 14:33:51 -05:00
Steve Ebersole 16e86687c9 HHH-6150 - JBoss AS7 integration work 2011-04-22 17:42:07 -05:00
Steve Ebersole 53e0439880 HHH-6144 - Introduce ServiceRegistryBuilder 2011-04-20 15:58:10 -05:00
Steve Ebersole 6504cb6d78 HHH-6098 - Slight naming changes in regards to new logging classes 2011-04-08 09:44:13 -05:00
Steve Ebersole 2a8c81790b HHH-6094 - Test failures in hibernate-infinispan dealing with query caching 2011-04-06 14:44:46 -05:00
Galder Zamarreño 634d9186a5 HHH-6015 - Fix classloader issue 2011-03-28 17:26:58 +02:00