Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-orm Commit: c952a843fa1227d17790cdafbc06d24a9f3fe27a https://github.com/hibernate/hibernate-orm/commit/c952a843fa1227d17790cda... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/ClusteredTimestampsRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/Caches.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/MultiTenancyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/NoTenancyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/NaturalIdInvalidationTestCase.java Log Message: ----------- HHH-10023 Make hibernate-infinispan compiled with Infinispan 7.x but runnable with Infinispan 8.x Commit: fa8e94071fbfc8ff0f9ab7a493bcf3bb612b7a50 https://github.com/hibernate/hibernate-orm/commit/fa8e94071fbfc8ff0f9ab7a... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/NaturalIdRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java Log Message: ----------- HHH-9988 Separate transaction manager used for Hibernate and caches Commit: 4b2a78785e1022a1f7016929b66292752b214c52 https://github.com/hibernate/hibernate-orm/commit/4b2a78785e1022a1f701692... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/TransactionalAccess.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionManagerImpl.java Log Message: ----------- HHH-9868 Infinispan 2LC can store stale data * invalidation blocks putFromLoads until the transaction with invalidation is committed * rewritten the naked puts support: timestamp is stored in the pendingPutMap and removal of the record relies on pending puts' idle expiration or piggy-backs on release from putFromLoad Commit: fa7265ff0ecf14a381ee6391b48d291e9ee02324 https://github.com/hibernate/hibernate-orm/commit/fa7265ff0ecf14a381ee639... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandIds.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandInitializer.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EndInvalidationCommand.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/AbstractFunctionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java Log Message: ----------- HHH-9881 Pending put needs to be invalidated on update on remote node * This could lead to performance degradation since new EndInvalidatingCommand needs to be send after transaction is committed Commit: 1f24fa6354220b7d263b86a75455e47bfdc1bc2a https://github.com/hibernate/hibernate-orm/commit/1f24fa6354220b7d263b86a... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/hibernate-infinispan.gradle M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxInvalidationInterceptor.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxPutFromLoadInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/Synchronization.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxPutFromLoadInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/TransactionalAccess.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/BeginInvalidationCommand.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandIds.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandInitializer.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/Externalizers.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/SecondLevelCacheMetadataModuleFinder.java A hibernate-infinispan/src/main/resources/META-INF/services/org.infinispan.factories.components.ModuleMetadataFileFinder M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java Log Message: ----------- HHH-9868, HHH-9881 Implementation for non-transactional caches and non-JTA transactions. Commit: 984125e87ee99d61cbda7750d81936fe4d393456 https://github.com/hibernate/hibernate-orm/commit/984125e87ee99d61cbda775... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/hibernate-infinispan.gradle M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/TransactionalAccess.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java Log Message: ----------- HHH-9868, HHH-9881 Replaced access to TransactionManager with Session Commit: c8ed5e1bef6a3a254b490d9fa5a6ae93465c7b66 https://github.com/hibernate/hibernate-orm/commit/c8ed5e1bef6a3a254b490d9... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/CorrectnessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Address.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/stress/entities/Family.java M hibernate-infinispan/src/test/resources/2lc-test-tcp.xml Log Message: ----------- HHH-9898 Test for correct behaviour of 2LC * Test is marked as ignored since it is expected to run it only manually Commit: 19c14cee9a9cdb9bb7856d8fa01857f3c1151434 https://github.com/hibernate/hibernate-orm/commit/19c14cee9a9cdb9bb7856d8... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/NaturalIdRegionImpl.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java Log Message: ----------- HHH-9868, HHH-9881 Removed references to TransactionManager from PutFromLoadValidator * Also removed put() instead of PFER() after region invalidation * Relaxed test that required that session.load() after cache.evictAll() in the same transaction cached the loaded entity Commit: 93d39fa47067362c17b762d2b4d710c3207b4131 https://github.com/hibernate/hibernate-orm/commit/93d39fa47067362c17b762d... Author: Radim Vansa <rvansa(a)redhat.com&gt; Date: 2015-08-12 (Wed, 12 Aug 2015) Changed paths: M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxInvalidationInterceptor.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxPutFromLoadInterceptor.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/NonTxTransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxPutFromLoadInterceptor.java A hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TxTransactionalAccessDelegate.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/naturalid/TransactionalAccess.java M hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EndInvalidationCommand.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java A hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionCoordinator.java Log Message: ----------- HHH-9868, HHH-9881 Must not write into non-transactional caches during transactional write * The write can only invalidate (remove) the entry and block further PFERs of that entry * After successful DB update, if there have not been any concurrent updates the value can be PFERed into the cache Compare: https://github.com/hibernate/hibernate-orm/compare/6fdc4cab8d46...93d39fa...