1.21.2 release

fastogt · Nov 3, 2018 · 3144c90 · 3144c90
1 parent 2fb7972
commit 3144c90
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 30 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
-1.21.2 /
+1.21.2 / November 2, 2018
 [Alexandr Topilski]
 - Hexed values if symbols can't be displayed
+- Zlib/GZip views
 
 1.21.1 / November 2, 2018
 [Alexandr Topilski]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.6.3) # OPENSSL_USE_STATIC_LIBS
 
 SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default
 SET(BRANDING_PROJECT_VERSION "1.21.2.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default
-SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "alfa" CACHE STRING "Build
+SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "release" CACHE STRING "Build
 version type for ${BRANDING_PROJECT_NAME}") #default
   #possible variables: alfa, beta, rc, release
 

diff --git a/FASTOREDIS_CHANELOG b/FASTOREDIS_CHANELOG
@@ -1,6 +1,7 @@
-1.20.2 /
+1.20.2 / November 3, 2018
 [Alexandr Topilski]
 - Hexed values if symbols can't be displayed
+- Zlib/GZip views
 
 1.20.1 / November 2, 2018
 [Alexandr Topilski]

diff --git a/src/gui/text_converter.cpp b/src/gui/text_converter.cpp
@@ -196,8 +196,8 @@ bool string_to_snappy(const convert_in_t& data, convert_out_t* out) {
   return true;
 }
 
-bool string_from_sized_zlib(const convert_in_t& value, convert_out_t* out) {
-  common::CompressZlibEDcoder enc;
+bool string_from_zlib(const convert_in_t& value, convert_out_t* out) {
+  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::ZLIB_DEFLATE);
   common::StringPiece piece_data(value.data(), value.size());
 
   std::string sout;
@@ -210,8 +210,8 @@ bool string_from_sized_zlib(const convert_in_t& value, convert_out_t* out) {
   return true;
 }
 
-bool string_to_sized_zlib(const convert_in_t& data, convert_out_t* out) {
-  common::CompressZlibEDcoder enc;
+bool string_to_zlib(const convert_in_t& data, convert_out_t* out) {
+  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::ZLIB_DEFLATE);
   common::StringPiece piece_data(data.data(), data.size());
 
   std::string sout;
@@ -224,8 +224,8 @@ bool string_to_sized_zlib(const convert_in_t& data, convert_out_t* out) {
   return true;
 }
 
-bool string_from_zlib(const convert_in_t& value, convert_out_t* out) {
-  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::ZLIB_DEFLATE);
+bool string_from_gzip(const convert_in_t& value, convert_out_t* out) {
+  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::GZIP_DEFLATE);
   common::StringPiece piece_data(value.data(), value.size());
 
   std::string sout;
@@ -238,8 +238,8 @@ bool string_from_zlib(const convert_in_t& value, convert_out_t* out) {
   return true;
 }
 
-bool string_to_zlib(const convert_in_t& data, convert_out_t* out) {
-  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::ZLIB_DEFLATE);
+bool string_to_gzip(const convert_in_t& data, convert_out_t* out) {
+  common::CompressZlibEDcoder enc(false, common::CompressZlibEDcoder::GZIP_DEFLATE);
   common::StringPiece piece_data(data.data(), data.size());
 
   std::string sout;
@@ -252,7 +252,6 @@ bool string_to_zlib(const convert_in_t& data, convert_out_t* out) {
   return true;
 }
 
-
 bool string_from_lz4(const convert_in_t& value, convert_out_t* out) {
   common::CompressLZ4EDcoder enc;
   common::StringPiece piece_data(value.data(), value.size());
@@ -282,7 +281,7 @@ bool string_to_lz4(const convert_in_t& data, convert_out_t* out) {
 }
 
 bool string_from_bzip2(const convert_in_t& value, convert_out_t* out) {
-  common::CompressBZip2EDcoder enc;
+  common::CompressBZip2EDcoder enc(false);
   common::StringPiece piece_data(value.data(), value.size());
 
   std::string sout;
@@ -296,7 +295,7 @@ bool string_from_bzip2(const convert_in_t& value, convert_out_t* out) {
 }
 
 bool string_to_bzip2(const convert_in_t& data, convert_out_t* out) {
-  common::CompressBZip2EDcoder enc;
+  common::CompressBZip2EDcoder enc(false);
   common::StringPiece piece_data(data.data(), data.size());
 
   std::string sout;

diff --git a/src/gui/text_converter.h b/src/gui/text_converter.h
@@ -38,15 +38,18 @@ bool string_to_unicode(const convert_in_t& data, convert_out_t* out);
 bool string_from_snappy(const convert_in_t& value, convert_out_t* out);
 bool string_to_snappy(const convert_in_t& data, convert_out_t* out);
 
-bool string_from_sized_zlib(const convert_in_t& value, convert_out_t* out);
-bool string_to_sized_zlib(const convert_in_t& data, convert_out_t* out);
-
+// zlib
 bool string_from_zlib(const convert_in_t& value, convert_out_t* out);
 bool string_to_zlib(const convert_in_t& data, convert_out_t* out);
 
+// gzip
+bool string_from_gzip(const convert_in_t& value, convert_out_t* out);
+bool string_to_gzip(const convert_in_t& data, convert_out_t* out);
+
 bool string_from_lz4(const convert_in_t& value, convert_out_t* out);
 bool string_to_lz4(const convert_in_t& data, convert_out_t* out);
 
+// bzip2
 bool string_from_bzip2(const convert_in_t& value, convert_out_t* out);
 bool string_to_bzip2(const convert_in_t& data, convert_out_t* out);
 

diff --git a/src/gui/widgets/fasto_viewer.cpp b/src/gui/widgets/fasto_viewer.cpp
@@ -67,8 +67,8 @@ bool convertFromViewImplRoutine(OutputView view_method, const convert_in_t& val,
     return string_to_msgpack(val, out);
   } else if (view_method == ZLIB_VIEW) {
     return string_to_zlib(val, out);
-  } else if (view_method == SIZED_ZLIB_VIEW) {
-    return string_to_sized_zlib(val, out);
+  } else if (view_method == GZIP_VIEW) {
+    return string_to_gzip(val, out);
   } else if (view_method == LZ4_VIEW) {
     return string_to_lz4(val, out);
   } else if (view_method == BZIP2_VIEW) {
@@ -110,8 +110,8 @@ bool convertToViewImpl(OutputView view_method, const convert_in_t& text, convert
     return string_from_msgpack(text, out);
   } else if (view_method == ZLIB_VIEW) {
     return string_from_zlib(text, out);
-  } else if (view_method == SIZED_ZLIB_VIEW) {
-    return string_from_sized_zlib(text, out);
+  } else if (view_method == GZIP_VIEW) {
+    return string_from_gzip(text, out);
   } else if (view_method == LZ4_VIEW) {
     return string_from_lz4(text, out);
   } else if (view_method == BZIP2_VIEW) {
@@ -130,8 +130,8 @@ bool convertToViewImpl(OutputView view_method, const convert_in_t& text, convert
 }  // namespace
 
 const std::vector<const char*> g_output_views_text = {
-    "Raw",  "Json",       "To Hex", "From Hex", "To Unicode", "From Unicode", "MsgPack (Beta)",
-    "Zlib", "Sized Zlib", "LZ4",    "BZip2",    "Snappy",     "Xml"};
+    "Raw",  "Json", "To Hex", "From Hex", "To Unicode", "From Unicode", "MsgPack (Beta)",
+    "Zlib", "GZip", "LZ4",    "BZip2",    "Snappy",     "Xml"};
 
 FastoViewer::FastoViewer(QWidget* parent)
     : QWidget(parent),

diff --git a/src/gui/widgets/fasto_viewer.h b/src/gui/widgets/fasto_viewer.h
@@ -38,13 +38,13 @@ enum OutputView : uint8_t {
   TO_UNICODE_VIEW,
   FROM_UNICODE_VIEW,
 
-  MSGPACK_VIEW,     // from
-  ZLIB_VIEW,        // from
-  SIZED_ZLIB_VIEW,  // from
-  LZ4_VIEW,         // from
-  BZIP2_VIEW,       // from
-  SNAPPY_VIEW,      // from
-  XML_VIEW          // raw
+  MSGPACK_VIEW,  // from
+  ZLIB_VIEW,     // from
+  GZIP_VIEW,     // from
+  LZ4_VIEW,      // from
+  BZIP2_VIEW,    // from
+  SNAPPY_VIEW,   // from
+  XML_VIEW       // raw
 };
 
 extern const std::vector<const char*> g_output_views_text;