mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
SqlServer queryplan captured in transaction & fix of possible NPE (#1592)
* SqlServer queryplan captured in transaction & fix of possible NPE * rolled back transaction earlier
This commit is contained in:
committed by
Rob Bygrave
parent
7ed4435ccc
commit
3108076953
@@ -59,8 +59,10 @@ class CQueryBindCapture {
|
||||
final BindCapture last = this.bindCapture;
|
||||
|
||||
DQueryPlanOutput queryPlan = planLogger.logQueryPlan(request.getConnection(), cQueryPlan, last);
|
||||
queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
|
||||
request.process(queryPlan);
|
||||
if (queryPlan != null) {
|
||||
queryPlan.with(queryTimeMicros, captureCount, cQueryPlan.getPlanKey().toString());
|
||||
request.process(queryPlan);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -20,28 +20,31 @@ public class QueryPlanLoggerSqlServer extends QueryPlanLogger {
|
||||
public DQueryPlanOutput logQueryPlan(Connection conn, CQueryPlan plan, BindCapture bind) {
|
||||
|
||||
try (Statement stmt = conn.createStatement()) {
|
||||
stmt.execute("SET STATISTICS XML ON");
|
||||
stmt.execute("set statistics xml on");
|
||||
stmt.execute("begin transaction");
|
||||
try (PreparedStatement explainStmt = conn.prepareStatement(plan.getSql())) {
|
||||
bind.prepare(explainStmt, conn);
|
||||
|
||||
try (ResultSet rset = explainStmt.executeQuery()) {
|
||||
// unfortunately, this will execute the
|
||||
// unfortunately, this will execute the query, so we execute this in a transaction
|
||||
}
|
||||
stmt.execute("rollback transaction");
|
||||
String xml = null;
|
||||
if (explainStmt.getMoreResults()) {
|
||||
try (ResultSet rset = explainStmt.getResultSet()) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
while (rset.next()) {
|
||||
sb.append("XML: ").append(rset.getString(1));
|
||||
if (rset.next()) {
|
||||
xml = rset.getString(1);
|
||||
}
|
||||
return createPlan(plan, bind.toString(), sb.toString());
|
||||
}
|
||||
}
|
||||
return createPlan(plan, bind.toString(), xml);
|
||||
|
||||
} catch (SQLException e) {
|
||||
queryPlanLog.error("Could not log query plan", e);
|
||||
|
||||
} finally {
|
||||
stmt.execute("SET STATISTICS XML OFF");
|
||||
stmt.execute("set statistics xml off");
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
queryPlanLog.error("Could not log query plan", e);
|
||||
|
||||
Reference in New Issue
Block a user