Skip to content
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

repl: show execution time #3236

Merged
merged 2 commits into from
Nov 8, 2024
Merged

repl: show execution time #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc8ddee
pure: show execution time
akphi Nov 7, 2024
8c8f72a
repl: DX improvement for DataCube client
akphi Nov 7, 2024
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
3 changes: 2 additions & 1 deletion ...l/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/client/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ public Client(MutableList<ReplExtension> replExtensions, MutableList<CompleterEx
this.initialize();
replExtensions.forEach(e -> e.initialize(this));

this.printDebug("[DEV] Legend REPL v" + DeploymentStateAndVersions.sdlc.buildVersion + " (" + DeploymentStateAndVersions.sdlc.commitIdAbbreviated + ")");
this.printDebug("[DEV] REPL v" + DeploymentStateAndVersions.sdlc.buildVersion + " (" + DeploymentStateAndVersions.sdlc.commitIdAbbreviated + ")");
this.printDebug("[DEV] REPL dir: " + this.getHomeDir().toUri());
if (System.getProperty("legend.repl.initializationMessage") != null)
{
this.printDebug(StringEscapeUtils.unescapeJava(System.getProperty("legend.repl.initializationMessage")));
Expand Down
3 changes: 3 additions & 0 deletions ...-engine-repl-client/src/main/java/org/finos/legend/engine/repl/core/commands/Execute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.jline.reader.ParsedLine;

import static org.finos.legend.engine.repl.shared.ExecutionHelper.executeCode;
import static org.finos.legend.engine.repl.shared.ExecutionHelper.printExecutionTime;
import static org.finos.legend.engine.repl.shared.REPLHelper.ansiGreen;

public class Execute implements Command
Expand All @@ -51,7 +52,9 @@ public String documentation()
@Override
public boolean process(String line) throws Exception
{
long startTime = System.currentTimeMillis();
this.client.println(execute(line));
this.client.println(printExecutionTime(startTime));
return true;
}

Expand Down
5 changes: 5 additions & 0 deletions ...engine-repl-client/src/main/java/org/finos/legend/engine/repl/shared/ExecutionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ public static ExecutionHelper.ExecuteResultSummary executeCode(String txt, Clien
return resultHandler.value(res, pmcd, pureModel, execPlan);
}

public static String printExecutionTime(long startTime)
{
return String.format("%.1f", (float) (System.currentTimeMillis() - startTime) / 1000) + "s";
}

public static class ExecuteResultSummary
{
public final PureModelContextData pureModelContextData;
Expand Down
9 changes: 8 additions & 1 deletion ...-data-cube/src/main/java/org/finos/legend/engine/repl/dataCube/client/DataCubeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@

package org.finos.legend.engine.repl.dataCube.client;

import org.apache.commons.io.FileUtils;
import org.eclipse.collections.impl.factory.Lists;
import org.finos.legend.engine.plan.execution.PlanExecutor;
import org.finos.legend.engine.repl.client.Client;
import org.finos.legend.engine.repl.dataCube.DataCubeReplExtension;
import org.finos.legend.engine.repl.relational.RelationalReplExtension;
import org.finos.legend.engine.repl.relational.autocomplete.RelationalCompleterExtension;

import java.nio.file.Paths;

public class DataCubeClient
{
public static void main(String[] args) throws Exception
{
// NOTE: this is exclusively used for development of DataCube when we need to boot multiple instances
// of the REPL at the same time and want to avoid locking on the DuckDB instances
String DEV__homeDir = System.getProperty("legend.repl.dataCube.devHomeDir");
Client client = new Client(
Lists.mutable.with(
new DataCubeReplExtension(),
Expand All @@ -33,7 +39,8 @@ public static void main(String[] args) throws Exception
Lists.mutable.with(
new RelationalCompleterExtension()
),
PlanExecutor.newPlanExecutorBuilder().withAvailableStoreExecutors().build()
PlanExecutor.newPlanExecutorBuilder().withAvailableStoreExecutors().build(),
DEV__homeDir != null ? Paths.get(DEV__homeDir) : FileUtils.getUserDirectory().toPath().resolve(".legend/repl")
);
client.loop();
}
Expand Down
3 changes: 3 additions & 0 deletions ...ava/org/finos/legend/engine/repl/dataCube/commands/DataCube__DEV__runDuckDBSelectSQL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.List;

import static org.finos.legend.engine.plan.execution.stores.relational.result.RelationalResultGridPrintUtility.prettyGridPrint;
import static org.finos.legend.engine.repl.shared.ExecutionHelper.printExecutionTime;

public class DataCube__DEV__runDuckDBSelectSQL implements Command
{
Expand Down Expand Up @@ -79,6 +80,7 @@ public boolean process(String line) throws Exception
{
try (Statement statement = connection.createStatement())
{
long startTime = System.currentTimeMillis();
ResultSet result = statement.executeQuery(expression);
List<String> columnNames = Lists.mutable.empty();
List<String> columnTypes = Lists.mutable.empty();
Expand All @@ -89,6 +91,7 @@ public boolean process(String line) throws Exception
}
this.client.println("Executed SELECT SQL: '" + expression + "'");
this.client.println(prettyGridPrint(result, columnNames, columnNames, 40, 60));
this.client.println(printExecutionTime(startTime));
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...ta-cube/src/main/java/org/finos/legend/engine/repl/dataCube/server/REPLServerHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ private void initialize(PureModelContextData pureModelContextData, List<DataCube
String newRuntime = ((PackageableElementPtr) fn.parameters.get(1)).fullPath;
if (runtime != null && !runtime.equals(newRuntime))
{
throw new RuntimeException("Can't initialize DataCube. Source query contains multiple different ->from(), only one is expected");
throw new RuntimeException("Can't launch DataCube. Source query contains multiple different ->from(), only one is expected");
}
runtime = newRuntime;
}
Expand All @@ -130,7 +130,7 @@ else if (fn.parameters.size() == 3)
String newRuntime = ((PackageableElementPtr) fn.parameters.get(2)).fullPath;
if ((mapping != null && !mapping.equals(newMapping)) || (runtime != null && !runtime.equals(newRuntime)))
{
throw new RuntimeException("Can't initialize DataCube. Source query contains multiple different ->from(), only one is expected");
throw new RuntimeException("Can't launch DataCube. Source query contains multiple different ->from(), only one is expected");
}
mapping = newMapping;
runtime = newRuntime;
Expand Down Expand Up @@ -183,7 +183,7 @@ public void initializeFromTable(PureModelContextData pureModelContextData)
}
catch (Exception e)
{
throw new RuntimeException("Can't initialize DataCube: expected to get a relation type");
throw new RuntimeException("Can't launch DataCube: expected to get a relation type");
}
this.initialize(pureModelContextData, ListIterate.collect(RelationTypeHelper.convert(relationType).columns, col -> new DataCubeQueryColumn(col.name, col.type)));
}
Expand All @@ -192,7 +192,7 @@ public void initializeWithREPLExecutedQuery(ExecutionHelper.ExecuteResultSummary
{
if (!(executeResultSummary.result instanceof RelationalResult) || !(((RelationalResult) executeResultSummary.result).builder instanceof TDSBuilder))
{
throw new RuntimeException("Can't initialize DataCube: last executed query did not produce a TDS (i.e. data-grid), try a different query...");
throw new RuntimeException("Can't launch DataCube: last executed query did not produce a TDS (i.e. data-grid), try a different query...");
}

RelationType relationType;
Expand All @@ -202,7 +202,7 @@ public void initializeWithREPLExecutedQuery(ExecutionHelper.ExecuteResultSummary
}
catch (Exception e)
{
throw new RuntimeException("Can't initialize DataCube: last executed query must return a relation type, try a different query...");
throw new RuntimeException("Can't launch DataCube: last executed query must return a relation type, try a different query...");
}

boolean isDynamic = false;
Expand All @@ -220,7 +220,7 @@ public void initializeWithREPLExecutedQuery(ExecutionHelper.ExecuteResultSummary
}
if (isDynamic)
{
throw new RuntimeException("Can't initialize DataCube: last executed query produced dynamic result, try casting the result with cast(@" + M3Paths.Relation + "<(...)>) syntax or use 'cache' command to dump the data out to a table and query against that table instead...");
throw new RuntimeException("Can't launch DataCube: last executed query produced dynamic result, try casting the result with cast(@" + M3Paths.Relation + "<(...)>) syntax or use 'cache' command to dump the data out to a table and query against that table instead...");
}

RelationalResult result = (RelationalResult) executeResultSummary.result;
Expand Down
3 changes: 3 additions & 0 deletions ...repl-relational/src/main/java/org/finos/legend/engine/repl/relational/commands/Cache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

import static org.finos.legend.engine.repl.relational.schema.MetadataReader.getTables;
import static org.finos.legend.engine.repl.shared.ExecutionHelper.executeCode;
import static org.finos.legend.engine.repl.shared.ExecutionHelper.printExecutionTime;

public class Cache implements Command
{
Expand Down Expand Up @@ -91,6 +92,7 @@ public boolean process(String line) throws Exception

try
{
long startTime = System.currentTimeMillis();
executeCode(expression, this.client, (Result res, PureModelContextData pmcd, PureModel pureModel, SingleExecutionPlan plan) ->
{
if (res instanceof RelationalResult)
Expand All @@ -117,6 +119,7 @@ public boolean process(String line) throws Exception
{
statement.executeUpdate(DatabaseManager.fromString(databaseConnection.type.name()).relationalDatabaseSupport().load(tableName, tempFile.getTemporaryPathForFile(), relationalResultColumns));
this.client.println("Cached into table: '" + tableName + "'");
this.client.println(printExecutionTime(startTime));
}
}
catch (SQLException e)
Expand Down
Loading