From 8671dcef8815777bf3fb7d433f57a53dca162a14 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 6 Aug 2018 01:14:10 -0400 Subject: 0.27.1 sqlite shared db actions cannot be parallelised - regressive fix required --- src/sdp/meta/metadoc_from_src.d | 9 --------- src/sdp/output/hub.d | 4 +--- src/sdp/output/sqlite.d | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src/sdp') diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d index 0de709e..1a568dd 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/sdp/meta/metadoc_from_src.d @@ -1714,7 +1714,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1742,7 +1741,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1802,7 +1800,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1845,7 +1842,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1880,7 +1876,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1918,7 +1913,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -1961,7 +1955,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -2000,7 +1993,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); @@ -2043,7 +2035,6 @@ template SiSUdocAbstraction() { || (opt_action.html_seg) || (opt_action.epub) || (opt_action.sqlite_discrete) - || (opt_action.sqlite_insert) || (opt_action.sqlite_update)) { obj = obj_dom_structure_set_markup_tags(obj, dom_structure_markedup_tags_status, obj.metainfo.heading_lev_markup); obj = obj_dom_set_collapsed_tags(obj, dom_structure_collapsed_tags_status, obj.metainfo.heading_lev_collapsed); diff --git a/src/sdp/output/hub.d b/src/sdp/output/hub.d index 832cda8..a95c348 100644 --- a/src/sdp/output/hub.d +++ b/src/sdp/output/hub.d @@ -61,9 +61,7 @@ template outputHub() { Scheduled!()(schedule, doc_abstraction, doc_matters); } } - if (doc_matters.opt.action.sqlite_insert - || doc_matters.opt.action.sqlite_update - ) { + if (doc_matters.opt.action.sqlite_update) { msg.v("sqlite update processing..."); SQLiteHubBuildTablesAndPopulate!()(doc_abstraction, doc_matters); msg.vv("sqlite update done"); diff --git a/src/sdp/output/sqlite.d b/src/sdp/output/sqlite.d index 0221264..82484e5 100644 --- a/src/sdp/output/sqlite.d +++ b/src/sdp/output/sqlite.d @@ -35,7 +35,7 @@ template SQLiteHubBuildTablesAndPopulate() { _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); } - if (doc_matters.opt.action.sqlite_insert || doc_matters.opt.action.sqlite_update) { // sqlite_update is .opt.action sqlite_delete & sqlite_insert (set in sdp) + if (doc_matters.opt.action.sqlite_update) { // sqlite_update is .opt.action sqlite_delete & sqlite_insert (set in sdp) _db_statement ~= SQLiteDeleteDocument!()(doc_matters); SQLiteDbRun!()(db, _db_statement, doc_matters.opt.action, "DELETE Document"); _db_statement ~= SQLiteInsertMetadata!()(doc_matters); -- cgit v1.2.3