diff options
| author | Ralph Amissah <ralph@amissah.com> | 2018-08-06 01:14:10 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2019-04-10 15:14:15 -0400 | 
| commit | 8671dcef8815777bf3fb7d433f57a53dca162a14 (patch) | |
| tree | 298bc2a5280a8f0ae286564a44da947dc757494e | |
| parent | nested parallelisation, output task scheduler (diff) | |
0.27.1 sqlite shared db actions cannot be parallelised
- regressive fix required
| -rw-r--r-- | org/meta_abstraction.org | 9 | ||||
| -rw-r--r-- | org/output_hub.org | 4 | ||||
| -rw-r--r-- | org/output_sqlite.org | 2 | ||||
| -rw-r--r-- | org/sdp.org | 3 | ||||
| -rw-r--r-- | src/sdp/meta/metadoc_from_src.d | 9 | ||||
| -rw-r--r-- | src/sdp/output/hub.d | 4 | ||||
| -rw-r--r-- | src/sdp/output/sqlite.d | 2 | ||||
| -rw-r--r-- | views/version.txt | 2 | 
8 files changed, 6 insertions, 29 deletions
| diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 7eaba8c..87782d3 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -2275,7 +2275,6 @@ foreach (ref obj; the_document_head_section) {      || (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); @@ -2309,7 +2308,6 @@ if (the_table_of_contents_section["scroll"].length > 1) {        || (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); @@ -2375,7 +2373,6 @@ if (the_document_body_section.length > 1) {        || (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); @@ -2426,7 +2423,6 @@ if (the_endnotes_section.length > 1) {        || (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); @@ -2469,7 +2465,6 @@ if (the_glossary_section.length > 1) {        || (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); @@ -2515,7 +2510,6 @@ if (the_bibliography_section.length > 1) {        || (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); @@ -2566,7 +2560,6 @@ if (the_bookindex_section["scroll"].length > 1) {        || (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); @@ -2605,7 +2598,6 @@ if (the_bookindex_section["scroll"].length > 1) {        || (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); @@ -2654,7 +2646,6 @@ if (the_blurb_section.length > 1) {        || (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/org/output_hub.org b/org/output_hub.org index 08d47fe..9731029 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -119,9 +119,7 @@ if (sched == outTask.html_stuff) {  #+name: output_shared_sqlite_db  #+BEGIN_SRC d -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/org/output_sqlite.org b/org/output_sqlite.org index 11a853a..49cd3f6 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -282,7 +282,7 @@ template SQLiteDbDrop() {        _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); diff --git a/org/sdp.org b/org/sdp.org index 499224a..97a9af0 100644 --- a/org/sdp.org +++ b/org/sdp.org @@ -18,7 +18,6 @@  * 0. version.txt (set version)                                      :version:  ** set program version -#+NAME: version_txt  #+BEGIN_SRC d  :tangle ../views/version.txt  /+ obt - org generated file +/  struct Version { @@ -26,7 +25,7 @@ struct Version {    int minor;    int patch;  } -enum ver = Version(0, 27, 0); +enum ver = Version(0, 27, 1);  #+END_SRC  ** compilation restrictions (supported compilers) 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); diff --git a/views/version.txt b/views/version.txt index 383f564..cff6a53 100644 --- a/views/version.txt +++ b/views/version.txt @@ -4,7 +4,7 @@ struct Version {    int minor;    int patch;  } -enum ver = Version(0, 27, 0); +enum ver = Version(0, 27, 1);  version (Posix) {    version (DigitalMars) {    } else version (LDC) { | 
