!455 Backend fixes for Web UI

Merge pull request !455 from NeerajUnnikrishnan/fix/UI
2020-12-18 00:23:48 +08:00 · 2020-12-18 00:23:48 +08:00 · a20791bc0e
parent 41b40a3fb3 ef982f3133
commit a20791bc0e
38 changed files with 216 additions and 62 deletions
--- a/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java
+++ b/presto-main/src/main/java/io/prestosql/memory/ClusterMemoryManager.java
@ -583,8 +583,8 @@ public class ClusterMemoryManager
    {
        Map<String, Optional<MemoryInfo>> memoryInfo = new HashMap<>();
        for (Entry<String, RemoteNodeMemory> entry : nodes.entrySet()) {
-            // workerId is of the form "node_identifier [node_host]"
-            String workerId = entry.getKey() + " [" + entry.getValue().getNode().getHost() + "]";
+            // workerId is of the form "node_identifier [node_host] isCoordinator"
+            String workerId = entry.getKey() + " [" + entry.getValue().getNode().getHost() + "] " + entry.getValue().getNode().isCoordinator();
            memoryInfo.put(workerId, entry.getValue().getInfo());
        }
        return memoryInfo;
--- a/presto-main/src/main/java/io/prestosql/queryeditorui/metadata/ColumnCache.java
+++ b/presto-main/src/main/java/io/prestosql/queryeditorui/metadata/ColumnCache.java
@ -106,6 +106,11 @@ public class ColumnCache
        return cache.build();
    }

+    public void refreshCache()
+    {
+        tableColumnCache.invalidateAll();
+    }
+
    public void populateCache(final String fqnTableName)
    {
        requireNonNull(fqnTableName, "fqnTableName is null");
--- a/presto-main/src/main/java/io/prestosql/queryeditorui/metadata/PreviewTableCache.java
+++ b/presto-main/src/main/java/io/prestosql/queryeditorui/metadata/PreviewTableCache.java
@ -107,6 +107,11 @@ public class PreviewTableCache
        return cache.build();
    }

+    public void refreshCache()
+    {
+        previewTableCache.invalidateAll();
+    }
+
    public List<List<Object>> getPreview(final String schema,
            final String table)
            throws ExecutionException
--- a/presto-main/src/main/java/io/prestosql/queryeditorui/resources/TablesResource.java
+++ b/presto-main/src/main/java/io/prestosql/queryeditorui/resources/TablesResource.java
@ -130,6 +130,10 @@ public class TablesResource
            @QueryParam("force") boolean force)
            throws ExecutionException
    {
+        if (force) {
+            previewTableCache.refreshCache();
+            columnCache.refreshCache();
+        }
        dataCenterConnectorManager.loadAllDCCatalogs();
        List<String> catalogs = catalogManager.getCatalogs().stream().map(c -> c.getCatalogName()).collect(Collectors.toList());
        final ImmutableList.Builder<CatalogSchema> builder = ImmutableList.builder();
--- a/presto-main/src/main/java/io/prestosql/queryeditorui/store/history/LocalJobHistoryStore.java
+++ b/presto-main/src/main/java/io/prestosql/queryeditorui/store/history/LocalJobHistoryStore.java
@ -21,6 +21,7 @@ import io.prestosql.queryeditorui.EvictingDeque;
 import io.prestosql.queryeditorui.protocol.Job;
 import io.prestosql.queryeditorui.protocol.Table;

+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingDeque;
@ -86,12 +87,12 @@ public class LocalJobHistoryStore
        final ImmutableList.Builder<Job> builder = ImmutableList.builder();
        long added = 0;

-        for (Job job : historyCache) {
+        for (Iterator<Job> job = historyCache.descendingIterator(); job.hasNext(); ) {
            if (added + 1 > maxResults) {
                break;
            }

-            builder.add(job);
+            builder.add(job.next());
            added += 1;
        }

--- a/presto-main/src/main/java/io/prestosql/server/ClusterStatsResource.java
+++ b/presto-main/src/main/java/io/prestosql/server/ClusterStatsResource.java
@ -86,7 +86,7 @@ public class ClusterStatsResource
            if (query.getState() == QueryState.QUEUED) {
                queuedQueries++;
            }
-            else if (query.getState() == QueryState.RUNNING) {
+            else if (query.getState() == QueryState.RUNNING || query.getState() == QueryState.FINISHING) {
                if (query.getQueryStats().isFullyBlocked()) {
                    blockedQueries++;
                }
--- a/presto-main/src/main/resources/webapp/dist/headerfooter.js
+++ b/presto-main/src/main/resources/webapp/dist/headerfooter.js
--- a/presto-main/src/main/resources/webapp/dist/hetuqueryeditor.js
+++ b/presto-main/src/main/resources/webapp/dist/hetuqueryeditor.js
--- a/presto-main/src/main/resources/webapp/dist/index.js
+++ b/presto-main/src/main/resources/webapp/dist/index.js
--- a/presto-main/src/main/resources/webapp/dist/nodes.js
+++ b/presto-main/src/main/resources/webapp/dist/nodes.js
--- a/presto-main/src/main/resources/webapp/dist/overview.js
+++ b/presto-main/src/main/resources/webapp/dist/overview.js
--- a/presto-main/src/main/resources/webapp/nodes.html
+++ b/presto-main/src/main/resources/webapp/nodes.html
@ -1,3 +1,17 @@
+<!--
+  ~ Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
--- a/presto-main/src/main/resources/webapp/src/HeaderFooter.jsx
+++ b/presto-main/src/main/resources/webapp/src/HeaderFooter.jsx
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import React from "react";
 import ReactDOM from "react-dom";
 import Header from "./queryeditor/components/Header";
--- a/presto-main/src/main/resources/webapp/src/NavigationMenu.jsx
+++ b/presto-main/src/main/resources/webapp/src/NavigationMenu.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/addcatalog.jsx
+++ b/presto-main/src/main/resources/webapp/src/addcatalog.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/nodes.jsx
+++ b/presto-main/src/main/resources/webapp/src/nodes.jsx
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import React from "react";
 import ReactDom from "react-dom";
 import NodesMain from "./overview/NodesMain";
--- a/presto-main/src/main/resources/webapp/src/overview/EchartPart.jsx
+++ b/presto-main/src/main/resources/webapp/src/overview/EchartPart.jsx
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import  React from "react";
 import echarts from 'echarts/lib/echarts';
 import "echarts/lib/chart/line";
--- a/presto-main/src/main/resources/webapp/src/overview/NodesMain.jsx
+++ b/presto-main/src/main/resources/webapp/src/overview/NodesMain.jsx
@ -55,6 +55,7 @@ class NodesMain extends React.Component {
                let obj = {};
                obj.id = key.slice(0, key.indexOf(" "));
                obj.ip = key.slice(key.indexOf("[") + 1, key.indexOf("]"))
+                obj.role = key.slice(key.indexOf("]") + 2) == 'true' ? 'Coordinator' : 'Worker'
                obj.count = data.memoryData[key].availableProcessors;
                let totalMemory = data.memoryData[key].totalNodeMemory.slice(0, -1);
                obj.nodeMemory = totalMemory;
@ -85,6 +86,7 @@ class NodesMain extends React.Component {
                                        <tr>
                                            <th>ID</th>
                                            <th>IP</th>
+                                            <th>Role</th>
                                            <th>CPU Count</th>
                                            <th>Usable Node Memory</th>
                                            <th>Used Memory</th>
@ -96,6 +98,7 @@ class NodesMain extends React.Component {
                                            <tr key={index}>
                                                <td>{ele.id}</td>
                                                <td>{ele.ip}</td>
+                                                <td>{ele.role}</td>
                                                <td>{ele.count}</td>
                                                <td>{formatDataSizeBytes(ele.nodeMemory)}</td>
                                                <td>{formatDataSizeBytes(ele.usedMemory)}</td>
--- a/presto-main/src/main/resources/webapp/src/overview/OverviewActions.js
+++ b/presto-main/src/main/resources/webapp/src/overview/OverviewActions.js
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import alt from "../queryeditor/alt";
 import OverviewApiUtils from "./OverviewApiUtils";
 class OverviewActions {
--- a/presto-main/src/main/resources/webapp/src/overview/OverviewApiUtils.js
+++ b/presto-main/src/main/resources/webapp/src/overview/OverviewApiUtils.js
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import xhr from "../queryeditor/utils/xhr";
 export default {
    getLineData(){
--- a/presto-main/src/main/resources/webapp/src/overview/OverviewStore.js
+++ b/presto-main/src/main/resources/webapp/src/overview/OverviewStore.js
@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import alt from '../queryeditor/alt';
 import OverviewActions from './OverviewActions';
 class OverviewStore {
--- a/presto-main/src/main/resources/webapp/src/queryeditor/actions/CatalogActions.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/actions/CatalogActions.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/actions/CnxnMonitorActions.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/actions/CnxnMonitorActions.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/actions/ConnectorActions.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/actions/ConnectorActions.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/actions/SchemaActions.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/actions/SchemaActions.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/components/AddCatalog.jsx
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/components/AddCatalog.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/components/Footer.jsx
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/components/Footer.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/components/ModalDialog.jsx
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/components/ModalDialog.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/components/SchemaTree.jsx
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/components/SchemaTree.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/components/StatusFooter.jsx
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/components/StatusFooter.jsx
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/stores/CnxnMonitorStore.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/stores/CnxnMonitorStore.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/stores/ConnectorStore.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/stores/ConnectorStore.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/stores/SchemaStore.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/stores/SchemaStore.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/stores/TableStore.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/stores/TableStore.js
@ -114,10 +114,6 @@ class TableStore {
  }

  onAddTable(table) {
-    if (this.getByName(table.name) !== undefined) {
-      return;
-    }
-
    // Unmark the whole collection
    this.unmarkActiveTables();

--- a/presto-main/src/main/resources/webapp/src/queryeditor/utils/CatalogApiUtils.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/utils/CatalogApiUtils.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/utils/ConnectorApiUtils.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/utils/ConnectorApiUtils.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/utils/xhrform.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/utils/xhrform.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
--- a/presto-main/src/main/resources/webapp/src/queryeditor/utils/xhrutil.js
+++ b/presto-main/src/main/resources/webapp/src/queryeditor/utils/xhrutil.js
@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2018-2020. Huawei Technologies Co., Ltd. All rights reserved.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at