updated version to SWC-DB v0.4.11

Author: kashirin-alex

CHANGELOG.md

@@ -8,6 +8,16 @@
 
 ### [SWC-DB master](https://github.com/kashirin-alex/swc-db/tree/master) (upcoming-release)
 
+
+
+[_Full Changelog_](https://github.com/kashirin-alex/swc-db/compare/v0.4.11...master)
+******
+
+
+
+
+### [SWC-DB v0.4.11](https://github.com/kashirin-alex/swc-db/releases/tag/v0.4.11) (2020-10-14)
+
     added Encoder support to Communications Protocol, old Proto not compatible
     added configuration properties:
       - swc.client.Mngr.comm.encoder
@@ -22,8 +32,8 @@
     added separate AppContext for Ranger and Manager in client::Clients
     changed Clients ctor from AppContext::Ptr to Context{Manager,Ranger}::Ptr
     added cfg_encoder init by role to all AppContext based on Comm::AppContext
-    added struct Buffer as sub-class of Comm::Header
-    changed buffers details storage in class Comm::Header to Buffer type
+    added struct Comm::BufferInfo file comm/HeaderBufferInfo.h/cc
+    changed buffers details storage in class Comm::Header to BufferInfo type
     added Core::Encoder::Type ConnHandler::get_encoder()
     added call to cbuf->prepare in ConnHandler::write_or_queue
     added void Event::decode_buffers()
@@ -37,8 +47,10 @@
     added case for Error::RANGE_BAD_CELLS_INPUT in client::Query::Update
     fixed Resend Cells Count in load_generator and in SWC-DB(client) shell
     added Encoder::encode(.., bool no_plain_out=false) option
+    fixed Ranger/s shutdown process sequence
+    added configuration property swc.fs.hadoop_jvm.reconnect.delay.ms
 
-[_Full Changelog_](https://github.com/kashirin-alex/swc-db/compare/v0.4.10...master)
+[_Full Changelog_](https://github.com/kashirin-alex/swc-db/compare/v0.4.10...v0.4.11)
 ******
 
 

CMakeLists.txt

@@ -14,7 +14,7 @@ endif ()
 project(SWCDB)
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "4")
-set(VERSION_MICRO "10")
+set(VERSION_MICRO "11")
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}")
 set(VERSION_PATCH ) 
 set(VERSION_MISC_SUFFIX  "")

cmake/Doxyfile-cpp.doxy

@@ -34,7 +34,7 @@ _default_ **```swc.cfg.dyn.period=600000```**
 The Manager Host/s. The value format ```{ROLES}```|```{COLUMNS}```|```{ENDPOINTS}```|```PORT```  delimitted with ```|``` and aligned groupings of Role & Columns is require. The order is part of used configuration defnition to assign host-priority, 1st has initial preference for Active-State.
 > **_The Full Format Description_**: \
 ```{ROLES}``` - In curly-brackets comma-seperated-value, roles options: ```rangers```(manages Rangers), ```schemas``` {manages Schemas}. example ```{rangers,schemas}``` \
-```[COLUMNS]``` - In square-brackets, an interval(by Hyphen ```-```) of column-ids, NoValue/Zero on either side is from/to Any. example ```[10-]``` = from 10 to Any. \
+```[COLUMNS]``` - In square-brackets, an interval(by Hyphen ```-```) of column-ids, From and NoValue/Zero is to Any. example ```[10-]``` = from 10 to Any. \
 ```{ENDPOINTS}``` - A ```FQDN``` hostname or a comma-seperated-value of address ```(IPv4 & IPv6)```. example ```192.168.0.1,::2``` \
 ```PORT``` - optional, If set use this Port with the listed endpoints. \
 Multiple ```swc.mngr.host``` require aligment of Role/s and the Column-Intervals.
@@ -57,9 +57,9 @@ Multiple ```swc.mngr.host``` require aligment of Role/s and the Column-Intervals
   ```swc.mngr.host={schemas}|host-name-2``` \
   ```swc.mngr.host={rangers}|host-name-3``` \
   ```swc.mngr.host={rangers}|host-name-4``` \
-  ```swc.mngr.host=host-name-5``` \
-  ```swc.mngr.host=host-name-6``` \
-  ```swc.mngr.host=host-name-7``` \
+  ```swc.mngr.host=[1-]|host-name-5``` \ 
+  ```swc.mngr.host=[1-]|host-name-6``` \
+  ```swc.mngr.host=[1-]|host-name-7``` \
 > _Option 3_: to the example - 1-group, 4-hosts managers of all Roles and all columns, one-host is a configuration for a single-manager \
   ```swc.mngr.host=host-name-1``` \
   ```swc.mngr.host=host-name-2``` \

docs/configure/properties/libswcdb.md

@@ -13,7 +13,7 @@ These configuration properties are for sbin/swcdb_cluster a python script based
 The Full-Path or Uri to the SWC-DB `tar` archive package. An archive package from [available SWC-DB releases]({{ site.baseurl }}/install/getting_swcdb/#available-for-download) is suitable for the type of archive required.
 > The source-host SWC-DB installation files are copied if the property is not set.
 
-  _default_ **```swc.install.archive=https://github.com/kashirin-alex/swc-db/releases/download/v0.4.10/swcdb-0.4.10.debug.amd64.tar.xz```**
+  _default_ **```swc.install.archive=https://github.com/kashirin-alex/swc-db/releases/download/v0.4.11/swcdb-0.4.11.debug.amd64.tar.xz```**
 
 
 * ### swc.cluster.rgr.host

docs/configure/properties/swcdb_cluster.md

@@ -9,6 +9,10 @@ sort: 2
 
 |   Version   |   Version-Specific    |  Package Types    |     Build Types   | Compiler    | Architectures / Platforms           | Link           |
 |     ---     |          ---          |       ---         |        ---        |     ---     | ---                                 |  ---           |
+| 0.4.11      | .install-pack         | tar.xz            |                   |             |                                     | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.11/swcdb-0.4.11.install-pack.tar.xz) |
+| 0.4.11      | .debug.amd64          | tar.xz            | debug             | GCC-9.3     | GLIBC-2.27 amd64                    | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.11/swcdb-0.4.11.debug.amd64.tar.xz) |
+| 0.4.11      | .amd64                | tar.xz            | optimized         | GCC-9.3     | GLIBC-2.27 amd64                    | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.11/swcdb-0.4.11.amd64.tar.xz) |
+|             |                       |                   |                   |             |                                     |                 |
 | 0.4.10      | .install-pack         | tar.xz            |                   |             |                                     | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.10/swcdb-0.4.10.install-pack.tar.xz) |
 | 0.4.10      | .debug.amd64          | tar.xz            | debug             | GCC-9.3     | GLIBC-2.27 amd64                    | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.10/swcdb-0.4.10.debug.amd64.tar.xz) |
 | 0.4.10      | .amd64                | tar.xz            | optimized         | GCC-9.3     | GLIBC-2.27 amd64                    | [download](https://github.com/kashirin-alex/swc-db/releases/download/v0.4.10/swcdb-0.4.10.amd64.tar.xz) |

docs/install/getting_swcdb/README.md

@@ -239,18 +239,8 @@ class BufferDyn : public BufferT {
 };
 
 
-} // namespace Core
-
-
-
-/*!
- *  \addtogroup Core
- *  @{
- */
-
-
-typedef Core::Buffer <uint8_t>          StaticBuffer;
-typedef Core::BufferDyn <StaticBuffer>  DynamicBuffer;
+typedef Buffer <uint8_t>          StaticBuffer;
+typedef BufferDyn <StaticBuffer>  DynamicBuffer;
 
 
 // StaticBuffer specializations to SizeOf
@@ -296,7 +286,18 @@ void StaticBuffer::set(DynamicBuffer& other) SWC_NOEXCEPT {
   }
 }
 
+} // namespace Core
+
+
+
+
+/*!
+ *  \addtogroup Core
+ *  @{
+ */
 
+using StaticBuffer = Core::StaticBuffer;
+using DynamicBuffer = Core::DynamicBuffer;
 
 /*! @} End of Core Group*/
 

src/cc/include/swcdb/core/Buffer.h

@@ -7,10 +7,10 @@
 #ifndef swcdb_core_comm_Event_h
 #define swcdb_core_comm_Event_h
 
-#include "swcdb/core/comm/Header.h"
 
 #include "swcdb/core/Time.h"
 #include "swcdb/core/Buffer.h"
+#include "swcdb/core/comm/Header.h"
 
 #include <memory>
 

src/cc/include/swcdb/core/comm/Event.h

@@ -6,53 +6,25 @@
 #ifndef swcdb_core_comm_Header_h
 #define swcdb_core_comm_Header_h
 
-#include "swcdb/core/Compat.h"
-#include "swcdb/core/Encoder.h"
+
+#include "swcdb/core/comm/HeaderBufferInfo.h"
+
 
 namespace SWC { namespace Comm {
 
-class Header final {
 
-  public:
+struct Header final {
 
   static const uint8_t PROTOCOL_VERSION = 1;
   static const uint8_t PREFIX_LENGTH    = 2;
   static const uint8_t FIXED_LENGTH     = PREFIX_LENGTH + 16;
 
-
-  struct Buffer final {
-
-    Buffer();
-    
-    void reset();
-
-    size_t encoded_length() const;
-
-    void encode(uint8_t** bufp) const;
-
-    void decode(const uint8_t** bufp, size_t* remainp);
-
-    void encode(Core::Encoder::Type encoder, StaticBuffer& data);
-    
-    void decode(int& err, StaticBuffer& data) const;
-
-    void print(std::ostream& out) const;
-  
-    uint32_t            size;        //!< Buffer size
-    Core::Encoder::Type encoder;     //!< Buffer Encoder
-    uint32_t            size_plain;  //!< Buffer set if Encoder not PLAIN
-    uint32_t            chksum;      //!< Buffer checksum
-  
-  } __attribute__((packed));
-
-
   enum Flags : uint8_t {
     FLAGS_BIT_REQUEST          = 0x1, //!< Request message
     FLAGS_BIT_IGNORE_RESPONSE  = 0x2, //!< Response should be ignored
     FLAGS_BIT_URGENT           = 0x4, //!< Request is urgent
   };
 
-
   enum FlagMask : uint8_t {
     FLAGS_MASK_REQUEST          = 0xE, //!< Request message bit
     FLAGS_MASK_IGNORE_RESPONSE  = 0xD, //!< Response should be ignored bit
@@ -78,19 +50,19 @@ class Header final {
 
   void print(std::ostream& out) const;
 
-  uint8_t  version;         //!< Protocol version
-  uint8_t  header_len;      //!< Length of header
+  uint8_t     version;      //!< Protocol version
+  uint8_t     header_len;   //!< Length of header
 
-  uint8_t  flags;           //!< Flags
-  uint32_t id;              //!< Request ID
-  uint32_t timeout_ms;      //!< Request timeout
-  uint16_t command;         //!< Request command number
-  uint8_t  buffers;         //!< number of buffers from 0 to 2 (data+data_ext) 
+  uint8_t     flags;        //!< Flags
+  uint32_t    id;           //!< Request ID
+  uint32_t    timeout_ms;   //!< Request timeout
+  uint16_t    command;      //!< Request command number
+  uint8_t     buffers;      //!< number of buffers from 0 to 2 (data+data_ext)
 
-  Buffer  data;             //!< Data Buffer
-  Buffer  data_ext;         //!< Data Extended Buffer
+  BufferInfo  data;         //!< Data Buffer
+  BufferInfo  data_ext;     //!< Data Extended Buffer
 
-  uint32_t checksum;        //!< Header checksum (excl. it self)
+  uint32_t    checksum;     //!< Header checksum (excl. it self)
 
 } __attribute__((packed));
 

src/cc/include/swcdb/core/comm/Header.h

@@ -0,0 +1,51 @@
+/* 
+ * SWC-DB© Copyright since 2019 Alex Kashirin <[email protected]>
+ * License details at <https://github.com/kashirin-alex/swc-db/#license>
+ */
+
+#ifndef swcdb_core_comm_HeaderBufferInfo_h
+#define swcdb_core_comm_HeaderBufferInfo_h
+
+
+#include "swcdb/core/Compat.h"
+#include "swcdb/core/Encoder.h"
+
+
+namespace SWC { namespace Comm {
+
+
+struct BufferInfo final {
+
+  BufferInfo();
+    
+  void reset();
+
+  size_t encoded_length() const;
+
+  void encode(uint8_t** bufp) const;
+
+  void decode(const uint8_t** bufp, size_t* remainp);
+
+  void encode(Core::Encoder::Type encoder, StaticBuffer& data);
+    
+  void decode(int& err, StaticBuffer& data) const;
+
+  void print(std::ostream& out) const;
+  
+  uint32_t            size;        //!< Buffer size
+  Core::Encoder::Type encoder;     //!< Buffer Encoder
+  uint32_t            size_plain;  //!< Buffer set if Encoder not PLAIN
+  uint32_t            chksum;      //!< Buffer checksum
+  
+} __attribute__((packed));
+
+
+}}
+
+
+
+#ifdef SWC_IMPL_SOURCE
+#include "swcdb/core/comm/HeaderBufferInfo.cc"
+#endif 
+
+#endif // swcdb_core_comm_HeaderBufferInfo_h

src/cc/include/swcdb/core/comm/HeaderBufferInfo.h

@@ -29,6 +29,8 @@ struct Network {
   Network(const Network& net);
 };
 
+typedef std::vector<Network> Networks;
+
 } //namespace Comm
 
 
@@ -69,14 +71,14 @@ bool is_ipv6_address(const std::string& str);
 EndPoints get_endpoints(uint16_t defaul_port, 
                         const Config::Strings& addrs, 
                         const std::string& host, 
-                        const std::vector<Network>& nets,
+                        const Networks& nets,
                         bool srv=false);
 
-void sort(const std::vector<Network>& nets, const EndPoints& endpoints, 
+void sort(const Networks& nets, const EndPoints& endpoints, 
           EndPoints& sorted);
 
 void get_networks(const Config::Strings& networks, 
-                  std::vector<Network>& nets, asio::error_code& ec);
+                  Networks& nets, asio::error_code& ec);
 
 void get_networks(const Config::Strings& networks, 
                   std::vector<asio::ip::network_v4>& nets_v4, 
@@ -92,7 +94,7 @@ bool is_network(const EndPoint& endpoint, const asio::ip::network_v4& net);
 bool is_network(const EndPoint& endpoint, const asio::ip::network_v6& net);
 
 
-}} // namespace :Comm::Resolver
+}} // namespace Comm::Resolver
 
 
 } // namespace SWC

src/cc/include/swcdb/core/comm/Resolver.h

@@ -9,6 +9,7 @@
 
 
 #include "swcdb/ranger/db/Range.h"
+#include "swcdb/common/Stats/CompletionCounter.h"
 
 #include <unordered_map>
 

src/cc/include/swcdb/ranger/db/Column.h

@@ -58,6 +58,7 @@ set(swcdb_core_comm_sources
   comm/ConfigSSL.cc
   comm/Resolver.cc
   comm/Event.cc
+  comm/HeaderBufferInfo.cc
   comm/Header.cc
   comm/Buffers.cc
   comm/ConnHandler.cc