Merge pull request #942 from openstreetmap/remove-unlogged

Remove unlogged

Author: lonvia

.travis.yml

@@ -55,13 +55,15 @@ matrix:
   include:
   # ---- Linux + CLANG ---------------------------
     - os: linux
+      dist: trusty
       compiler: "clang-3.8"
       env: T="clang38_pg92_dbtest" LUAJIT_OPTION="OFF"
            CXXFLAGS="-pedantic -Wextra -Werror"
            CC=clang-3.8 CXX=clang++-3.8
       addons: *clang38_pg92
 
     - os: linux
+      dist: trusty
       compiler: "clang-7"
       env: T="clang7_pg96_dbtest_luajit" LUAJIT_OPTION="ON"
            CXXFLAGS="-pedantic -Wextra -Werror"
@@ -82,13 +84,15 @@ matrix:
 
   # ---- Linux + GCC ---------------------------
     - os: linux
+      dist: trusty
       compiler: "gcc-4.8"
       env: T="gcc48_pg96_dbtest" LUAJIT_OPTION="OFF"
            CXXFLAGS="-pedantic -Wextra -Werror"
            CC=gcc-4.8 CXX=g++-4.8
       addons: *gcc48_pg96
 
     - os: linux
+      dist: trusty
       compiler: gcc-8
       env: T="gcc8_pg96_dbtest_luajit" LUAJIT_OPTION="ON"
            CXXFLAGS="-pedantic -Wextra -Werror"

docs/osm2pgsql.1

@@ -200,12 +200,6 @@ invalid polygons. With this option, invalid polygons are instead simply dropped
 from the database. Even without this option, all polygons in the database should
 be valid.
 .TP
-\fB\  \fR\-\-unlogged
-Use postgresql's unlogged tables for storing data. This requires PostgreSQL 9.1
-or above. Data written to unlogged tables is not written to PostgreSQL's write\-ahead log,
-which makes them considerably faster than ordinary tables. However, they are not
-crash\-safe: an unlogged table is automatically truncated after a crash or unclean shutdown.
-.TP
 \fB\  \fR\-\-number\-processes num
 Specifies the number of parallel processes used for certain operations. If disks are
 fast enough e.g. if you have an SSD, then this can greatly increase speed of

docs/usage.md

@@ -1,6 +1,6 @@
 # Command-line usage #
 
-Osm2pgsql has one program, the executable itself, which has **44** command line
+Osm2pgsql has one program, the executable itself, which has **43** command line
 options. A full list of options can be obtained with ``osm2pgsql -h -v``. This
 document provides an overview of options, and more importantly, why you might
 use them.
@@ -59,9 +59,6 @@ offers significant space savings and speed increases, particularly on
 mechanical drives. The file takes approximately 8 bytes * maximum node ID, or
 about 23 GiB, regardless of the size of the extract.
 
-``--unlogged`` specifies to use unlogged tables which are dropped from the
-database if the database server ever crashes, but are faster to import.
-
 ``--prefix`` specifies the prefix for tables
 
 ## Middle-layer options ##

middle-pgsql.cpp

@@ -41,7 +41,7 @@ using namespace std;
  * %p replaced by the content of the "prefix" option
  * %i replaced by the content of the "tblsslim_data" option
  * %t replaced by the content of the "tblssslim_index" option
- * %m replaced by "UNLOGGED" if the "unlogged" option is set
+ * %m replaced by "UNLOGGED" if the "droptemp" option is set
  * other occurrences of the "%" char are treated normally.
  * any occurrence of { or } will be ignored (not copied to output string);
  * anything inside {} is only copied if it contained at least one of
@@ -105,7 +105,7 @@ static void set_prefix_and_tbls(options_t const *options, std::string *string)
                 source += 2;
                 continue;
             } else if (*(source + 1) == 'm') {
-                if (options->unlogged) {
+                if (options->droptemp) {
                     strcpy(dest, "UNLOGGED");
                     dest += 8;
                     copied = true;

options.cpp

@@ -73,7 +73,6 @@ namespace
         {"cache-strategy", 1, 0, 204},
         {"number-processes", 1, 0, 205},
         {"drop", 0, 0, 206},
-        {"unlogged", 0, 0, 207},
         {"flat-nodes",1,0, 'F'},
         {"tag-transform-script",1,0,212},
         {"reproject-area",0,0,213},
@@ -157,8 +156,6 @@ namespace
           --number-processes        Specifies the number of parallel processes \n\
                         used for certain operations (default is 1).\n\
        -I|--disable-parallel-indexing   Disable indexing all tables concurrently.\n\
-          --unlogged    Use unlogged tables (lost on crash but faster). \n\
-                        Requires PostgreSQL 9.1.\n\
           --cache-strategy  Specifies the method used to cache nodes in ram.\n\
                         Available options are:\n\
                         dense: caching strategy optimised for full planet import\n\
@@ -293,7 +290,7 @@ options_t::options_t()
 #else
   alloc_chunkwise(ALLOC_SPARSE),
 #endif
-  droptemp(false), unlogged(false), hstore_match_only(false),
+  droptemp(false), hstore_match_only(false),
   flat_node_cache_enabled(false), reproject_area(false),
   flat_node_file(boost::none), tag_transform_script(boost::none),
   tag_transform_node_func(boost::none), tag_transform_way_func(boost::none),
@@ -491,9 +488,6 @@ options_t::options_t(int argc, char *argv[]): options_t()
         case 206:
             droptemp = true;
             break;
-        case 207:
-            unlogged = true;
-            break;
         case 'F':
             flat_node_cache_enabled = true;
             flat_node_file = optarg;
@@ -571,11 +565,6 @@ void options_t::check_options()
         throw std::runtime_error("--drop only makes sense with --slim.\n");
     }
 
-    if (unlogged && append) {
-        fprintf(stderr, "Warning: --unlogged only makes sense with --create; ignored.\n");
-        unlogged = false;
-    }
-
     if (hstore_mode == HSTORE_NONE && hstore_columns.size() == 0 && hstore_match_only) {
         fprintf(stderr, "Warning: --hstore-match-only only makes sense with --hstore, --hstore-all, or --hstore-column; ignored.\n");
         hstore_match_only = false;

options.hpp

@@ -69,7 +69,6 @@ struct options_t {
     int alloc_chunkwise;
     int num_procs;
     bool droptemp; ///< drop slim mode temp tables after act
-    bool unlogged; ///< use unlogged tables where possible
     bool hstore_match_only; ///< only copy rows that match an explicitly listed key
     bool flat_node_cache_enabled;
     bool reproject_area;