github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-22 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename hash to sqlHash to better reflect what it is (CRC32 checksum of the sql)

Browse Source
This commit is contained in:
rbygrave
2021-08-06 12:06:43 +12:00
parent 7ca72a39b1
commit 202d785710
12 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java
+2 -2
View File
@@ -21,8 +21,8 @@ public interface MetaQueryMetric extends MetaTimedMetric {
String getSql();
/**
* Return the hash of the plan.
* Return the hash of the sql.
*/
long getHash();
long getSqlHash();
}
ebean-api/src/main/java/io/ebean/meta/MetricData.java
+5 -5
View File
@@ -6,7 +6,7 @@ package io.ebean.meta;
public class MetricData {
private String name;
private long hash;
private long sqlHash;
private String loc;
private String sql;
@@ -30,12 +30,12 @@ public class MetricData {
this.name = name;
}
public long getHash() {
return hash;
public long getSqlHash() {
return sqlHash;
}
public void setHash(long hash) {
this.hash = hash;
public void setSqlHash(long sqlHash) {
this.sqlHash = sqlHash;
}
public String getLoc() {
ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
+2 -2
View File
@@ -18,9 +18,9 @@ public interface SpiQueryPlan {
String getName();
/**
* The hash for the query plan.
* The hash of the sql.
*/
long getHash();
long getSqlHash();
/**
* The SQL for the query plan.
ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+1 -1
View File
@@ -120,7 +120,7 @@ class DumpMetrics {
appendQueryName(metric, sb);
appendCounters(metric, sb);
if (dumpHash) {
sb.append("\n hash:").append(metric.getHash());
sb.append("\n sqlHash:").append(metric.getSqlHash());
}
appendProfileAndSql(metric, sb);
out(sb.toString());
ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+1 -1
View File
@@ -67,7 +67,7 @@ class DumpMetricsData {
final MetricData data = create(metric);
appendCounters(data, metric);
appendLocationAndSql(data, metric);
data.setHash(metric.getHash());
data.setSqlHash(metric.getSqlHash());
}
private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+1 -1
View File
@@ -197,7 +197,7 @@ class DumpMetricsJson implements ServerMetricsAsJson {
metricStart(metric);
appendTiming(metric);
if (withHash) {
keyVal("hash", metric.getHash());
keyVal("sqlHash", metric.getSqlHash());
}
if (isIncludeDetail(metric)) {
appendExtra("loc", metric.getLocation());
ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+1 -1
View File
@@ -1558,7 +1558,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
void queryPlanInit(QueryPlanInit request, List<MetaQueryPlan> list) {
for (CQueryPlan queryPlan : queryPlanCache.values()) {
if (request.includeHash(queryPlan.getHash())) {
if (request.includeHash(queryPlan.getSqlHash())) {
queryPlan.queryPlanInit(request.getThresholdMicros());
list.add(queryPlan.createMeta(null, null));
}
ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMeta.java
+4 -4
View File
@@ -10,7 +10,7 @@ class DQueryPlanMeta {
private final ProfileLocation profileLocation;
private final String name;
private final String sql;
private final long hash;
private final long sqlHash;
DQueryPlanMeta(Class<?> type, String label, ProfileLocation profileLocation, String sql) {
this.type = type;
@@ -22,15 +22,15 @@ class DQueryPlanMeta {
name += "_" + label;
}
this.name = name;
this.hash = Checksum.checksum(sql);
this.sqlHash = Checksum.checksum(sql);
}
public Class<?> getType() {
return type;
}
public long getHash() {
return hash;
public long getSqlHash() {
return sqlHash;
}
public String getName() {
ebean-core/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java
+2 -2
View File
@@ -59,8 +59,8 @@ class DQueryPlanMetric implements QueryPlanMetric {
}
@Override
public long getHash() {
return meta.getHash();
public long getSqlHash() {
return meta.getSqlHash();
}
@Override
ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+7 -7
View File
@@ -68,7 +68,7 @@ public class CQueryPlan implements SpiQueryPlan {
private final boolean rawSql;
private final String sql;
private final long hash;
private final long sqlHash;
private final String logWhereSql;
@@ -118,7 +118,7 @@ public class CQueryPlan implements SpiQueryPlan {
this.stats = new CQueryPlanStats(this);
this.dependentTables = sqlTree.dependentTables();
this.bindCapture = initBindCapture(query);
this.hash = Checksum.checksum(sql);
this.sqlHash = Checksum.checksum(sql);
}
/**
@@ -143,7 +143,7 @@ public class CQueryPlan implements SpiQueryPlan {
this.stats = new CQueryPlanStats(this);
this.dependentTables = sqlTree.dependentTables();
this.bindCapture = initBindCaptureRaw(sql, query);
this.hash = Checksum.checksum(sql);
this.sqlHash = Checksum.checksum(sql);
}
private String deriveName(String label, SpiQuery.Type type, String simpleName) {
@@ -193,8 +193,8 @@ public class CQueryPlan implements SpiQueryPlan {
}
@Override
public long getHash() {
return hash;
public long getSqlHash() {
return sqlHash;
}
@Override
@@ -226,7 +226,7 @@ public class CQueryPlan implements SpiQueryPlan {
@Override
public DQueryPlanOutput createMeta(String bind, String planString) {
return new DQueryPlanOutput(getBeanType(), name, hash, sql, profileLocation, bind, planString);
return new DQueryPlanOutput(getBeanType(), name, sqlHash, sql, profileLocation, bind, planString);
}
public DataReader createDataReader(ResultSet rset) {
@@ -273,7 +273,7 @@ public class CQueryPlan implements SpiQueryPlan {
private String calcAuditQueryKey() {
// rawSql needs to include the MD5 hash of the sql
return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
return rawSql ? planKey.getPartialKey() + "_" + sqlHash : planKey.getPartialKey();
}
SqlTree getSqlTree() {
ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+2 -2
View File
@@ -127,8 +127,8 @@ public final class CQueryPlanStats {
}
@Override
public long getHash() {
return queryPlan.getHash();
public long getSqlHash() {
return queryPlan.getSqlHash();
}
@Override
ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+3 -3
View File
@@ -216,7 +216,7 @@ public class TestCustomerFinder extends BaseTestCase {
assertThat(plans0).isNotEmpty();
for (MetaQueryPlan plan : plans) {
logger.info("queryplan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
logger.info("queryPlan label:{}, queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
plan.getLabel(), plan.getQueryTimeMicros(), plan.getProfileLocation(),
plan.getSql(), plan.getBind(), plan.getPlan());
System.out.println(plan);
@@ -244,7 +244,7 @@ public class TestCustomerFinder extends BaseTestCase {
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:44)\"");
if (isH2() || isPostgres()) {
assertThat(metricsJson).contains("\"hash\":3634991469");
assertThat(metricsJson).contains("\"sqlHash\":3634991469");
assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");
}
}
@@ -267,7 +267,7 @@ public class TestCustomerFinder extends BaseTestCase {
assertThat(metricsJson).contains("\"name\":\"txn.main\"");
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
assertThat(metricsJson).doesNotContain("\"loc\":");
assertThat(metricsJson).doesNotContain("\"hash\":");
assertThat(metricsJson).doesNotContain("\"sqlHash\":");
assertThat(metricsJson).doesNotContain("\"sql\":");
}