Merge branch 'master' into 4547-introspection-reuse-variables

Author: Auke Booij

CHANGELOG.md

@@ -37,6 +37,7 @@ Read more about the session argument for computed fields in the [docs](https://h
 (Add entries here in the order of: server, console, cli, docs, others)
 
 - server: avoid an error when calling a cached introspection query (fix #4547)
+- console: avoid count queries for large tables (#4692)
 - console: add read replica support section to pro popup (#4118)
 - cli: list all avialable commands in root command help (fix #4623)
 

cli/commands/docs.go

@@ -4,14 +4,12 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 
 	"github.com/hasura/graphql-engine/cli"
-	"github.com/markbates/pkger"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
@@ -105,26 +103,12 @@ func genReSTCustom(cmd *cobra.Command, w io.Writer, titlePrefix string, linkHand
 	buf := new(bytes.Buffer)
 	name := cmd.CommandPath()
 	ref := strings.Replace(name, " ", "_", -1)
-	cliDocPath := "manifests/docs/" + ref + ".rst"
 	short := cmd.Short
 	long := cmd.Long
 	if len(long) == 0 {
 		long = short
 	}
-	file, err := pkger.Open(cliDocPath)
-	if err != nil {
-		return err
-	}
-	fileInfo, err := ioutil.ReadAll(file)
-	if err != nil {
-		return err
-	}
-	var info string
-	if err != nil || string(fileInfo) == "" {
-		info = short
-	} else {
-		info = string(fileInfo)
-	}
+	info := short
 
 	buf.WriteString(".. _" + ref + ":\n\n")
 
@@ -184,7 +168,7 @@ func genReSTCustom(cmd *cobra.Command, w io.Writer, titlePrefix string, linkHand
 	if !cmd.DisableAutoGenTag {
 		buf.WriteString("*Auto generated by spf13/cobra*\n")
 	}
-	_, err = buf.WriteTo(w)
+	_, err := buf.WriteTo(w)
 	return err
 }
 

console/src/components/Services/Data/DataState.js

@@ -22,6 +22,8 @@ const defaultViewState = {
   manualTriggers: [],
   triggeredRow: -1,
   triggeredFunction: null,
+  estimatedCount: 0,
+  isCountEstimated: 0,
 };
 
 const defaultPermissionsState = {

console/src/components/Services/Data/TableBrowseRows/FilterQuery.js

@@ -27,6 +27,7 @@ import Button from '../../../Common/Button/Button';
 import ReloadEnumValuesButton from '../Common/Components/ReloadEnumValuesButton';
 import styles from '../../../Common/FilterQuery/FilterQuery.scss';
 import { getPersistedPageSize } from './localStorageUtils';
+import { isEmpty } from '../../../Common/utils/jsUtils';
 
 const history = createHistory();
 
@@ -205,7 +206,7 @@ class FilterQuery extends Component {
   componentDidMount() {
     const { dispatch, tableSchema, curQuery } = this.props;
     const limit = getPersistedPageSize();
-    if (!this.props.urlQuery) {
+    if (isEmpty(this.props.urlQuery)) {
       dispatch(setDefaultQuery({ ...curQuery, limit }));
       return;
     }

console/src/components/Services/Data/TableBrowseRows/ViewActions.js

@@ -17,6 +17,7 @@ import {
   getRunSqlQuery,
 } from '../../../Common/utils/v1QueryUtils';
 import { generateTableDef } from '../../../Common/utils/pgUtils';
+import { COUNT_LIMIT } from '../constants';
 
 /* ****************** View actions *************/
 const V_SET_DEFAULTS = 'ViewTable/V_SET_DEFAULTS';
@@ -96,7 +97,7 @@ const vMakeRowsRequest = () => {
             dispatch({
               type: V_REQUEST_SUCCESS,
               data: data[0],
-              estimatedCount: data[1].result[1],
+              estimatedCount: parseInt(data[1].result[1][0], 10),
             }),
             dispatch({ type: V_REQUEST_PROGRESS, data: false }),
           ]);
@@ -157,9 +158,19 @@ const vMakeCountRequest = () => {
   };
 };
 
-const vMakeTableRequests = () => dispatch => {
-  dispatch(vMakeRowsRequest());
-  dispatch(vMakeCountRequest());
+const vMakeTableRequests = () => (dispatch, getState) => {
+  dispatch(vMakeRowsRequest()).then(() => {
+    const { estimatedCount } = getState().tables.view;
+    if (estimatedCount > COUNT_LIMIT) {
+      dispatch({
+        type: V_COUNT_REQUEST_SUCCESS,
+        count: estimatedCount,
+        isEstimated: true,
+      });
+    } else {
+      dispatch(vMakeCountRequest());
+    }
+  });
 };
 
 const fetchManualTriggers = tableName => {
@@ -572,7 +583,11 @@ const viewReducer = (tableName, currentSchema, schemas, viewState, action) => {
     case V_REQUEST_PROGRESS:
       return { ...viewState, isProgressing: action.data };
     case V_COUNT_REQUEST_SUCCESS:
-      return { ...viewState, count: action.count };
+      return {
+        ...viewState,
+        count: action.count,
+        isCountEstimated: action.isEstimated === true,
+      };
     case V_EXPAND_ROW:
       return {
         ...viewState,

console/src/components/Services/Data/TableBrowseRows/ViewTable.js

@@ -110,6 +110,7 @@ class ViewTable extends Component {
       triggeredFunction,
       location,
       estimatedCount,
+      isCountEstimated,
     } = this.props;
 
     // check if table exists
@@ -161,7 +162,8 @@ class ViewTable extends Component {
     // Choose the right nav bar header thing
     const header = (
       <TableHeader
-        count={count}
+        count={isCountEstimated ? estimatedCount : count}
+        isCountEstimated={isCountEstimated}
         dispatch={dispatch}
         table={tableSchema}
         tabName="browse"

console/src/components/Services/Data/TableCommon/TableHeader.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router';
 import Helmet from 'react-helmet';
 import { changeTableName } from '../TableModify/ModifyActions';
-import { capitalize } from '../../../Common/utils/jsUtils';
+import { capitalize, exists } from '../../../Common/utils/jsUtils';
 import EditableHeading from '../../../Common/EditableHeading/EditableHeading';
 import BreadCrumb from '../../../Common/Layout/BreadCrumb/BreadCrumb';
 import { tabNameMap } from '../utils';
@@ -26,6 +26,7 @@ import { getReadableNumber } from '../../../Common/utils/jsUtils';
 const TableHeader = ({
   tabName,
   count,
+  isCountEstimated,
   table,
   migrationMode,
   readOnlyMode,
@@ -38,8 +39,11 @@ const TableHeader = ({
   const isTable = checkIfTable(table);
 
   let countDisplay = '';
-  if (!(count === null || count === undefined)) {
-    countDisplay = '(' + getReadableNumber(count) + ')';
+  // if (exists(count)) {
+  //   countDisplay = `(${isCountEstimated ? '~' : '' }${getReadableNumber(count)})`;
+  // }
+  if (exists(count) && !isCountEstimated) {
+    countDisplay = `(${getReadableNumber(count)})`;
   }
   const activeTab = tabNameMap[tabName];
 

console/src/components/Services/Data/constants.js

@@ -38,6 +38,8 @@ export const Integers = [
   'bigint',
 ];
 
+export const COUNT_LIMIT = 100000;
+
 export const Reals = ['float4', 'float8', 'numeric'];
 
 export const Numerics = [...Integers, ...Reals];

docs/_theme/djangodocs/basic/layout.html

@@ -138,6 +138,13 @@ <h3>{{ _('Navigation') }}</h3>
     {%- block scripts %}
     {{- script() }}
     {%- endblock %}
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-PF5MQ2Z');</script>
+    <!-- End Google Tag Manager -->
     {%- if use_opensearch %}
     <link rel="search" type="application/opensearchdescription+xml"
           title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
@@ -174,6 +181,10 @@ <h3>{{ _('Navigation') }}</h3>
 {%- block content %}
   {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
 
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PF5MQ2Z"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
     <div class="document">
   {%- block document %}
       <div class="documentwrapper">

docs/_theme/djangodocs/layout.html

@@ -168,17 +168,6 @@
 {% block sidebar2 %}{% endblock %}
 {% block footer %}
 
-  <!-- GA -->
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-59768903-1', 'auto');
-    ga('send', 'pageview');
-  </script>
-
   <!-- intercom -->
   <script>
     window.intercomSettings = {
@@ -259,16 +248,14 @@
 
     // Track GA event
     const trackga = function ( category, action, label, value ) {
-      // If ga is available
-      if ( ga ) {
-        ga('send', {
-          hitType: 'event',
-          eventCategory: category,
-          eventAction: action,
-          eventLabel: label,
-          eventValue: value
-        });
-      }
+      window.dataLayer = window.dataLayer || [];
+      window.dataLayer.push({
+        event: 'Click Events',
+        category: category,
+        action: action,
+        label: label,
+        value: value
+      })
     };
   </script>