big_query_log_viewer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a29b46f3220758313a6bf0cb6fe524c3fe0168
-  data.tar.gz: dedd7319c2c1e726602233671e2d135a8375ce1f
+  metadata.gz: 9f22beb4892678ca9179a228569f982a43ca7a3a
+  data.tar.gz: f4d44663772b7cf8a52919f68549ad6ba18b1761
 SHA512:
-  metadata.gz: c42a7c2835fec5461285f021facac417b1549c0847544e81bda46ef16a70def34e4eac5233c1ed563ebd2e32d6bbb0cc3b5b2cf2cfc6442e2b6d30165f647e21
-  data.tar.gz: 29566331fb708b406c24fc4a3bfbebc309f211289c530bc615d30529715b682a457fc548cec9397b0e585f6bead7395e3cfc05515628f4bb17692780f51a8f64
+  metadata.gz: 97d8a613b0b9f2549a5584cd576a71a081b46fb84717dc83ecc8909be0bea28ead351dc1900837bc0ae567c3708aa590392a9541449ace4ed96164ea50e27d7e
+  data.tar.gz: 11d826779a401d3e3e5284a6f2632818324b9c0bf747bb55ec26774d225ae460c7e6bc5da822df0bd7207ff3a0c037b76228a1585f1d3032969ecdf3a656abe6

data/app/assets/javascripts/big_query_log_viewer/components/tab.coffee

@@ -10,14 +10,24 @@ Row = BigQueryLogViewer.Row
 
 BigQueryLogViewer.Tab = React.createClass
   getInitialState: ->
+    pages = []
+    if @resultsTab()
+      rows = @props.tab.rowData
+      while rows.length >= @props.rowsPerPage
+        pages.push rows.splice(0, @props.rowsPerPage)
+      pages.push(rows) unless rows.length is 0
+    else
+      pages = [@props.tab.rowData]
     {
-      pages: [@props.tab.rowData]
+      pages: pages
       activePageIndex: 0
       pageToken: @props.tab.pageToken
       showPrevLink: true
       showNextLink: true
       currentNextPage: 0
       currentPrevPage: 0
+      storedNextRows: []
+      storedPrevRows: []
     }
 
   resultsTab: ->
@@ -41,7 +51,7 @@ BigQueryLogViewer.Tab = React.createClass
       @setState(activePageIndex: @state.activePageIndex + 1)
     else if @resultsTab()
       # Else load next page from Google.
-      @props.query.executeListQuery({pageToken: @state.pageToken, jobId: @props.tab.jobId}, (response) =>
+      @props.query.executeListQuery({pageToken: @state.pageToken, jobId: @props.tab.jobId, maxResults: 1000}, (response) =>
         rows =
           for r in response.rows
             {
@@ -52,7 +62,9 @@ BigQueryLogViewer.Tab = React.createClass
               severity: r.f[2].v
               msg: r.f[5].v
             }
-        @state.pages.push(rows)
+        while rows.length >= @props.rowsPerPage
+          @state.pages.push(rows.splice(0, @props.rowsPerPage))
+        @state.pages.push rows unless rows.length is 0
         @setState(
           pageToken: response.pageToken
           activePageIndex: @state.activePageIndex + 1
@@ -64,117 +76,145 @@ BigQueryLogViewer.Tab = React.createClass
         alert 'Error loading more rows; check console for more information'
       )
     else if @expansionTab()
-      # Load additional context.
-      startRow = @props.tab.row.rid + @props.rowsPerPage / 2 + @state.currentNextPage * @props.rowsPerPage
-      endRow = @props.tab.row.rid + @props.rowsPerPage / 2 + (@state.currentNextPage + 1) * @props.rowsPerPage
-
-      # Construct query.
-      conds = [
-        {
-          field: 'host'
-          method: 'equals'
-          type: 'string'
-          value: @props.tab.row.host
-        }
-        {
-          field: 'pid'
-          method: 'equals'
-          type: 'int'
-          value: @props.tab.row.pid
-        }
-        {
-          field: 'rid'
-          method: 'between'
-          firstValue: startRow
-          secondValue: endRow
-        }
-      ]
-      query = @props.query.buildQuery(@props.tab.source.startDate, @props.tab.source.endDate, conds, 'ts, rid desc')
-
-      @props.query.executeQuery(query, {maxResults: @props.rowsPerPage}, (response) =>
-        # Mark no more next if there were no results.
-        if parseInt(response.totalRows) == 0
-          @setState(showNextLink: false)
-          return
-
-        # Create new page for the expansion.
-        rows =
-          for r in response.rows
-            {
-              timestamp: new Date(1000 * r.f[0].v)
-              host: r.f[4].v
-              pid: r.f[3].v
-              rid: parseInt(r.f[1].v)
-              severity: r.f[2].v
-              msg: r.f[5].v
-            }
-
-        @state.pages[0] = @state.pages[0].concat(rows)
-        @setState(currentNextPage: @state.currentNextPage + 1)
-
-      , (reponse) =>
-        console.log "ERROR: #{response.message}; entire response follows"
-        console.log response
-        alert 'Error finding more context; check console for more information'
-      )
+      if @state.storedNextRows.length > 0
+        # If context already loaded, just concat the rows.
+        pages = @state.pages.slice()
+        pages[0] = pages[0].concat(@state.storedNextRows.splice(0, @props.rowsPerPage))
+        @setState(pages: pages)
+      else
+        # Load additional context.
+        startRow = @props.tab.row.rid + @props.rowsPerPage / 2 + 1 + @state.currentNextPage * 1000
+        endRow = @props.tab.row.rid + @props.rowsPerPage / 2 + 1 + (@state.currentNextPage + 1) * 1000
+
+        # Construct query.
+        conds = [
+          {
+            field: 'host'
+            method: 'equals'
+            type: 'string'
+            value: @props.tab.row.host
+          }
+          {
+            field: 'pid'
+            method: 'equals'
+            type: 'int'
+            value: @props.tab.row.pid
+          }
+          {
+            field: 'rid'
+            method: 'between'
+            firstValue: startRow
+            secondValue: endRow
+          }
+        ]
+        query = @props.query.buildQuery(@props.tab.source.startDate, @props.tab.source.endDate, conds, 'ts, rid desc')
+
+        @props.query.executeQuery(query, {maxResults: 1000}, (response) =>
+          # Mark no more next if there were no results.
+          if parseInt(response.totalRows) == 0
+            @setState(showNextLink: false)
+            return
+          if parseInt(response.totalRows) < @props.rowsPerPage
+            @setState(showNextLink: false)
+
+          # Create new page for the expansion.
+          rows =
+            for r in response.rows
+              {
+                timestamp: new Date(1000 * r.f[0].v)
+                host: r.f[4].v
+                pid: r.f[3].v
+                rid: parseInt(r.f[1].v)
+                severity: r.f[2].v
+                msg: r.f[5].v
+              }
+
+          if rows.length > @props.rowsPerPage
+            @state.pages[0] = @state.pages[0].concat(rows.splice(0, @props.rowsPerPage))
+            @state.storedNextRows = rows
+          else
+            @state.pages[0] = @state.pages[0].concat(rows)
+
+          @setState(currentNextPage: @state.currentNextPage + 1)
+
+        , (reponse) =>
+          console.log "ERROR: #{response.message}; entire response follows"
+          console.log response
+          alert 'Error finding more context; check console for more information'
+        )
 
   handlePrevPage: ->
     if @resultsTab()
       @setState(activePageIndex: @state.activePageIndex - 1)
     else if @expansionTab()
-      # Load additional context.
-      startRow = @props.tab.row.rid - @props.rowsPerPage / 2 - @state.currentPrevPage * @props.rowsPerPage
-      endRow = @props.tab.row.rid - @props.rowsPerPage / 2 - (@state.currentPrevPage + 1) * @props.rowsPerPage
-
-      # Construct query.
-      conds = [
-        {
-          field: 'host'
-          method: 'equals'
-          type: 'string'
-          value: @props.tab.row.host
-        }
-        {
-          field: 'pid'
-          method: 'equals'
-          type: 'int'
-          value: @props.tab.row.pid
-        }
-        {
-          field: 'rid'
-          method: 'between'
-          firstValue: endRow
-          secondValue: startRow
-        }
-      ]
-      query = @props.query.buildQuery(@props.tab.source.startDate, @props.tab.source.endDate, conds, 'ts, rid desc')
-
-      @props.query.executeQuery(query, {maxResults: @props.rowsPerPage}, (response) =>
-        # Mark no more prev if there were no results.
-        if parseInt(response.totalRows) == 0
-          @setState(showPrevLink: false)
-          return
-
-        # Create new page for the expansion.
-        rows =
-          for r in response.rows
-            {
-              timestamp: new Date(1000 * r.f[0].v)
-              host: r.f[4].v
-              pid: r.f[3].v
-              rid: parseInt(r.f[1].v)
-              severity: r.f[2].v
-              msg: r.f[5].v
-            }
+      if @state.storedPrevRows.length > 0
+        # If context already loaded, just concat the rows.
+        pages = @state.pages.slice()
+        pages[0] = @state.storedPrevRows.splice(-@props.rowsPerPage, @props.rowsPerPage).concat(pages[0])
+        @setState(pages: pages)
 
-        @state.pages[0] = rows.concat(@state.pages[0])
-        @setState(currentPrevPage: @state.currentPrevPage + 1)
-
-      , (reponse) =>
-        console.log "ERROR: #{response.message}; entire response follows"
-        console.log response
-        alert 'Error finding more context; check console for more information'
-      )
+      else
+        # Load additional context.
+        startRow = @props.tab.row.rid - @props.rowsPerPage / 2 - 1 - @state.currentPrevPage * 1000
+        endRow = @props.tab.row.rid - @props.rowsPerPage / 2 - 1 - (@state.currentPrevPage + 1) * 1000
+
+        # Construct query.
+        conds = [
+          {
+            field: 'host'
+            method: 'equals'
+            type: 'string'
+            value: @props.tab.row.host
+          }
+          {
+            field: 'pid'
+            method: 'equals'
+            type: 'int'
+            value: @props.tab.row.pid
+          }
+          {
+            field: 'rid'
+            method: 'between'
+            firstValue: endRow
+            secondValue: startRow
+          }
+        ]
+        query = @props.query.buildQuery(@props.tab.source.startDate, @props.tab.source.endDate, conds, 'ts, rid desc')
+
+        @props.query.executeQuery(query, {maxResults: 1000}, (response) =>
+          # Mark no more prev if there were no results.
+          if parseInt(response.totalRows) == 0
+            @setState(showPrevLink: false)
+            return
+          if parseInt(response.totalRows) < @props.rowsPerPage
+            @setState(showPrevLink: false)
+
+          # Create new page for the expansion.
+          rows =
+            for r in response.rows
+              {
+                timestamp: new Date(1000 * r.f[0].v)
+                host: r.f[4].v
+                pid: r.f[3].v
+                rid: parseInt(r.f[1].v)
+                severity: r.f[2].v
+                msg: r.f[5].v
+              }
+
+          if rows.length > @props.rowsPerPage
+            @state.pages[0] = rows.splice(-@props.rowsPerPage, @props.rowsPerPage).concat(@state.pages[0])
+            @state.storedPrevRows = rows
+          else
+            @state.pages[0] = rows.concat(@state.pages[0])
+
+          @state.pages[0] = rows.concat(@state.pages[0])
+          @setState(currentPrevPage: @state.currentPrevPage + 1)
+
+        , (reponse) =>
+          console.log "ERROR: #{response.message}; entire response follows"
+          console.log response
+          alert 'Error finding more context; check console for more information'
+        )
 
   handleShowPage: (event) ->
     @setState(activePageIndex: parseInt(event.dispatchMarker.split('pagination-link-')[1]))

data/app/assets/javascripts/big_query_log_viewer/components/tab_manager.coffee

@@ -18,7 +18,7 @@ Query = BigQueryLogViewer.Query
 
 BigQueryLogViewer.TabManager = React.createClass
   getInitialState: ->
-    @query = new BigQueryLogViewer.Query(@props.projectId, @props.tablePrefix, @props.rowsPerPage)
+    @query = new BigQueryLogViewer.Query(@props.projectId, @props.tablePrefix)
 
     {
       tabs: []
@@ -135,7 +135,7 @@ BigQueryLogViewer.TabManager = React.createClass
     ]
     query = @query.buildQuery(@activeTab().startDate, @activeTab().endDate, conds, 'ts, rid desc')
 
-    @query.executeQuery(query, {maxResults: 101}, (response) =>
+    @query.executeQuery(query, {maxResults: @props.rowsPerPage * 2 + 1}, (response) =>
       # Create new tab for the expansion.
       rows =
         for r in response.rows

data/app/assets/javascripts/big_query_log_viewer/utils/query.coffee

@@ -1,7 +1,7 @@
 window.BigQueryLogViewer ||= {}
 
 class BigQueryLogViewer.Query
-  constructor: (@projectId, @tablePrefix, @rowsPerPage) ->
+  constructor: (@projectId, @tablePrefix) ->
     #
 
   tableRange: (startDate='CURRENT_TIMESTAMP()', endDate='CURRENT_TIMESTAMP()') ->
@@ -31,7 +31,7 @@ class BigQueryLogViewer.Query
 
   executeQuery: (query, config, success, error) ->
     console.log("Executing query: #{query}")
-    config.maxResults ?= @rowsPerPage
+    config.maxResults ||= 1000
     request = gapi.client.bigquery.jobs.query
       projectId: @projectId
       timeoutMs: 30000
@@ -46,7 +46,7 @@ class BigQueryLogViewer.Query
 
   executeListQuery: (config, success, error) ->
     console.log('Executing list query')
-    config.maxResults ?= @rowsPerPage
+    config.maxResults ||= 1000
     request = gapi.client.bigquery.jobs.getQueryResults
       projectId: @projectId
       jobId: config.jobId

data/lib/big_query_log_viewer/version.rb

@@ -1,3 +1,3 @@
 module BigQueryLogViewer
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_query_log_viewer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails