[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user vanzin commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r228309580
--- Diff:
server/src/main/resources/org/apache/livy/server/ui/static/js/all-sessions.js
---
@@ -26,7 +26,7 @@ function loadSessionsTable(sessions) {
tdWrap(session.kind) +
tdWrap(session.state) +
tdWrap(logLinks(session, "session")) +
- ""
+""
--- End diff --
So, neither of you guys actually understood what I was complaining about.
The old code wasn't aligned either way. It was indented 1 space off, as you can
see here.
There's other code that's indented the way I prefer (with the close tag
aligned with the open tag, see `session.js`).
But at this point it doesn't matter. This is fine, as long as it's not
indented wrongly like before.
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user ajbozarth commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r227551339
--- Diff:
thriftserver/server/src/main/resources/org/apache/livy/server/ui/static/js/thrift-sessions.js
---
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+function loadThriftSessionsTable(sessions) {
+ $.each(sessions, function(index, session) {
+$("#thrift-sessions-table .sessions-table-body").append(
+ "" +
+tdWrap(session.sessionId) +
+tdWrap(uiLink("session/" + session.livySessionId,
session.livySessionId)) +
+tdWrap(session.owner) +
+tdWrap(session.createdAt) +
+ ""
--- End diff --
Ah, I think I may have emulated a DOM styling in some of my code where
despite being concatenated strings I indented them like I would if they were a
DOM instance (like you did here). For consistency we should probably indent
them properly like concatenated strings (not DOM instances).
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user vanzin commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r227125314
--- Diff:
thriftserver/server/src/main/scala/org/apache/livy/thriftserver/ui/ThriftJsonServlet.scala
---
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.livy.thriftserver.ui
+
+import java.text.SimpleDateFormat
+
+import org.apache.livy.server.JsonServlet
+import org.apache.livy.thriftserver.LivyThriftServer
+
+
+class ThriftJsonServlet(val basePath: String) extends JsonServlet {
+
+ private val df = new SimpleDateFormat("-MM-dd HH:mm:ss")
--- End diff --
The timezone of the logs is not really controlled by Livy, but by the
session's configuration. So it may not even be the same tz of the Livy server.
That being said I'm ok with putting the tz in the formatted date here. But
in general I prefer to return non-pre-processed data in REST APIs (e.g. the "ms
since epoch" value instead of a formatted date), and let the consumer (e.g. the
UI) deal with how to properly render the data given the context.
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user mgaido91 commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r225820233
--- Diff:
thriftserver/server/src/main/resources/org/apache/livy/server/ui/static/js/thrift-sessions.js
---
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+function loadThriftSessionsTable(sessions) {
+ $.each(sessions, function(index, session) {
+$("#thrift-sessions-table .sessions-table-body").append(
+ "" +
+tdWrap(session.sessionId) +
+tdWrap(uiLink("session/" + session.livySessionId,
session.livySessionId)) +
+tdWrap(session.owner) +
+tdWrap(session.createdAt) +
+ ""
--- End diff --
sorry, I am not sure what you mean exactly here. I followed the same
indentation which was used in the other js files (eg. all-sessions.js).
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user vanzin commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r225716038
--- Diff:
thriftserver/server/src/main/resources/org/apache/livy/server/ui/static/js/thrift-sessions.js
---
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+function loadThriftSessionsTable(sessions) {
+ $.each(sessions, function(index, session) {
+$("#thrift-sessions-table .sessions-table-body").append(
+ "" +
+tdWrap(session.sessionId) +
+tdWrap(uiLink("session/" + session.livySessionId,
session.livySessionId)) +
+tdWrap(session.owner) +
+tdWrap(session.createdAt) +
+ ""
--- End diff --
nit: indentation seems off
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user vanzin commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r225715892
--- Diff:
thriftserver/server/src/main/scala/org/apache/livy/thriftserver/ui/ThriftJsonServlet.scala
---
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.livy.thriftserver.ui
+
+import java.text.SimpleDateFormat
+
+import org.apache.livy.server.JsonServlet
+import org.apache.livy.thriftserver.LivyThriftServer
+
+
+class ThriftJsonServlet(val basePath: String) extends JsonServlet {
+
+ private val df = new SimpleDateFormat("-MM-dd HH:mm:ss")
--- End diff --
This isn't showing the time zone, so it can be confusing. I think it would
be better to do this rendering client-side, and return something that it
UTC-based in the JSON payload.
Similar in spirit to SPARK-16986.
---
[GitHub] incubator-livy pull request #114: [LIVY-495] Add thriftserver UI
Github user vanzin commented on a diff in the pull request:
https://github.com/apache/incubator-livy/pull/114#discussion_r225715972
--- Diff:
thriftserver/server/src/main/scala/org/apache/livy/thriftserver/ui/ThriftJsonServlet.scala
---
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.livy.thriftserver.ui
+
+import java.text.SimpleDateFormat
+
+import org.apache.livy.server.JsonServlet
+import org.apache.livy.thriftserver.LivyThriftServer
+
+
+class ThriftJsonServlet(val basePath: String) extends JsonServlet {
+
+ private val df = new SimpleDateFormat("-MM-dd HH:mm:ss")
+
+ case class SessionInfo(sessionId: String,
+livySessionId: String,
--- End diff --
nit: use the usual double-indentation for multi line args
---
