Merge pull request #345 from dynatrace-oss/komihash-5.18

Komihash 5.18

Author: oertl

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "reference-implementations/komihash_4_3/komihash"]
 	path = reference-implementations/komihash_4_3/komihash
 	url = https://github.com/avaneev/komihash.git
-[submodule "reference-implementations/komihash_4_5/komihash"]
-	path = reference-implementations/komihash_4_5/komihash
-	url = https://github.com/avaneev/komihash.git
 [submodule "reference-implementations/komihash_4_7/komihash"]
 	path = reference-implementations/komihash_4_7/komihash
 	url = https://github.com/avaneev/komihash.git
@@ -41,5 +38,5 @@
 	path = reference-implementations/xxh3_128/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
 [submodule "reference-implementations/komihash_5_15/komihash"]
-	path = reference-implementations/komihash_5_15/komihash
+	path = reference-implementations/komihash_5_18/komihash
 	url = https://github.com/avaneev/komihash.git

README.md

@@ -44,7 +44,7 @@ hash4j currently implements the following hash algorithms:
   * [final version 4](https://github.com/wangyi-fudan/wyhash/releases/tag/wyhash_final4)
 * [Komihash](https://github.com/avaneev/komihash)
   * [version 4.3](https://github.com/avaneev/komihash/releases/tag/4.3) (compatible with [version 4.7](https://github.com/avaneev/komihash/releases/tag/4.7))
-  * [version 5.0](https://github.com/avaneev/komihash/releases/tag/5.0) (compatible with [version 5.10](https://github.com/avaneev/komihash/releases/tag/5.10) and [version 5.15](https://github.com/avaneev/komihash/releases/tag/5.15))
+  * [version 5.0](https://github.com/avaneev/komihash/releases/tag/5.0) (compatible with [version 5.10](https://github.com/avaneev/komihash/releases/tag/5.10) and [version 5.18](https://github.com/avaneev/komihash/releases/tag/5.18))
 * [FarmHash](https://github.com/google/farmhash)
   * farmhashna
   * farmhashuo

reference-implementations/build.sh

@@ -8,11 +8,10 @@ polymur-hash_2_0/polymur-hash_2_0_checksum_config.cpp \
 wyhash_final_3/wyhash_final_3_checksum_config.cpp \
 wyhash_final_4/wyhash_final_4_checksum_config.cpp \
 komihash_4_3/komihash_4_3_checksum_config.cpp \
-komihash_4_5/komihash_4_5_checksum_config.cpp \
 komihash_4_7/komihash_4_7_checksum_config.cpp \
 komihash_5_0/komihash_5_0_checksum_config.cpp \
 komihash_5_10/komihash_5_10_checksum_config.cpp \
-komihash_5_15/komihash_5_15_checksum_config.cpp \
+komihash_5_18/komihash_5_18_checksum_config.cpp \
 murmur3_32/murmur3_32_checksum_config.cpp \
 murmur3_128/murmur3_128_checksum_config.cpp \
 murmur3_128/smhasher/src/MurmurHash3.cpp \

reference-implementations/calculate_checksums.cpp

@@ -20,11 +20,10 @@
 #include <openssl/evp.h>
 
 #include "komihash_4_3/komihash_4_3_checksum_config.hpp"
-#include "komihash_4_5/komihash_4_5_checksum_config.hpp"
 #include "komihash_4_7/komihash_4_7_checksum_config.hpp"
 #include "komihash_5_0/komihash_5_0_checksum_config.hpp"
 #include "komihash_5_10/komihash_5_10_checksum_config.hpp"
-#include "komihash_5_15/komihash_5_15_checksum_config.hpp"
+#include "komihash_5_18/komihash_5_18_checksum_config.hpp"
 #include "polymur-hash_2_0/polymur-hash_2_0_checksum_config.hpp"
 #include "wyhash_final_3/wyhash_final_3_checksum_config.hpp"
 #include "wyhash_final_4/wyhash_final_4_checksum_config.hpp"
@@ -132,11 +131,10 @@ void computeAndPrintChecksum(
 int main(int argc, char *argv[]) {
 
 	computeAndPrintChecksum<Komihash4_3ChecksumConfig>();
-	computeAndPrintChecksum<Komihash4_5ChecksumConfig>();
 	computeAndPrintChecksum<Komihash4_7ChecksumConfig>();
 	computeAndPrintChecksum<Komihash5_0ChecksumConfig>();
 	computeAndPrintChecksum<Komihash5_10ChecksumConfig>();
-	computeAndPrintChecksum<Komihash5_15ChecksumConfig>();
+	computeAndPrintChecksum<Komihash5_18ChecksumConfig>();
 	computeAndPrintChecksum<WyhashFinal3ChecksumConfig>();
 	computeAndPrintChecksum<WyhashFinal4ChecksumConfig>();
 	computeAndPrintChecksum<Murmur3_128_ChecksumConfig>(

reference-implementations/komihash_4_5/komihash

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "komihash_5_15_checksum_config.hpp"
+#include "komihash_5_18_checksum_config.hpp"
 #include "komihash/komihash.h"
 #include <cstring>
 
-void Komihash5_15ChecksumConfig::calculateHash(const uint8_t *seedBytes,
+void Komihash5_18ChecksumConfig::calculateHash(const uint8_t *seedBytes,
 		uint8_t *hashBytes, const uint8_t *dataBytes, uint64_t size) const {
 
 	uint64_t seed;

reference-implementations/komihash_4_5/komihash_4_5_checksum_config.cpp

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef KOMIHASH_4_5_CHECKSUM_CONFIG_HPP
-#define KOMIHASH_4_5_CHECKSUM_CONFIG_HPP
+#ifndef KOMIHASH_5_18_CHECKSUM_CONFIG_HPP
+#define KOMIHASH_5_18_CHECKSUM_CONFIG_HPP
 
 #include <string>
 #include <cstdint>
 
-class Komihash4_5ChecksumConfig {
+class Komihash5_18ChecksumConfig {
 
 public:
 
@@ -32,12 +32,12 @@ class Komihash4_5ChecksumConfig {
 	}
 
 	std::string getName() const {
-		return "Komihash 4.5";
+		return "Komihash 5.18";
 	}
 
 	void calculateHash(const uint8_t *seedBytes, uint8_t *hashBytes,
 			const uint8_t *dataBytes, uint64_t size) const;
 
 };
 
-#endif // KOMIHASH_4_5_CHECKSUM_CONFIG_HPP
+#endif // KOMIHASH_5_18_CHECKSUM_CONFIG_HPP