Преглед изворни кода

[spark] Support fetching incomplete results from resultset

Romain Rigaux пре 11 година
родитељ
комит
9a5c5f0

+ 2 - 1
apps/spark/src/spark/models.py

@@ -184,8 +184,9 @@ class HS2Api():
       else:
         raise e
     
-    # no escaping...
+    # No escaping...
     return {
+        'has_more': results.has_more,
         'data': list(results.rows()),
         'meta': [{
           'name': column.name,

+ 1 - 0
apps/spark/src/spark/templates/editor.mako

@@ -188,6 +188,7 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
         <span data-bind="editable: name, editableOptions: {enabled: $root.isEditing(), placement: 'right'}"></span>
         <div class="inline pull-right">
           <strong class="muted" data-bind="text: status"></strong> &nbsp;
+          <strong class="muted">Took 1s</strong> &nbsp;
           <a href="javascript:void(0)" data-bind="visible: $root.isEditing, click: function(){ remove($parent, $data);}"><i class="fa fa-times"></i></a>
         </div>
       </h2>

+ 1 - 1
apps/spark/static/js/spark.vm.js

@@ -259,7 +259,7 @@ var Snippet = function (notebook, snippet) {
 
         $(document).trigger("renderData", {data: _tempData, snippet: self, initial: _initialIndex == 0});
 
-        if (data.result.hasMore && rows > 0) {
+        if (data.result.has_more && rows > 0) {
           setTimeout(function () {
             self.fetchResultData(rows, false);
           }, 500);