Remove unusable/broken RocksDB code and options

The Broker RockSDB data store backend was previously unusable
and broken, so all code and options related to it are now removed.

CHANGES

@@ -1,4 +1,11 @@
 
+4.1.0-dev.52 | 2021-01-11 11:11:13 -0800
+
+  * Remove unusable/broken RocksDB code and options (Jon Siwek, Corelight)
+
+    The Broker RockSDB data store backend was previously unusable
+    and broken, so all code and options related to it are now removed.
+
 4.1.0-dev.51 | 2021-01-07 17:02:28 -0800
 
   * Virtualize Obj::GetLocationInfo() (Vern Paxson, Corelight)

NEWS

@@ -15,6 +15,9 @@ Changed Functionality
 Removed Functionality
 ---------------------
 
+- Support for the RocksDB Broker data store was previously broken and unusable,
+  so all code/options related to it are now removed.
+
 Deprecated Functionality
 ------------------------
 

VERSION

@@ -1 +1 @@
-4.1.0-dev.51
+4.1.0-dev.52

auxil/broker

@@ -1 +1 @@
-Subproject commit c97549bf8491aaf9e8d6777588a46af8af2e99ec
+Subproject commit e82cb55903a1991ac75542f0d8a2fd57d46133b2

scripts/base/frameworks/broker/store.zeek

@@ -55,7 +55,6 @@ export {
 	type BackendType: enum {
 		MEMORY,
 		SQLITE,
-		ROCKSDB,
 	};
 
 	## Options to tune the SQLite storage backend.
@@ -66,18 +65,9 @@ export {
 		path: string &default = "";
 	};
 
-	## Options to tune the RocksDB storage backend.
-	type RocksDBOptions: record {
-		## File system path of the database.
-		## If left empty, will be derived from the name of the store,
-		## and use the '.rocksdb' file suffix.
-		path: string &default = "";
-	};
-
 	## Options to tune the particular storage backends.
 	type BackendOptions: record {
 		sqlite: SQLiteOptions &default = SQLiteOptions();
-		rocksdb: RocksDBOptions &default = RocksDBOptions();
 	};
 
 	## Create a master data store which contains key-value pairs.

scripts/base/frameworks/cluster/main.zeek

@@ -393,9 +393,6 @@ function create_store(name: string, persistent: bool &default=F): Cluster::Store
 
 		if ( info$options$sqlite$path == default_options$sqlite$path )
 			info$options$sqlite$path = path + ".sqlite";
-
-		if ( info$options$rocksdb$path == default_options$rocksdb$path )
-			info$options$rocksdb$path = path + ".rocksdb";
 		}
 
 	if ( persistent )
@@ -405,8 +402,6 @@ function create_store(name: string, persistent: bool &default=F): Cluster::Store
 			info$backend = Cluster::default_persistent_backend;
 			break;
 		case Broker::SQLITE:
-			fallthrough;
-		case Broker::ROCKSDB:
 			# no-op: user already asked for a specific persistent backend.
 			break;
 		default:

src/broker/CMakeLists.txt

@@ -5,11 +5,6 @@ include_directories(BEFORE
                     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if ( ROCKSDB_INCLUDE_DIR )
-    add_definitions(-DHAVE_ROCKSDB)
-    include_directories(BEFORE ${ROCKSDB_INCLUDE_DIR})
-endif ()
-
 set(comm_SRCS
     Data.cc
     Manager.cc

src/broker/Manager.cc

@@ -252,9 +252,6 @@ void Manager::InitializeBrokerStoreForwarding()
 			case broker::backend::sqlite:
 				suffix = ".sqlite";
 				break;
-			case broker::backend::rocksdb:
-				suffix = ".rocksdb";
-				break;
 			default:
 				break;
 			}
@@ -1596,9 +1593,6 @@ detail::StoreHandleVal* Manager::MakeMaster(const string& name, broker::backend
 		case broker::backend::sqlite:
 			suffix = ".sqlite";
 			break;
-		case broker::backend::rocksdb:
-			suffix = ".rocksdb";
-			break;
 		default:
 			break;
 		}

src/broker/Store.cc

@@ -27,45 +27,11 @@ EnumValPtr query_status(bool success)
 
 void StoreHandleVal::ValDescribe(ODesc* d) const
 	{
-	//using BifEnum::Broker::BackendType;
 	d->Add("broker::store::");
 
-	//switch ( store_type ) {
-  //  case broker::frontend::FRONTEND:
-	//	d->Add("frontend");
-	//	break;
-  //  case broker::frontend::MASTER:
-	//	d->Add("master");
-	//	break;
-  //  case broker::frontend::CLONE:
-	//	d->Add("clone");
-	//	break;
-	//default:
-	//	d->Add("unknown");
-	//	}
-
 	d->Add("{");
 	d->Add(store.name());
 
-	//if ( backend_type )
-	//	{
-	//	d->Add(", ");
-
-	//	switch ( *backend_type ) {
-	//	case BackendType::MEMORY:
-	//		d->Add("memory");
-	//		break;
-	//	case BackendType::SQLITE:
-	//		d->Add("sqlite");
-	//		break;
-	//	case BackendType::ROCKSDB:
-	//		d->Add("rocksdb");
-	//		break;
-	//	default:
-	//		d->Add("unknown");
-	//		}
-	//	}
-
 	d->Add("}");
 	}
 
@@ -91,9 +57,6 @@ broker::backend to_backend_type(BifEnum::Broker::BackendType type)
 
 	case BifEnum::Broker::SQLITE:
 		return broker::backend::sqlite;
-
-	case BifEnum::Broker::ROCKSDB:
-		return broker::backend::rocksdb;
 	}
 
 	throw std::runtime_error("unknown broker backend");
@@ -110,13 +73,6 @@ broker::backend_options to_backend_options(broker::backend backend,
 		return {{"path", path}};
 		}
 
-	case broker::backend::rocksdb:
-		{
-		auto path = options->GetField(1)->AsRecordVal()
-			->GetField(0)->AsStringVal()->CheckString();
-		return {{"path", path}};
-		}
-
 	default:
 		break;
 	}

src/broker/store.bif

@@ -20,7 +20,6 @@ type Broker::BackendOptions: record;
 enum BackendType %{
 	MEMORY,
 	SQLITE,
-	ROCKSDB,
 %}
 
 function Broker::__create_master%(id: string, b: BackendType,