Use "org.apache.derby.iapi.jdbc.AutoloadedDriver" for derby in 4.2.0

Author: maltesander

deploy/config-spec/properties.yaml

@@ -84,7 +84,10 @@ properties:
         unit: *unitClassName
       roles:
         - name: "metastore"
-          required: true
+          # This property *is* required. It changed for derby in version 4.2.0
+          # which we check in code and add in the ConfigMap builder instead of
+          # the compute_files() method in crd.rs. 
+          required: false
       asOfVersion: "0.0.0"
   - property:
       propertyNames:

deploy/helm/hive-operator/configs/properties.yaml

@@ -84,7 +84,10 @@ properties:
         unit: *unitClassName
       roles:
         - name: "metastore"
-          required: true
+          # This property *is* required. It changed for derby in version 4.2.0
+          # which we check in code and add in the ConfigMap builder instead of
+          # the compute_files() method in crd.rs. 
+          required: false
       asOfVersion: "0.0.0"
   - property:
       propertyNames:

rust/operator-binary/src/controller.rs

@@ -607,6 +607,15 @@ fn build_metastore_rolegroup_config_map(
                     Some("/stackable/warehouse".to_string()),
                 );
 
+                data.insert(
+                    MetaStoreConfig::CONNECTION_DRIVER_NAME.to_string(),
+                    Some(
+                        hive.db_type()
+                            .get_jdbc_driver_class(&resolved_product_image.product_version)
+                            .to_string(),
+                    ),
+                );
+
                 if let Some(s3) = s3_connection_spec {
                     data.insert(
                         MetaStoreConfig::S3_ENDPOINT.to_string(),

rust/operator-binary/src/crd/mod.rs

@@ -521,9 +521,16 @@ pub enum DbType {
 }
 
 impl DbType {
-    pub fn get_jdbc_driver_class(&self) -> &str {
+    pub fn get_jdbc_driver_class(&self, product_version: &str) -> &str {
         match self {
-            DbType::Derby => "org.apache.derby.jdbc.EmbeddedDriver",
+            DbType::Derby => {
+                // The driver class changed for hive 4.2.0
+                if ["3.1.3", "4.0.0", "4.0.1", "4.1.0"].contains(&product_version) {
+                    "org.apache.derby.jdbc.EmbeddedDriver"
+                } else {
+                    "org.apache.derby.iapi.jdbc.AutoloadedDriver"
+                }
+            }
             DbType::Mysql => "com.mysql.jdbc.Driver",
             DbType::Postgres => "org.postgresql.Driver",
             DbType::Mssql => "com.microsoft.sqlserver.jdbc.SQLServerDriver",
@@ -598,11 +605,6 @@ impl Configuration for MetaStoreConfigFragment {
                 MetaStoreConfig::CONNECTION_PASSWORD.to_string(),
                 Some(DB_PASSWORD_PLACEHOLDER.into()),
             );
-            result.insert(
-                MetaStoreConfig::CONNECTION_DRIVER_NAME.to_string(),
-                Some(hive.db_type().get_jdbc_driver_class().to_string()),
-            );
-
             result.insert(
                 MetaStoreConfig::METASTORE_METRICS_ENABLED.to_string(),
                 Some("true".to_string()),