From cf6733c70f21dc9ce442522d4dfc1e55fd6b8727 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 14 Feb 2022 09:17:58 -0800 Subject: [PATCH 1/2] When fetching the library item list dont add content/originalHtml from DB --- packages/api/src/datalayer/links/index.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/api/src/datalayer/links/index.ts b/packages/api/src/datalayer/links/index.ts index 4d52e47a2..a19e50dcb 100644 --- a/packages/api/src/datalayer/links/index.ts +++ b/packages/api/src/datalayer/links/index.ts @@ -51,15 +51,16 @@ const LINK_COLS = [ 'omnivore.pages.title', 'omnivore.pages.description', 'omnivore.pages.hash', - 'omnivore.pages.originalHtml', - 'omnivore.pages.content', 'omnivore.pages.author', 'omnivore.pages.image', 'omnivore.pages.pageType', 'omnivore.pages.publishedAt', ] -const linkCols = (tx: Knex) => { +// When fetching the library list we don't need to +// pull all the content out of the database into +// memory just to discard it later +const linkColsWithoutContent = (tx: Knex) => { return [ tx.raw(` CASE @@ -79,6 +80,15 @@ const linkCols = (tx: Knex) => { ] } +const linkCols = (tx: Knex) => { + return [ + 'omnivore.pages.content', + 'omnivore.pages.originalHtml', + ...linkColsWithoutContent(tx), + ] +} + + const readFilterQuery = (filter: ReadFilter) => { switch (filter) { case ReadFilter.ALL: @@ -405,7 +415,7 @@ class UserArticleModel extends DataModel< const whereOperator = sort?.order === SortOrder.Ascending ? '>=' : '<=' const queryPromise = tx(this.tableName) - .select(linkCols(tx)) + .select(linkColsWithoutContent(tx)) .innerJoin(Table.PAGES, 'pages.id', 'links.article_id') .where({ 'links.user_id': userId }) .where(tx.raw(readFilterQuery(readFilter))) From a276af5264ea88a8ef3713a297c3f72cc6343f69 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 21 Feb 2022 08:43:57 -0800 Subject: [PATCH 2/2] Remove extra white space --- packages/api/src/datalayer/links/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/api/src/datalayer/links/index.ts b/packages/api/src/datalayer/links/index.ts index a19e50dcb..10a8d991e 100644 --- a/packages/api/src/datalayer/links/index.ts +++ b/packages/api/src/datalayer/links/index.ts @@ -88,7 +88,6 @@ const linkCols = (tx: Knex) => { ] } - const readFilterQuery = (filter: ReadFilter) => { switch (filter) { case ReadFilter.ALL: