Update for consolidating naming around infinite scroll

ui/src/logs/actions/index.ts

@@ -9,10 +9,10 @@ import {
   buildHistogramQueryConfig,
   buildTableQueryConfig,
   buildLogQuery,
-  buildInfiniteLogQuery,
+  buildInfiniteScrollLogQuery,
   parseHistogramQueryResponse,
-  findBackwardLower,
+  findOlderLowerTimeBounds,
-  findForwardUpper,
+  findNewerUpperTimeBounds,
 } from 'src/logs/utils'
 import {logConfigServerToUI, logConfigUIToServer} from 'src/logs/utils/config'
 import {getDeep} from 'src/utils/wrappers'
@@ -348,28 +348,28 @@ export const setTimeBounds = (timeBounds: TimeBounds): SetTimeBoundsAction => ({
   payload: {timeBounds},
 })
 
-export const executeTableForwardQueryAsync = () => async (
+export const executeTableNewerQueryAsync = () => async (
   dispatch,
   getState: GetState
 ) => {
   const state = getState()
 
-  const time = getTableSelectedTime(state)
+  const startTime = getTableSelectedTime(state)
   const queryConfig = getTableQueryConfig(state)
   const namespace = getNamespace(state)
   const proxyLink = getProxyLink(state)
   const searchTerm = getSearchTerm(state)
   const filters = getFilters(state)
 
-  if (!_.every([queryConfig, time, namespace, proxyLink])) {
+  if (!_.every([queryConfig, startTime, namespace, proxyLink])) {
     return
   }
 
   try {
     dispatch(incrementQueryCount())
 
-    const upper = await findForwardUpper(
+    const endTime = await findNewerUpperTimeBounds(
-      time,
+      startTime,
       queryConfig,
       filters,
       searchTerm,
@@ -377,9 +377,9 @@ export const executeTableForwardQueryAsync = () => async (
       namespace
     )
 
-    const query: string = await buildInfiniteLogQuery(
+    const query: string = await buildInfiniteScrollLogQuery(
-      time,
+      startTime,
-      upper,
+      endTime,
       queryConfig,
       filters,
       searchTerm
@@ -404,7 +404,7 @@ export const executeTableForwardQueryAsync = () => async (
   }
 }
 
-export const executeTableBackwardQueryAsync = () => async (
+export const executeTableOlderQueryAsync = () => async (
   dispatch,
   getState: GetState
 ) => {
@@ -424,7 +424,7 @@ export const executeTableBackwardQueryAsync = () => async (
   try {
     dispatch(incrementQueryCount())
 
-    const lower: string = await findBackwardLower(
+    const lower: string = await findOlderLowerTimeBounds(
       time,
       queryConfig,
       filters,
@@ -433,7 +433,7 @@ export const executeTableBackwardQueryAsync = () => async (
       namespace
     )
 
-    const query: string = await buildInfiniteLogQuery(
+    const query: string = await buildInfiniteScrollLogQuery(
       lower,
       time,
       queryConfig,
@@ -522,8 +522,8 @@ export const executeHistogramQueryAsync = () => async (
 
 export const executeTableQueryAsync = () => async (dispatch): Promise<void> => {
   await Promise.all([
-    dispatch(executeTableForwardQueryAsync()),
+    dispatch(executeTableNewerQueryAsync()),
-    dispatch(executeTableBackwardQueryAsync()),
+    dispatch(executeTableOlderQueryAsync()),
     dispatch(clearRowsAdded()),
   ])
 }
@@ -628,7 +628,7 @@ export const fetchOlderLogsAsync = (queryTimeEnd: string) => async (
   const params = [namespace, proxyLink, tableQueryConfig]
 
   if (_.every(params)) {
-    const lower = await findBackwardLower(
+    const queryTimeStart = await findOlderLowerTimeBounds(
       queryTimeEnd,
       newQueryConfig,
       filters,
@@ -637,8 +637,8 @@ export const fetchOlderLogsAsync = (queryTimeEnd: string) => async (
       namespace
     )
 
-    const query = await buildInfiniteLogQuery(
+    const query = await buildInfiniteScrollLogQuery(
-      lower,
+      queryTimeStart,
       queryTimeEnd,
       newQueryConfig,
       filters,
@@ -674,7 +674,7 @@ export const fetchNewerLogsAsync = (queryTimeStart: string) => async (
   const params = [namespace, proxyLink, tableQueryConfig]
 
   if (_.every(params)) {
-    const upper = await findForwardUpper(
+    const queryTimeEnd = await findNewerUpperTimeBounds(
       queryTimeStart,
       newQueryConfig,
       filters,
@@ -683,9 +683,9 @@ export const fetchNewerLogsAsync = (queryTimeStart: string) => async (
       namespace
     )
 
-    const query: string = await buildInfiniteLogQuery(
+    const query: string = await buildInfiniteScrollLogQuery(
       queryTimeStart,
-      upper,
+      queryTimeEnd,
       newQueryConfig,
       filters,
       searchTerm

ui/src/logs/utils/index.ts

@@ -117,7 +117,7 @@ export const filtersClause = (filters: Filter[]): string => {
   ).join(' AND ')
 }
 
-export function buildInfiniteWhereClause({
+export function buildInfiniteScrollWhereClause({
   lower,
   upper,
   tags,
@@ -176,17 +176,22 @@ export function buildGeneralLogQuery(
   return `${select}${condition}${dimensions}${fillClause}`
 }
 
-export async function queryCount(
+export async function getQueryCountForBounds(
-  lower,
+  lower: string,
-  upper,
+  upper: string,
-  config,
+  config: QueryConfig,
-  filters,
+  filters: Filter[],
-  searchTerm,
+  searchTerm: string,
-  proxyLink,
+  proxyLink: string,
-  namespace
+  namespace: Namespace
 ): Promise<number> {
   const {database, retentionPolicy, measurement} = config
-  const rpSegment = retentionPolicy ? `"${retentionPolicy}"` : ''
+
+  let rpSegment = ''
+  if (retentionPolicy) {
+    rpSegment = `"${retentionPolicy}"`
+  }
+
   const fullyQualifiedMeasurement = `"${database}".${rpSegment}."${measurement}"`
   const select = `SELECT count(message) FROM ${fullyQualifiedMeasurement}`
   let condition = `WHERE time >= '${lower}' AND time <='${upper}'`
@@ -204,7 +209,7 @@ export async function queryCount(
   return getDeep<number>(result, 'results.0.series.0.values.0.1', 0)
 }
 
-export async function findBackwardLower(
+export async function findOlderLowerTimeBounds(
   upper: string,
   config: QueryConfig,
   filters: Filter[],
@@ -219,11 +224,10 @@ export async function findBackwardLower(
 
   while (true) {
     if (secondsBack > SECONDS_AWAY_LIMIT) {
-      // One day
       break
     }
 
-    const count = await queryCount(
+    const count = await getQueryCountForBounds(
       currentLower.toISOString(),
       upper,
       config,
@@ -237,14 +241,14 @@ export async function findBackwardLower(
       break
     }
 
-    secondsBack *= secondsBack
+    secondsBack *= secondsBack // exponential backoff
     currentLower = parsedUpper.subtract(secondsBack, 'seconds')
   }
 
   return currentLower.toISOString()
 }
 
-export async function findForwardUpper(
+export async function findNewerUpperTimeBounds(
   lower: string,
   config: QueryConfig,
   filters: Filter[],
@@ -262,7 +266,7 @@ export async function findForwardUpper(
       break
     }
 
-    const count = await queryCount(
+    const count = await getQueryCountForBounds(
       lower,
       currentUpper.toISOString(),
       config,
@@ -276,14 +280,14 @@ export async function findForwardUpper(
       break
     }
 
-    secondsForward *= secondsForward
+    secondsForward *= secondsForward // exponential backoff
     currentUpper = parsedLower.add(secondsForward, 'seconds')
   }
 
   return currentUpper.toISOString()
 }
 
-export async function buildInfiniteLogQuery(
+export async function buildInfiniteScrollLogQuery(
   lower: string,
   upper: string,
   config: QueryConfig,
@@ -292,7 +296,7 @@ export async function buildInfiniteLogQuery(
 ) {
   const {tags, areTagsAccepted} = config
 
-  const condition = buildInfiniteWhereClause({
+  const condition = buildInfiniteScrollWhereClause({
     lower,
     upper,
     tags,