put nugget inside of resolve call.. (duh)

deephaven · Nov 15, 2023 · 771ec36 · 771ec36
1 parent 947f854
commit 771ec36
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 232 deletions.
diff --git a/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java b/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java
@@ -77,14 +77,9 @@ public static void DoGetCustom(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request, "ArrowFlightUtil");
-
- final SessionState.ExportObject<BaseTable<?>> export;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTicket:" + ticketName)) {
- export = ticketRouter.resolve(session, request, "request");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<BaseTable<?>> export =
+ ticketRouter.resolve(session, request, "request");
 
  final BarragePerformanceLog.SnapshotMetricsHelper metrics =
  new BarragePerformanceLog.SnapshotMetricsHelper();
@@ -497,15 +492,9 @@ public void handleMessage(@NotNull final BarrageProtoUtil.MessageInfo message) {
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(
- snapshotRequest.ticketAsByteBuffer(), "ArrowFlightUtil");
-
- final SessionState.ExportObject<BaseTable<?>> parent;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTicket:" + ticketName)) {
- parent = ticketRouter.resolve(session, snapshotRequest.ticketAsByteBuffer(), "parent");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<BaseTable<?>> parent =
+ ticketRouter.resolve(session, snapshotRequest.ticketAsByteBuffer(), "parent");
 
  final BarragePerformanceLog.SnapshotMetricsHelper metrics =
  new BarragePerformanceLog.SnapshotMetricsHelper();
@@ -658,15 +647,9 @@ public void handleMessage(@NotNull final MessageInfo message) {
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(
- subscriptionRequest.ticketAsByteBuffer(), "ArrowFlightUtil");
-
- final SessionState.ExportObject<Object> parent;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTicket:" + ticketName)) {
- parent = ticketRouter.resolve(session, subscriptionRequest.ticketAsByteBuffer(), "parent");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Object> parent =
+ ticketRouter.resolve(session, subscriptionRequest.ticketAsByteBuffer(), "parent");
 
  synchronized (this) {
  onExportResolvedContinuation = session.nonExport()

diff --git a/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java
@@ -182,12 +182,9 @@ public void getFlightInfo(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
-
- final SessionState.ExportObject<Flight.FlightInfo> export;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget("flightInfoFor")) {
- export = ticketRouter.flightInfoFor(session, request, "request");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Flight.FlightInfo> export =
+ ticketRouter.flightInfoFor(session, request, "request");
 
  if (session != null) {
  session.nonExport()
@@ -239,12 +236,9 @@ public void getSchema(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
-
- final SessionState.ExportObject<Flight.FlightInfo> export;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget("flightInfoFor")) {
- export = ticketRouter.flightInfoFor(session, request, "request");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Flight.FlightInfo> export =
+ ticketRouter.flightInfoFor(session, request, "request");
 
  if (session != null) {
  session.nonExport()

diff --git a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
@@ -171,14 +171,9 @@ public void executeCommand(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(consoleId, "consoleId");
-
- final SessionState.ExportObject<ScriptSession> exportedConsole;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTicket:" + ticketName)) {
- exportedConsole = ticketRouter.resolve(session, consoleId, "consoleId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<ScriptSession> exportedConsole =
+ ticketRouter.resolve(session, consoleId, "consoleId");
 
  session.nonExport()
  .queryPerformanceRecorder(queryPerformanceRecorder)
@@ -261,14 +256,9 @@ public void bindTableToVariable(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String tableTicketName = ticketRouter.getLogNameFor(tableId, "tableId");
-
- final SessionState.ExportObject<Table> exportedTable;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTableTicket:" + tableTicketName)) {
- exportedTable = ticketRouter.resolve(session, tableId, "tableId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Table> exportedTable =
+ ticketRouter.resolve(session, tableId, "tableId");
 
  final SessionState.ExportObject<ScriptSession> exportedConsole;
 
@@ -278,12 +268,7 @@ public void bindTableToVariable(
  .onError(responseObserver);
 
  if (request.hasConsoleId()) {
- final String consoleTicketName = ticketRouter.getLogNameFor(request.getConsoleId(), "consoleId");
-
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveConsoleTicket:" + consoleTicketName)) {
- exportedConsole = ticketRouter.resolve(session, request.getConsoleId(), "consoleId");
- }
+ exportedConsole = ticketRouter.resolve(session, request.getConsoleId(), "consoleId");
  exportBuilder.require(exportedTable, exportedConsole);
  } else {
  exportedConsole = null;

diff --git a/...src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java b/...src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java
@@ -80,15 +80,9 @@ public void rollup(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request.getSourceTableId(),
- "HierarchicalTableServiceGrpcImpl");
-
- final SessionState.ExportObject<Table> sourceTableExport;
- try (final SafeCloseable ignored2 =
- QueryPerformanceRecorder.getInstance().getNugget("resolveTicket:" + ticketName)) {
- sourceTableExport = ticketRouter.resolve(session, request.getSourceTableId(), "rollup.sourceTableId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Table> sourceTableExport =
+ ticketRouter.resolve(session, request.getSourceTableId(), "rollup.sourceTableId");
 
  session.newExport(request.getResultRollupTableId(), "rollup.resultRollupTableId")
  .queryPerformanceRecorder(queryPerformanceRecorder)
@@ -137,15 +131,9 @@ public void tree(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request.getSourceTableId(),
- "HierarchicalTableServiceGrpcImpl");
-
- final SessionState.ExportObject<Table> sourceTableExport;
- try (final SafeCloseable ignored2 =
- QueryPerformanceRecorder.getInstance().getNugget("resolveTicket:" + ticketName)) {
- sourceTableExport = ticketRouter.resolve(session, request.getSourceTableId(), "tree.sourceTableId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Table> sourceTableExport =
+ ticketRouter.resolve(session, request.getSourceTableId(), "tree.sourceTableId");
 
  session.newExport(request.getResultTreeTableId(), "tree.resultTreeTableId")
  .queryPerformanceRecorder(queryPerformanceRecorder)
@@ -199,16 +187,10 @@ public void apply(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request.getInputHierarchicalTableId(),
- "HierarchicalTableServiceGrpcImpl");
-
- final SessionState.ExportObject<HierarchicalTable<?>> inputHierarchicalTableExport;
- try (final SafeCloseable ignored2 =
- QueryPerformanceRecorder.getInstance().getNugget("resolveTicket:" + ticketName)) {
- inputHierarchicalTableExport = ticketRouter.resolve(
- session, request.getInputHierarchicalTableId(), "apply.inputHierarchicalTableId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<HierarchicalTable<?>> inputHierarchicalTableExport =
+ ticketRouter.resolve(session, request.getInputHierarchicalTableId(),
+ "apply.inputHierarchicalTableId");
 
  session.newExport(request.getResultHierarchicalTableId(), "apply.resultHierarchicalTableId")
  .queryPerformanceRecorder(queryPerformanceRecorder)
@@ -362,7 +344,7 @@ public void view(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
 
  final SessionState.ExportBuilder<HierarchicalTableView> resultExportBuilder =
  session.newExport(request.getResultViewId(), "view.resultViewId");
@@ -382,21 +364,13 @@ public void view(
  default:
  throw new IllegalStateException();
  }
- final String ticketName = ticketRouter.getLogNameFor(request.getResultViewId(),
- "HierarchicalTableServiceGrpcImpl");
- final SessionState.ExportObject<?> targetExport;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance()
- .getNugget("resolveTargetTicket:" + ticketName)) {
- targetExport = ticketRouter.resolve(session, targetTicket, "view.target");
- }
+ final SessionState.ExportObject<?> targetExport =
+ ticketRouter.resolve(session, targetTicket, "view.target");
 
  final SessionState.ExportObject<Table> keyTableExport;
  if (request.hasExpansions()) {
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance()
- .getNugget("resolveExpansionsTicket:" + ticketName)) {
- keyTableExport = ticketRouter.resolve(
- session, request.getExpansions().getKeyTableId(), "view.expansions.keyTableId");
- }
+ keyTableExport = ticketRouter.resolve(
+ session, request.getExpansions().getKeyTableId(), "view.expansions.keyTableId");
  resultExportBuilder.require(targetExport, keyTableExport);
  } else {
  keyTableExport = null;
@@ -486,16 +460,10 @@ public void exportSource(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request.getHierarchicalTableId(),
- "HierarchicalTableServiceGrpcImpl");
-
- final SessionState.ExportObject<HierarchicalTable<?>> hierarchicalTableExport;
- try (final SafeCloseable ignored2 =
- QueryPerformanceRecorder.getInstance().getNugget("resolveTicket:" + ticketName)) {
- hierarchicalTableExport = ticketRouter.resolve(
- session, request.getHierarchicalTableId(), "exportSource.hierarchicalTableId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<HierarchicalTable<?>> hierarchicalTableExport =
+ ticketRouter.resolve(session, request.getHierarchicalTableId(),
+ "exportSource.hierarchicalTableId");
 
  session.newExport(request.getResultTableId(), "exportSource.resultTableId")
  .queryPerformanceRecorder(queryPerformanceRecorder)

diff --git a/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java
@@ -265,14 +265,9 @@ public void fetchObject(
  final QueryPerformanceRecorder queryPerformanceRecorder = QueryPerformanceRecorder.newQuery(
  description, QueryPerformanceNugget.DEFAULT_FACTORY);
 
- try (final SafeCloseable ignored1 = queryPerformanceRecorder.startQuery()) {
- final String ticketName = ticketRouter.getLogNameFor(request.getSourceId().getTicket(), "sourceId");
-
- final SessionState.ExportObject<Object> object;
- try (final SafeCloseable ignored2 = QueryPerformanceRecorder.getInstance().getNugget(
- "resolveTicket:" + ticketName)) {
- object = ticketRouter.resolve(session, request.getSourceId().getTicket(), "sourceId");
- }
+ try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
+ final SessionState.ExportObject<Object> object =
+ ticketRouter.resolve(session, request.getSourceId().getTicket(), "sourceId");
 
  session.nonExport()
  .queryPerformanceRecorder(queryPerformanceRecorder)