Skip to content

HHH-14137 Empty String check performance improvements #3491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2020
Merged

HHH-14137 Empty String check performance improvements #3491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ public static Ejb3Column[] buildColumnFromAnnotation(
}

final String columnName;
if ( "".equals( col.name() ) ) {
if ( col.name() != null && col.name().isEmpty() ) {
columnName = null;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public static Ejb3JoinColumn buildJoinColumn(
}

final String name;
if ( "".equals( colName ) ) {
if ( colName != null && colName.isEmpty() ) {
name = normalizer.normalizeIdentifierQuotingAsString( defaultName );
}
else {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ private static SimpleValue buildCollectionKey(
ConstraintMode foreignKeyValue = joinTableAnn.foreignKey().value();
if ( joinTableAnn.joinColumns().length != 0 ) {
final JoinColumn joinColumnAnn = joinTableAnn.joinColumns()[0];
if ( "".equals( foreignKeyName ) ) {
if ( foreignKeyName != null && foreignKeyName.isEmpty() ) {
foreignKeyName = joinColumnAnn.foreignKey().name();
foreignKeyDefinition = joinColumnAnn.foreignKey().foreignKeyDefinition();
}
Expand Down Expand Up @@ -1458,7 +1458,7 @@ else if ( anyAnn != null ) {
ConstraintMode foreignKeyValue = joinTableAnn.inverseForeignKey().value();
if ( joinTableAnn.inverseJoinColumns().length != 0 ) {
final JoinColumn joinColumnAnn = joinTableAnn.inverseJoinColumns()[0];
if ( "".equals( foreignKeyName ) ) {
if ( foreignKeyName != null && foreignKeyName.isEmpty() ) {
foreignKeyName = joinColumnAnn.foreignKey().name();
foreignKeyDefinition = joinColumnAnn.foreignKey().foreignKeyDefinition();
}
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/CockroachDB192Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public String getForUpdateString(String aliases, LockOptions lockOptions) {
/*
* Parent's implementation for (aliases, lockOptions) ignores aliases.
*/
if ( "".equals( aliases ) ) {
if ( aliases != null && aliases.isEmpty() ) {
LockMode lockMode = lockOptions.getLockMode();
final Iterator<Map.Entry<String, LockMode>> itr = lockOptions.getAliasLockIterator();
while ( itr.hasNext() ) {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public String getForUpdateString(String aliases, LockOptions lockOptions) {
/*
* Parent's implementation for (aliases, lockOptions) ignores aliases.
*/
if ( "".equals( aliases ) ) {
if ( aliases != null && aliases.isEmpty() ) {
LockMode lockMode = lockOptions.getLockMode();
final Iterator<Map.Entry<String, LockMode>> itr = lockOptions.getAliasLockIterator();
while ( itr.hasNext() ) {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/engine/internal/JoinSequence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ && isManyToManyRoot( last )
join.getAlias(),
enabledFilters
);
condition = "".equals( manyToManyFilter )
condition = (manyToManyFilter != null && manyToManyFilter.isEmpty())
? on
: "".equals( on ) ? manyToManyFilter : on + " and " + manyToManyFilter;
: (on != null && on.isEmpty()) ? manyToManyFilter : on + " and " + manyToManyFilter;
}
else {
condition = on;
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MethodNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private void prepareAnyImplicitJoins(DotNode dotNode) throws SemanticException {
if ( dotNode.getLhs() instanceof DotNode ) {
DotNode lhs = (DotNode) dotNode.getLhs();
FromElement lhsOrigin = lhs.getFromElement();
if ( lhsOrigin != null && "".equals( lhsOrigin.getText() ) ) {
if ( lhsOrigin != null && lhsOrigin.getText() != null && lhsOrigin.getText().isEmpty() ) {
String lhsOriginText = lhsOrigin.getQueryable().getTableName() +
" " + lhsOrigin.getTableAlias();
lhsOrigin.setText( lhsOriginText );
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void addDiscriminatorWhereFragment(
Map enabledFilters,
String alias) {
String whereFragment = persister.filterFragment( alias, enabledFilters ).trim();
if ( "".equals( whereFragment ) ) {
if ( whereFragment != null && whereFragment.isEmpty() ) {
return;
}
if ( whereFragment.startsWith( "and" ) ) {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ public boolean isManyToManyWith(OuterJoinableAssociation other) {

public void addManyToManyJoin(JoinFragment outerjoin, QueryableCollection collection) throws MappingException {
String manyToManyFilter = collection.getManyToManyFilterFragment( rhsAlias, enabledFilters );
String condition = "".equals( manyToManyFilter )
String condition = (manyToManyFilter != null && manyToManyFilter.isEmpty())
? on
: "".equals( on )
: (on != null && on.isEmpty())
? manyToManyFilter
: on + " and " + manyToManyFilter;
outerjoin.addJoin(
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaCreatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ private void applyImportSources(

for ( String currentFile : importFiles.split( "," ) ) {
final String resourceName = currentFile.trim();
if ( "".equals( resourceName ) ) {
if ( resourceName != null && resourceName.isEmpty() ) {
//skip empty resource names
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ else if ( mapKeyEnumType != null ) {
final IdMappingData referencedIdMapping = mainGenerator.getEntitiesConfigurations()
.get( referencedEntityName ).getIdMappingData();
final int currentIndex = queryGeneratorBuilder == null ? 0 : queryGeneratorBuilder.getCurrentIndex();
if ( "".equals( mapKey ) ) {
if ( mapKey != null && mapKey.isEmpty() ) {
// The key of the map is the id of the entity.
return new MiddleComponentData(
new MiddleMapKeyIdComponentMapper(
Expand Down
2 changes: 1 addition & 1 deletion hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
public abstract class StringTools {
public static boolean isEmpty(String s) {
return s == null || "".equals( s );
return s == null || s.isEmpty();
}

public static boolean isEmpty(Object o) {
Expand Down