Merge branch 'main' of https://github.com/metrico/clickhouse-mate

metrico · Jul 8, 2022 · 65a0c30 · 65a0c30
2 parents 7c37d05 + 30f0669
commit 65a0c30
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "click-house-play",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --open",

diff --git a/src/app/pages/home.page/home.page.component.html b/src/app/pages/home.page/home.page.component.html
@@ -150,22 +150,21 @@ <h1>No Data</h1>
                         <ng-template #hasData>
                             <div class="short-stat">
                                 <div>
-                                    <strong>Elapsed: </strong>
                                     <span>{{
                                         timeShorter(
-                                            dataForFile?.statistics?.elapsed ||
+                                            dataForFile?.rows ||
                                                 0
                                         )
-                                    }}</span>
-                                </div>
-                                <div>
-                                    <strong>Rows: </strong>
+                                    }} rows in set. Elapsed </span>
                                     <span>{{
+                                        timeShorter(
+                                            dataForFile?.statistics?.elapsed ||
+                                                0
+                                        )
+                                    }}. </span>
+                                    <span>Processed {{
                                         dataForFile?.statistics?.rows_read
-                                    }}</span>
-                                </div>
-                                <div>
-                                    <strong>Size: </strong>
+                                    }} rows, </span>
                                     <span>
                                         {{
                                             bytesToSize(
@@ -174,6 +173,19 @@ <h1>No Data</h1>
                                             )
                                         }}
                                     </span>
+
+                                    <span>
+                                        ({{
+                                            timeShorter(
+                                              (dataForFile?.statistics?.elapsed || 0) / ( parseFloat(dataForFile?.statistics?.elapsed || 0) || 0.001 )
+                                            )
+                                        }} rows/s. {{
+                                            bytesToSize(
+                                                (dataForFile?.statistics?.bytes_read || 0) / ( parseFloat(dataForFile?.statistics?.elapsed || 0) || 0.001 )
+                                            )
+                                        }}/s.)
+                                    </span>
+
                                 </div>
                             </div>
                             <custom-ag-grid

diff --git a/src/app/pages/home.page/home.page.component.ts b/src/app/pages/home.page/home.page.component.ts
@@ -40,6 +40,7 @@ export class HomePageComponent implements OnInit {
     pageSize: number = 50;
     isPaginator: boolean = true;
     currentRow: Row = new Map();
+    parseFloat = parseFloat;
     constructor(
         private apiService: ApiService,
         private docsService: DocsService,