- Update to 4.4.1

Changes:	https://github.com/facebook/rocksdb/releases

7 files changed, 4 insertions, 85 deletions

diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 3d7b0f02815c..82aecdd8f07a 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	4.3.1
+PORTVERSION=	4.4.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 00c84766d3dd..ef2786eda563 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (facebook-rocksdb-v4.3.1_GH0.tar.gz) = 853935ddb4df7cce0b89d0684e107348a49c25aa05f1e00866a99eaf3cabb97a
-SIZE (facebook-rocksdb-v4.3.1_GH0.tar.gz) = 1954150
+SHA256 (facebook-rocksdb-v4.4.1_GH0.tar.gz) = de66814668f7517b83cbdb1ef491a474a6e5278d0f464c03b36eaf3f847d2079
+SIZE (facebook-rocksdb-v4.4.1_GH0.tar.gz) = 2004007
diff --git a/databases/rocksdb/files/patch-db-db_bench.cc b/databases/rocksdb/files/patch-db-db_bench.cc
deleted file mode 100644
index d573a3d52b20..000000000000
--- a/databases/rocksdb/files/patch-db-db_bench.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- db/db_bench.cc.orig	2015-08-31 20:23:39.000000000 +0200
-+++ db/db_bench.cc	2015-09-08 00:15:47.039650000 +0200
-@@ -2259,8 +2259,7 @@ class Benchmark {
-         fprintf(stderr, "Open flash device failed\n");
-         exit(1);
-       }
--      flashcache_aware_env_ =
--          std::move(NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_));
-+      flashcache_aware_env_ = NewFlashcacheAwareEnv(FLAGS_env, cachedev_fd_);
-       if (flashcache_aware_env_.get() == nullptr) {
-         fprintf(stderr, "Failed to open flashcahce device at %s\n",
-                 FLAGS_flashcache_dev.c_str());
-@@ -2884,7 +2883,7 @@ class Benchmark {
-     std::vector<std::unique_ptr<const char[]> > key_guards;
-     std::vector<std::string> values(entries_per_batch_);
-     while (static_cast<int64_t>(keys.size()) < entries_per_batch_) {
--      key_guards.push_back(std::move(std::unique_ptr<const char[]>()));
-+      key_guards.push_back(std::unique_ptr<const char[]>());
-       keys.push_back(AllocateKey(&key_guards.back()));
-     }
- 
diff --git a/databases/rocksdb/files/patch-db-wal_manager.cc b/databases/rocksdb/files/patch-db-wal_manager.cc
deleted file mode 100644
index 088b6f59f241..000000000000
--- a/databases/rocksdb/files/patch-db-wal_manager.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- db/wal_manager.cc.orig	2015-08-31 20:23:39.000000000 +0200
-+++ db/wal_manager.cc	2015-09-07 23:52:03.849468000 +0200
-@@ -329,8 +329,8 @@ Status WalManager::GetSortedWalsOfType(c
-         return s;
-       }
- 
--      log_files.push_back(std::move(std::unique_ptr<LogFile>(
--          new LogFileImpl(number, log_type, sequence, size_bytes))));
-+      log_files.push_back(std::unique_ptr<LogFile>(
-+          new LogFileImpl(number, log_type, sequence, size_bytes)));
-     }
-   }
-   CompareLogByPointer compare_log_files;
diff --git a/databases/rocksdb/files/patch-utilities-backupable-backupable_db.cc b/databases/rocksdb/files/patch-utilities-backupable-backupable_db.cc
deleted file mode 100644
index 065a0b5aae12..000000000000
--- a/databases/rocksdb/files/patch-utilities-backupable-backupable_db.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- utilities/backupable/backupable_db.cc.orig	2015-08-31 20:23:39.000000000 +0200
-+++ utilities/backupable/backupable_db.cc	2015-09-08 00:08:37.375425000 +0200
-@@ -560,10 +560,10 @@ Status BackupEngineImpl::Initialize() {
-       continue;
-     }
-     assert(backups_.find(backup_id) == backups_.end());
--    backups_.insert(std::move(
-+    backups_.insert(
-         std::make_pair(backup_id, unique_ptr<BackupMeta>(new BackupMeta(
-                                       GetBackupMetaFile(backup_id),
--                                      &backuped_file_infos_, backup_env_)))));
-+                                      &backuped_file_infos_, backup_env_))));
-   }
- 
-   if (options_.destroy_old_data) {  // Destroy old data
-@@ -701,10 +701,10 @@ Status BackupEngineImpl::CreateNewBackup
- 
-   BackupID new_backup_id = latest_backup_id_ + 1;
-   assert(backups_.find(new_backup_id) == backups_.end());
--  auto ret = backups_.insert(std::move(
-+  auto ret = backups_.insert(
-       std::make_pair(new_backup_id, unique_ptr<BackupMeta>(new BackupMeta(
-                                         GetBackupMetaFile(new_backup_id),
--                                        &backuped_file_infos_, backup_env_)))));
-+                                        &backuped_file_infos_, backup_env_))));
-   assert(ret.second == true);
-   auto& new_backup = ret.first->second;
-   new_backup->RecordTimestamp();
diff --git a/databases/rocksdb/files/patch-utilities-document-json_document.cc b/databases/rocksdb/files/patch-utilities-document-json_document.cc
deleted file mode 100644
index ebcb7df025c5..000000000000
--- a/databases/rocksdb/files/patch-utilities-document-json_document.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- utilities/document/json_document.cc.orig	2015-08-31 20:23:39.000000000 +0200
-+++ utilities/document/json_document.cc	2015-09-08 00:10:06.250157000 +0200
-@@ -307,7 +307,7 @@ JSONDocument JSONDocument::operator[](co
-   assert(foundValue != nullptr);
-   // No need to save paths in const objects
-   JSONDocument ans(foundValue, false);
--  return std::move(ans);
-+  return ans;
- }
- 
- size_t JSONDocument::Count() const {
-@@ -330,7 +330,7 @@ JSONDocument JSONDocument::operator[](si
-   auto arrayVal = reinterpret_cast<fbson::ArrayVal*>(value_);
-   auto foundValue = arrayVal->get(static_cast<int>(i));
-   JSONDocument ans(foundValue, false);
--  return std::move(ans);
-+  return ans;
- }
- 
- bool JSONDocument::IsNull() const {
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 415a8698b699..9108fe47180c 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -48,6 +48,7 @@ include/rocksdb/utilities/checkpoint.h
 include/rocksdb/utilities/convenience.h
 include/rocksdb/utilities/db_ttl.h
 include/rocksdb/utilities/document_db.h
+include/rocksdb/utilities/env_mirror.h
 include/rocksdb/utilities/flashcache.h
 include/rocksdb/utilities/geo_db.h
 include/rocksdb/utilities/info_log_finder.h