[hibernate-commits] [hibernate/hibernate-orm] dbca6a: HHH-14187 Add test for issue

Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: dbca6a2291eaf14ef6e2f725c1be6b5a029545d3 https://github.com/hibernate/hibernate-orm/commit/dbca6a2291eaf14ef6e2f72... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java Log Message: ----------- HHH-14187 Add test for issue Commit: beabfecb3ee93c0e4a4fac9fdbc5d16d42a6c03e https://github.com/hibernate/hibernate-orm/commit/beabfecb3ee93c0e4a4fac9... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java M hibernate-core/src/main/java/org/hibernate/loader/plan/exec/process/internal/EntityReferenceInitializerImpl.java Log Message: ----------- HHH-14187 Lazy loading fails if an entity appears twice in the object graph when enhancement as proxy is enabled Commit: 9c6805fdd36ba96b2ca6dc3dd9d4b82f08d29e04 https://github.com/hibernate/hibernate-orm/commit/9c6805fdd36ba96b2ca6dc3... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java M hibernate-core/src/main/java/org/hibernate/criterion/Example.java M hibernate-core/src/main/java/org/hibernate/engine/internal/JoinSequence.java M hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java M hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java M hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java M hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/xml/ContactType.java M hibernate-core/src/test/java/org/hibernate/test/converter/custom/MyCustomSqlTypeDescriptor.java M hibernate-core/src/test/java/org/hibernate/test/criteria/OuterJoinCriteriaTest.java Log Message: ----------- HHH-14190 Rename isEmptyOrWhitespace() to isBlank() and use it in more places Commit: 03a1bb5ac8bf90628784e4d9dbf4d7ea7148e48d https://github.com/hibernate/hibernate-orm/commit/03a1bb5ac8bf90628784e4d... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java M hibernate-core/src/test/java/org/hibernate/test/util/StringHelperTest.java Log Message: ----------- HHH-14190 Improve efficiency of StringHelper#isBlank Commit: 28787bc0131969bbf10b55c2a837ab17245cb9fc https://github.com/hibernate/hibernate-orm/commit/28787bc0131969bbf10b55c... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java Log Message: ----------- HHH-14190 Method StringHelper#moveAndToBeginning could benefit from using the improved helper too Commit: fe4a94d90c2892161024b05d08d9ec977a15190e https://github.com/hibernate/hibernate-orm/commit/fe4a94d90c2892161024b05... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/antlr/sql-script.g M hibernate-core/src/test/java/org/hibernate/test/fileimport/MultiLineImportExtractorTest.java Log Message: ----------- HHH-14152 sql-script.g fix for antlr non deterministic warning Commit: b9fcc63d843ccb3da9015991240316685f612fa5 https://github.com/hibernate/hibernate-orm/commit/b9fcc63d843ccb3da901599... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/antlr/sql-script.g A hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptLogging.java M hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptParser.java M hibernate-core/src/test/resources/log4j.properties Log Message: ----------- HHH-14152 sql-script.g fix for antlr non deterministic warning - Added "system"-style SqlScriptLogging - Added rule trace logging through SqlScriptLogging Commit: 59d40c3bf5bc998f54d89fd6007173e0aa961067 https://github.com/hibernate/hibernate-orm/commit/59d40c3bf5bc998f54d89fd... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-08-26 (Wed, 26 Aug 2020) Changed paths: M hibernate-core/src/main/antlr/sql-script.g M hibernate-core/src/test/java/org/hibernate/test/fileimport/MultiLineImportExtractorTest.java Log Message: ----------- HHH-14193 MultipleLinesSqlCommandExtractor should tolerate empty input scripts Commit: d1119d320a96695341d102480648752a7208525b https://github.com/hibernate/hibernate-orm/commit/d1119d320a96695341d1024... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java Log Message: ----------- HHH-14153 optimize away temp table for single-table HQL update When a HQL bulk update query only touches a single table, use BasicExecutor instead of MultiTableUpdateExecutor. This is an alternate implementation to the one proposed by @NathanQingyangXu in #3508 and loosely based on that work. Commit: 264e71a916ff27a97bfefea144a20895f7fc75e7 https://github.com/hibernate/hibernate-orm/commit/264e71a916ff27a97bfefea... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/InsertExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/UpdateExecutor.java Log Message: ----------- HHH-14153 clean up BasicExecutor and friends introduces InsertExecutor and UpdateExecutor since we're going to be introducing specific optimizations relating to single-table updates relates to HHH-14153 Commit: 423697026de10ed24c8d425b661425072926bfa0 https://github.com/hibernate/hibernate-orm/commit/423697026de10ed24c8d425... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/IdSubselectUpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/InsertExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/SimpleUpdateExecutor.java R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/UpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/spi/id/TableBasedUpdateHandlerImpl.java Log Message: ----------- HHH-14153 further optimization for single-table HQL update This extends the optimization for single-table HQL bulk updates to the case where the where clause touches multiple tables and we can use a subselect to collect the ids that we need to update. Commit: 51730713222a088a960de3296b5053880b0bb0b9 https://github.com/hibernate/hibernate-orm/commit/51730713222a088a960de32... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java Log Message: ----------- HHH-14153 add test By NathanQingyangXu See https://github.com/hibernate/hibernate-orm/pull/3508 Commit: 5daf440a6cd8e0ed115f33d0594cc19c88ccfa04 https://github.com/hibernate/hibernate-orm/commit/5daf440a6cd8e0ed115f33d... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java Log Message: ----------- HHH-14153 Make buildAppropriateStatementExecutor() protected Hibernate Reactive might ultimately need to override this method, though it doesn't right now. Relates to HHH-14153. Commit: 5b9ec29ecb689c7fddaeec42afeb72398aeb9a0a https://github.com/hibernate/hibernate-orm/commit/5b9ec29ecb689c7fddaeec4... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2020-08-27 (Thu, 27 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/BasicExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/IdSubselectUpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/InsertExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/SimpleUpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractTableBasedBulkIdHandler.java Log Message: ----------- HHH-14153 refactoring after HHH-14153 - avoid use package-scoped instance felds - remove copy/pasted code Note: I don't hate package-scoped final fields, but I know other folks tend to. So let's go with template methods instead. Commit: 638a3e234b447da340d730d445e89662cba101da https://github.com/hibernate/hibernate-orm/commit/638a3e234b447da340d730d... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-08-28 (Fri, 28 Aug 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterSourceImpl.java M hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/IdSubselectUpdateExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/InsertExecutor.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/SimpleUpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java A hibernate-core/src/main/java/org/hibernate/tool/schema/ast/SqlScriptLogging.java M hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java M hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java M hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/SharingReferenceTest.java M hibernate-core/src/test/java/org/hibernate/test/converter/custom/MyCustomSqlTypeDescriptor.java A hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java M hibernate-core/src/test/java/org/hibernate/test/tool/schema/scripts/MultiLineImportExtractorTest.java M hibernate-core/src/test/java/org/hibernate/test/util/StringHelperTest.java Log Message: ----------- Merge remote-tracking branch 'upstream/master' into wip/6.0 Commit: 076a0aa25a75571dd78a840cb9588035f3e65864 https://github.com/hibernate/hibernate-orm/commit/076a0aa25a75571dd78a840... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-08-28 (Fri, 28 Aug 2020) Changed paths: R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/IdSubselectUpdateExecutor.java R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/InsertExecutor.java R hibernate-core/src/main/java/org/hibernate/hql/internal/ast/exec/SimpleUpdateExecutor.java Log Message: ----------- fix compilation errors after merging master Compare: https://github.com/hibernate/hibernate-orm/compare/3d46fabeb58d...076a0aa...