renamings

hendrikmuhs · Feb 26, 2025 · 18c2fa9 · 18c2fa9
1 parent 47f45ba
commit 18c2fa9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/keyvi/include/keyvi/compression/compression_selector.h b/keyvi/include/keyvi/compression/compression_selector.h
@@ -62,8 +62,8 @@ inline CompressionStrategy* compression_strategy(const std::string& name = "") {
 typedef std::string (*decompress_func_t)(const std::string&);
 typedef void (CompressionStrategy::*compress_mem_fn_t)(buffer_t*, const char*, size_t);
 
-inline decompress_func_t decompressor_by_code(const char code) {
-  switch (code) {
+inline decompress_func_t decompressor_by_code(const CompressionAlgorithm algorithm) {
+  switch (algorithm) {
     case NO_COMPRESSION:
       TRACE("unpack uncompressed string");
       return RawCompressionStrategy::DoDecompress;
@@ -75,16 +75,16 @@ inline decompress_func_t decompressor_by_code(const char code) {
       return SnappyCompressionStrategy::DoDecompress;
     default:
       throw std::invalid_argument("Invalid compression code " +
-                                  boost::lexical_cast<std::string>(static_cast<int>(code)));
+                                  boost::lexical_cast<std::string>(static_cast<int>(algorithm)));
   }
 }
 
 inline decompress_func_t decompressor_from_string(const std::string& s) {
-  return decompressor_by_code(s[0]);
+  return decompressor_by_code(static_cast<CompressionAlgorithm>(s[0]));
 }
 
 /** Returns an instance of a compression strategy by enum. */
-inline compression_strategy_t compression_strategy_by_enum(const CompressionAlgorithm algorithm) {
+inline compression_strategy_t compression_strategy_by_code(const CompressionAlgorithm algorithm) {
   switch (algorithm) {
     case NO_COMPRESSION:
       return std::make_unique<RawCompressionStrategy>();

diff --git a/keyvi/include/keyvi/dictionary/fsa/internal/ivalue_store.h b/keyvi/include/keyvi/dictionary/fsa/internal/ivalue_store.h
@@ -138,9 +138,9 @@ class IValueStoreReader {
 
     // compress the value
     const compression::compression_strategy_t compressor =
-        compression::compression_strategy_by_enum(compression_algorithm);
+        compression::compression_strategy_by_code(compression_algorithm);
 
-    return compressor->Compress(msgpacked_value);
+    return compressor->CompressWithoutHeader(msgpacked_value);
   }
 
   /**

diff --git a/keyvi/include/keyvi/dictionary/fsa/internal/json_value_store.h b/keyvi/include/keyvi/dictionary/fsa/internal/json_value_store.h
@@ -364,15 +364,16 @@ class JsonValueStoreReader final : public IValueStoreReader {
     }
 
     // decompress
-    const compression::decompress_func_t decompressor = compression::decompressor_by_code(value_ptr[0]);
+    const compression::decompress_func_t decompressor =
+        compression::decompressor_by_code(static_cast<compression::CompressionAlgorithm>(value_ptr[0]));
     std::string msgpacked_value = decompressor(std::string(value_ptr, value_size));
 
     if (compression_algorithm == compression::CompressionAlgorithm::NO_COMPRESSION) {
       return msgpacked_value;
     }
     // compress
     const compression::compression_strategy_t compressor =
-        compression::compression_strategy_by_enum(compression_algorithm);
+        compression::compression_strategy_by_code(compression_algorithm);
 
     return compressor->CompressWithoutHeader(msgpacked_value);
   }