Skip to content

Commit

Permalink
Bugfix: Correctly track elapsed time
Browse files Browse the repository at this point in the history
  • Loading branch information
danesparza committed Jan 6, 2020
1 parent be3733c commit f6942e2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/components/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class Main extends Component {
queryText: props.currentExpression || "",
QueryHasError: false,
QueryResults: QueryDataStore.getQueryResults(),
QueryTime: QueryDataStore.getQueryElapsedTime(),
QueryError: QueryDataStore.getQueryError(),
};
}
Expand Down Expand Up @@ -167,7 +168,7 @@ class Main extends Component {

<div id="queryresults">
<QueryErrorDisplay haserror={this.state.QueryHasError} error={this.state.QueryError} />
<QueryResultList results={this.state.QueryResults} />
<QueryResultList results={this.state.QueryResults} resulttime={this.state.QueryTime} />
</div>

</main>
Expand Down Expand Up @@ -404,6 +405,7 @@ class Main extends Component {
this.setState({
QueryHasError: false,
QueryResults: QueryDataStore.getQueryResults(),
QueryTime: QueryDataStore.getQueryElapsedTime(),
QueryError: QueryDataStore.getQueryError(),
});
}
Expand Down
4 changes: 3 additions & 1 deletion src/components/QueryResultList.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ class QueryResultList extends Component {
return null;
}

let resulttime = this.props.resulttime;

// Otherwise, loop through our results and show them:
return (
<React.Fragment>
{this.props.results.map(function(resultItem) {
return <QuerySeriesList key={resultItem.statement_id} serieslist={resultItem.series}/>;
return <QuerySeriesList key={resultItem.statement_id} serieslist={resultItem.series} resulttime={resulttime}/>;
})}
</React.Fragment>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/QuerySeries.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class QuerySeries extends Component {
const { classes} = this.props;

let seriesName = this.props.series.name;
let elapsedTime = this.props.resulttime;

// Set column information if we have it:
let columns = this.props.series.columns;
Expand Down Expand Up @@ -71,7 +72,7 @@ class QuerySeries extends Component {
return (
<React.Fragment>
<h2 className={classes.resultHeading}>{seriesName} </h2>
<div className={classes.resultMeta}> {datarows.length} results in 2.3s</div>
<div className={classes.resultMeta}> {datarows.length} results in {elapsedTime}</div>

<MuiVirtualizedTable
rowCount={datarows.length}
Expand Down
4 changes: 3 additions & 1 deletion src/components/QuerySeriesList.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ class QuerySeriesList extends Component {
return null;
}

let resulttime = this.props.resulttime;

// Otherwise, loop through our series and show them:
return (
<React.Fragment>
{this.props.serieslist.map(function(seriesItem, index) {
return <QuerySeries key={index} series={seriesItem}/>;
return <QuerySeries key={index} series={seriesItem} resulttime={resulttime}/>;
})}
</React.Fragment>
);
Expand Down

0 comments on commit f6942e2

Please sign in to comment.