Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6093 - Account for tenant identifier on QueryKey

This commit is contained in:
Steve Ebersole 2011-04-13 23:16:06 -05:00
parent 44cca7a375
commit 0023dc695d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/cache/QueryKey.java vendored
View File

@ -53,6 +53,7 @@ public class QueryKey implements Serializable {
private final Integer firstRow; private final Integer firstRow;
private final Integer maxRows; private final Integer maxRows;
private final EntityMode entityMode; private final EntityMode entityMode;
private final String tenantIdentifier;
private final Set filterKeys; private final Set filterKeys;
// the user provided resulttransformer, not the one used with "select new". Here to avoid mangling // the user provided resulttransformer, not the one used with "select new". Here to avoid mangling
@ -136,6 +137,7 @@ public class QueryKey implements Serializable {
maxRows, maxRows,
filterKeys, filterKeys,
session.getEntityMode(), session.getEntityMode(),
session.getTenantIdentifier(),
customTransformer customTransformer
); );
} }
@ -162,6 +164,7 @@ public class QueryKey implements Serializable {
Integer maxRows, Integer maxRows,
Set filterKeys, Set filterKeys,
EntityMode entityMode, EntityMode entityMode,
String tenantIdentifier,
CacheableResultTransformer customTransformer) { CacheableResultTransformer customTransformer) {
this.sqlQueryString = sqlQueryString; this.sqlQueryString = sqlQueryString;
this.positionalParameterTypes = positionalParameterTypes; this.positionalParameterTypes = positionalParameterTypes;
@ -170,6 +173,7 @@ public class QueryKey implements Serializable {
this.firstRow = firstRow; this.firstRow = firstRow;
this.maxRows = maxRows; this.maxRows = maxRows;
this.entityMode = entityMode; this.entityMode = entityMode;
this.tenantIdentifier = tenantIdentifier;
this.filterKeys = filterKeys; this.filterKeys = filterKeys;
this.customTransformer = customTransformer; this.customTransformer = customTransformer;
this.hashCode = generateHashCode(); this.hashCode = generateHashCode();
@ -202,6 +206,7 @@ public class QueryKey implements Serializable {
result = 37 * result + ( namedParameters==null ? 0 : namedParameters.hashCode() ); result = 37 * result + ( namedParameters==null ? 0 : namedParameters.hashCode() );
result = 37 * result + ( filterKeys ==null ? 0 : filterKeys.hashCode() ); result = 37 * result + ( filterKeys ==null ? 0 : filterKeys.hashCode() );
result = 37 * result + ( customTransformer==null ? 0 : customTransformer.hashCode() ); result = 37 * result + ( customTransformer==null ? 0 : customTransformer.hashCode() );
result = 37 * result + ( tenantIdentifier==null ? 0 : tenantIdentifier.hashCode() );
result = 37 * result + sqlQueryString.hashCode(); result = 37 * result + sqlQueryString.hashCode();
return result; return result;
} }
@ -247,7 +252,9 @@ public class QueryKey implements Serializable {
} }
return EqualsHelper.equals( filterKeys, that.filterKeys ) return EqualsHelper.equals( filterKeys, that.filterKeys )
&& EqualsHelper.equals( namedParameters, that.namedParameters ); && EqualsHelper.equals( namedParameters, that.namedParameters )
&& EqualsHelper.equals( entityMode, that.entityMode )
&& EqualsHelper.equals( tenantIdentifier, that.tenantIdentifier );
} }
/** /**

1
hibernate-core/src/test/java/org/hibernate/cache/QueryKeyTest.java vendored
View File

@ -236,6 +236,7 @@ public class QueryKeyTest extends BaseUnitTestCase {
null, // maxRows selection null, // maxRows selection
Collections.EMPTY_SET, // filter keys Collections.EMPTY_SET, // filter keys
EntityMode.POJO, // entity mode EntityMode.POJO, // entity mode
null, // tenantIdentifier
resultTransformer // the result transformer resultTransformer // the result transformer
); );
} }