Rustfmt and C impl cleanup

Author: farost

.factory/automation.yml

@@ -268,7 +268,6 @@ build:
         tool/test/stop-cluster-servers.sh
         exit $TEST_SUCCESS
 
-
     test-http-ts-behaviour-community:
       image: typedb-ubuntu-22.04
       type: foreground
@@ -287,6 +286,8 @@ build:
         tool/test/stop-community-server.sh
         exit $TEST_SUCCESS
 
+# TODO: Run HTTP TS tests against clustered servers
+
 #    test-nodejs-integration:
 #      image: typedb-ubuntu-22.04
 #      dependencies:
@@ -533,7 +534,7 @@ build:
 release:
   filter:
     owner: typedb
-    branch: [master]
+    branch: [master, cluster-support-feature-branch]
   validation:
     validate-dependencies:
       image: typedb-ubuntu-22.04

c/src/analyze.rs

@@ -17,33 +17,33 @@
  * under the License.
  */
 
-use std::{
-    ffi::c_char,
-    ptr::{addr_of_mut, null_mut},
-};
+use std::{ffi::c_char, ptr::addr_of_mut};
 
 use typedb_driver::{
     analyze::{
         conjunction::{
-            Comparator, Conjunction, ConjunctionID, Constraint, ConstraintExactness, ConstraintSpan, ConstraintVertex,
-            ConstraintWithSpan, NamedRole, Variable,
+            Comparator, Conjunction, ConjunctionID, Constraint, ConstraintExactness, ConstraintVertex,
+            ConstraintWithSpan, Variable, NamedRole
         },
         pipeline::{Pipeline, PipelineStage, ReduceAssignment, Reducer, SortOrder, SortVariable},
         AnalyzedQuery, Fetch, Function, ReturnOperation, TypeAnnotations, VariableAnnotations,
     },
     box_stream,
-    concept::{type_::Type, AttributeType, Concept, Kind, ValueType},
+    concept::{type_::Type, Concept, Kind},
     BoxPromise, Promise,
 };
 
 use crate::{
-    common::StringIterator,
-    concept::ConceptIterator,
-    error::try_release,
-    iterator::{iterator_next, CIterator},
-    memory::{
-        borrow, free, release, release_optional, release_optional_string, release_string, string_view, take_ownership,
+    common::{
+        error::try_release,
+        iterator::{iterator_next, CIterator},
+        memory::{
+            borrow, free, release, release_optional, release_optional_string, release_string, string_view,
+            take_ownership,
+        },
+        StringIterator,
     },
+    concept::ConceptIterator,
 };
 
 // Iterators, promises & enums
@@ -406,15 +406,15 @@ pub extern "C" fn pipeline_stage_require_get_variables(stage: *const PipelineSta
 #[no_mangle]
 pub extern "C" fn pipeline_stage_offset_get_offset(stage: *const PipelineStage) -> i64 {
     let PipelineStage::Offset { offset, .. } = borrow(stage) else { unreachable!("Expected Offset stage") };
-    (*offset as i64)
+    *offset as i64
 }
 
 /// Unwraps the <code>PipelineStage</code> instance as a Limit stage, and returns the limit applied.
 /// Will panic if the stage is not a Limit stage.
 #[no_mangle]
 pub extern "C" fn pipeline_stage_limit_get_limit(stage: *const PipelineStage) -> i64 {
     let PipelineStage::Limit { limit, .. } = borrow(stage) else { unreachable!("Expected Limit stage") };
-    (*limit as i64)
+    *limit as i64
 }
 
 /// Unwraps the <code>PipelineStage</code> instance as a Sort stage, and returns the <code>SortVariable</code>.

c/src/database.rs

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-pub(crate) mod database;
-pub(crate) mod database_manager;
+mod database;
+mod database_manager;

c/src/database/mod.rs

@@ -23,10 +23,10 @@ use typedb_driver::{box_stream, Addresses, Credentials, DriverOptions, ServerRep
 
 use crate::{
     common::{
-        error::{try_release, unwrap_or_default, unwrap_void},
+        error::{try_release, try_release_optional, unwrap_or_default, unwrap_void},
         iterator::CIterator,
         iterators_to_map,
-        memory::{borrow, free, release, release_optional, string_array_view, string_view},
+        memory::{borrow, free, release, string_array_view, string_view},
     },
     server::{
         consistency_level::{native_consistency_level, ConsistencyLevel},
@@ -215,7 +215,10 @@ pub extern "C" fn driver_replicas(driver: *const TypeDBDriver) -> *mut ServerRep
 /// Retrieves the server's primary replica, if exists.
 #[no_mangle]
 pub extern "C" fn driver_primary_replica(driver: *const TypeDBDriver) -> *mut ServerReplica {
-    release_optional(borrow(driver).primary_replica())
+    // TODO: Return somehow else!!
+    try_release_optional(
+        borrow(driver).primary_replica().map(|res| res.map(|rep| ServerReplica::Available(rep))).transpose(),
+    )
 }
 
 /// Registers a new replica in the cluster the driver is currently connected to. The registered

c/src/driver.rs

@@ -19,11 +19,11 @@
 
 use std::{ffi::c_char, ptr::addr_of_mut};
 
-use typedb_driver::{ReplicaRole, ServerReplica};
+use typedb_driver::{Replica, ReplicaRole, ServerReplica};
 
 use crate::common::{
     iterator::{iterator_next, CIterator},
-    memory::{borrow, free, release_string},
+    memory::{borrow, free, release_optional_string},
 };
 
 /// Iterator over the <code>ServerReplica</code> corresponding to each replica of a TypeDB cluster.
@@ -57,13 +57,19 @@ pub extern "C" fn server_replica_get_id(replica_info: *const ServerReplica) -> i
 /// Returns the address this replica is hosted at.
 #[no_mangle]
 pub extern "C" fn server_replica_get_address(replica_info: *const ServerReplica) -> *mut c_char {
-    release_string(borrow(replica_info).address().to_string())
+    release_optional_string(borrow(replica_info).address().map(|address| address.to_string()))
 }
 
-/// Returns whether this is the primary replica of the raft cluster or any of the supporting types.
+/// Returns whether the role of this replica is set.
 #[no_mangle]
-pub extern "C" fn server_replica_get_type(replica_info: *const ServerReplica) -> ReplicaRole {
-    borrow(replica_info).role().unwrap() // TODO: Return optional!
+pub extern "C" fn server_replica_has_type(replica_info: *const ServerReplica) -> bool {
+    borrow(replica_info).role().is_some()
+}
+
+/// Returns whether this is the primary replica of the raft cluster or any of the supporting roles.
+#[no_mangle]
+pub extern "C" fn server_replica_get_role(replica_info: *const ServerReplica) -> ReplicaRole {
+    borrow(replica_info).role().unwrap()
 }
 
 /// Checks whether this is the primary replica of the raft cluster.
@@ -72,8 +78,14 @@ pub extern "C" fn server_replica_is_primary(replica_info: *const ServerReplica)
     borrow(replica_info).is_primary()
 }
 
+/// Returns whether the raft protocol ‘term’ of this replica exists.
+#[no_mangle]
+pub extern "C" fn server_replica_has_term(replica_info: *const ServerReplica) -> bool {
+    borrow(replica_info).term().is_some()
+}
+
 /// Returns the raft protocol ‘term’ of this replica.
 #[no_mangle]
 pub extern "C" fn server_replica_get_term(replica_info: *const ServerReplica) -> i64 {
-    borrow(replica_info).term().unwrap() as i64 // TODO: Return optional!
+    borrow(replica_info).term().unwrap() as i64
 }

c/src/server/server_replica.rs

@@ -21,12 +21,9 @@ use std::ffi::c_char;
 
 use typedb_driver::User;
 
-use crate::{
-    common::{
-        error::unwrap_void,
-        memory::{borrow, free, release_string, string_view, take_ownership},
-    },
-    memory::take_ownership,
+use crate::common::{
+    error::unwrap_void,
+    memory::{borrow, free, release_string, string_view, take_ownership},
 };
 
 /// Frees the native rust <code>User</code> object.

c/src/user/user.rs

@@ -132,8 +132,10 @@
 %nojavaexception server_replica_get_address;
 %nojavaexception server_replica_is_primary;
 %nojavaexception server_replica_get_id;
-%nojavaexception server_replica_get_type;
+%nojavaexception server_replica_get_role;
+%nojavaexception server_replica_has_role;
 %nojavaexception server_replica_get_term;
+%nojavaexception server_replica_has_term;
 
 %nojavaexception database_get_name;
 

c/swig/typedb_driver_java.swg

@@ -20,6 +20,7 @@
 package com.typedb.driver.api.server;
 
 import javax.annotation.CheckReturnValue;
+import java.util.Optional;
 
 /**
  * The metadata and state of an individual raft replica of a driver connection.
@@ -43,7 +44,7 @@ public interface ServerReplica {
      * Returns whether this is the primary replica of the raft cluster or any of the supporting types.
      */
     @CheckReturnValue
-    ReplicaType getType();
+    Optional<ReplicaType> getRole();
 
     /**
      * Checks whether this is the primary replica of the raft cluster.
@@ -55,5 +56,5 @@ public interface ServerReplica {
      * Returns the raft protocol ‘term’ of this replica.
      */
     @CheckReturnValue
-    long getTerm();
+    Optional<Long> getTerm();
 }