Brett Meyer
c33fdae563
Merge remote-tracking branch 'origin/master' into metamodel
...
Conflicts:
hibernate-core/src/main/java/org/hibernate/LockOptions.java
hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java
hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java
hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java
hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java
hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java
hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/relational/Database.java
hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/Index.java
hibernate-core/src/main/java/org/hibernate/metamodel/spi/relational/UniqueKey.java
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
hibernate-core/src/main/java/org/hibernate/type/ArrayType.java
hibernate-core/src/main/java/org/hibernate/type/Type.java
hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintTest.java
hibernate-core/src/test/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java
hibernate-core/src/test/java/org/hibernate/test/criterion/CriterionTest.java
hibernate-core/src/test/resources/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java
2012-12-20 00:09:45 -05: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
Strong Liu
61039c62d8
hibernate-infinispan module testsuite code format only
2012-11-16 18:48:56 +08:00
Strong Liu
b859388f57
fixing test failures after merge
2012-11-16 18:45:59 +08:00
Strong Liu
09e5bfe4d5
fix test failures after merge
2012-11-16 14:00:41 +08:00
Brett Meyer
18e44d1739
Merge branch master into metamodel
2012-11-15 15:01:13 -05: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
Strong Liu
d4efae0794
HHH-7580 compile error
2012-09-13 14:53:31 +08:00
Steve Ebersole
7042790a53
HHH-7580 - Complete 2-phase SessionFactory building design
2012-09-12 15:48:20 -05:00
Steve Ebersole
ec16599411
HHH-7556 - Clean up packages
2012-09-10 15:46:11 -05:00
Steve Ebersole
af115fe5a8
Merge branch 'master' into metamodel
...
Conflicts:
hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java
hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java
hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java
hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java
hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java
hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
hibernate-core/src/main/java/org/hibernate/internal/StoredProcedureCallImpl.java
hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbConfigurationProcessor.java
hibernate-core/src/main/java/org/hibernate/jaxb/internal/JaxbMappingProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuilderImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/AnnotationMetadataSourceProcessorImpl.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/Helper.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java
hibernate-core/src/main/java/org/hibernate/service/ConfigLoader.java
hibernate-core/src/main/java/org/hibernate/service/ServiceRegistryBuilder.java
hibernate-core/src/main/java/org/hibernate/service/StandardServiceInitiators.java
hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
hibernate-core/src/main/java/org/hibernate/type/EnumType.java
hibernate-core/src/test/java/org/hibernate/metamodel/binding/AbstractBasicBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/IdentifierGeneratorTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/XmlHelper.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/SimpleValueBindingTests.java
hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/UnidirectionalManyToManyBindingTests.java
hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/HibernateSequenceTest.java
hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
hibernate-core/src/test/java/org/hibernate/test/common/JdbcConnectionAccessImpl.java
hibernate-core/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java
hibernate-core/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java
hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
hibernate-core/src/test/java/org/hibernate/test/events/CallbackTest.java
hibernate-core/src/test/java/org/hibernate/test/flush/TestAutoFlushBeforeQueryExecution.java
hibernate-core/src/test/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java
hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java
hibernate-core/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java
hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkTest.java
hibernate-core/src/test/java/org/hibernate/test/propertyref/DoesNotWorkWithHbmTest.java
hibernate-core/src/test/java/org/hibernate/test/service/ClassLoaderServiceImplTest.java
hibernate-core/src/test/resources/org/hibernate/jmx/Entity.hbm.xml
hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/jpa/CallbackProcessorImpl.java
hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java
hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java
hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseAnnotationBindingTestCase.java
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
2012-09-10 14:20:38 -05: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
8e8d681c7e
Merge branch 'master' into metamodel
2012-08-23 22:54:33 +08:00
Steve Ebersole
8c1923ee05
HHH-7540 - Allow integration hooks into all steps of building a SessionFactory
2012-08-22 12:46:15 -05:00
Strong Liu
7a82349f75
HHH-7385 change to use gradle 1.1
2012-08-08 17:09:11 +08:00
Strong Liu
7f3ad01b50
HHH-7495 HHH-7492 Move RegionFactory to session factory scope service registry
2012-08-01 04:28:55 +08:00
Strong Liu
9632e010e8
HHH-7492 - fixing test failures caused by some configuration is not applied to metamodel
2012-07-31 15:08:19 +08:00
Strong Liu
5562a981ac
HHH-7492 - fixing test failures caused by some configuration is not applied to metamodel
2012-07-31 15:02:52 +08:00
Strong Liu
60aad81c23
HHH-7491 fix test failures caused by natural id cache access strategy is not exposed to the persister
2012-07-31 04:03:14 +08:00
Strong Liu
b6f068a1f0
HHH-7485 Collection Caching region is bindded with wrong default region in annotation side
2012-07-30 20:09:39 +08:00
Steve Ebersole
986b66eb18
Initial merge from master to metamodel
2012-06-07 16:12:32 -05: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