Merge pull request #235 from riptano/CPP-769

CPP-769 Use clang-format to fix up formatting

Author: mpenick

.clang-format

@@ -0,0 +1,27 @@
+---
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: Cpp03
+AccessModifierOffset: -2
+IndentWidth: 2
+TabWidth: 8
+ColumnLimit: 100
+UseTab: Never
+IndentCaseLabels: true
+AlignAfterOpenBracket: true
+AlignEscapedNewlines: Left
+BreakConstructorInitializers: BeforeComma
+AllowShortBlocksOnASingleLine: false
+DerivePointerAlignment: false
+PointerAlignment: Left
+BinPackParameters: true
+BinPackArguments: true
+AllowShortIfStatementsOnASingleLine: true
+CompactNamespaces: true
+AlignOperands: true
+SpacesInContainerLiterals: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeInheritanceComma: true
+...

CMakeLists.txt

@@ -17,6 +17,7 @@ list(APPEND CMAKE_MODULE_PATH ${CASS_ROOT_DIR}/cmake/modules
 )
 
 include(CppDriver)
+include(ClangFormat)
 
 CassInitProject(dse)
 CassRapidJson()

cpp-driver/.build.sh

@@ -73,6 +73,7 @@ build_driver() {
   (
     cd build
     cmake -DCMAKE_BUILD_TYPE=Release -D${driver_prefix}_BUILD_SHARED=On -D${driver_prefix}_BUILD_STATIC=On -D${driver_prefix}_BUILD_EXAMPLES=On -D${driver_prefix}_BUILD_UNIT_TESTS=On ..
+    [[ -x $(which clang-format) ]] && make format-check
     make -j${PROCS}
   )
 }

cpp-driver/.clang-format

@@ -0,0 +1,27 @@
+---
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: Cpp03
+AccessModifierOffset: -2
+IndentWidth: 2
+TabWidth: 8
+ColumnLimit: 100
+UseTab: Never
+IndentCaseLabels: true
+AlignAfterOpenBracket: true
+AlignEscapedNewlines: Left
+BreakConstructorInitializers: BeforeComma
+AllowShortBlocksOnASingleLine: false
+DerivePointerAlignment: false
+PointerAlignment: Left
+BinPackParameters: true
+BinPackArguments: true
+AllowShortIfStatementsOnASingleLine: true
+CompactNamespaces: true
+AlignOperands: true
+SpacesInContainerLiterals: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeInheritanceComma: true
+...

cpp-driver/cmake/modules/ClangFormat.cmake

@@ -0,0 +1,49 @@
+#
+# Format and verify formatting using clang-format
+#
+cmake_minimum_required(VERSION 2.6.4)
+
+include(FindPackageHandleStandardArgs)
+
+if(NOT CLANG_FORMAT_EXE_NAME)
+  set(CLANG_FORMAT_EXE_NAME clang-format)
+endif()
+
+if(CLANG_FORMAT_ROOT_DIR)
+  find_program(CLANG_FORMAT_EXE
+    NAMES ${CLANG_FORMAT_EXE_NAME}
+    PATHS ${CLANG_FORMAT_ROOT_DIR}
+    NO_DEFAULT_PATH)
+endif()
+
+find_program(CLANG_FORMAT_EXE NAMES ${CLANG_FORMAT_EXE_NAME})
+
+find_package_handle_standard_args(CLANG_FORMAT DEFAULT_MSG CLANG_FORMAT_EXE)
+
+mark_as_advanced(CLANG_FORMAT_EXE)
+
+if(CLANG_FORMAT_FOUND)
+  set(CLANG_FORMAT_FILE_EXTENSIONS ${CLANG_FORMAT_CXX_FILE_EXTENSIONS} *.cpp *.hpp *.c *.h)
+  file(GLOB_RECURSE CLANG_FORMAT_ALL_SOURCE_FILES ${CLANG_FORMAT_FILE_EXTENSIONS})
+
+  set(CLANG_FORMAT_EXCLUDE_PATTERNS ${CLANG_FORMAT_EXCLUDE_PATTERNS} "/CMakeFiles/" "cmake" "/build/" "/vendor/" "/third_party/" "cassandra.h" "dse.h")
+
+  foreach (SOURCE_FILE ${CLANG_FORMAT_ALL_SOURCE_FILES})
+    foreach (EXCLUDE_PATTERN ${CLANG_FORMAT_EXCLUDE_PATTERNS})
+      string(FIND ${SOURCE_FILE} ${EXCLUDE_PATTERN} EXCLUDE_FOUND)
+      if (NOT ${EXCLUDE_FOUND} EQUAL -1)
+        list(REMOVE_ITEM CLANG_FORMAT_ALL_SOURCE_FILES ${SOURCE_FILE})
+      endif ()
+    endforeach ()
+  endforeach ()
+
+  add_custom_target(format
+    COMMENT "Format source files using clang-format"
+    COMMAND ${CLANG_FORMAT_EXE} -i -fallback-style=none -style=file ${CLANG_FORMAT_ALL_SOURCE_FILES})
+
+  add_custom_target(format-check
+    COMMENT "Verify source files formatting using clang-format"
+    COMMAND ! ${CLANG_FORMAT_EXE} -output-replacements-xml -fallback-style=none -style=file ${CLANG_FORMAT_ALL_SOURCE_FILES} | tee replacements.xml | grep -q "replacement offset")
+else()
+  message(STATUS "Unable to find clang-format. Not creating format targets.")
+endif()

cpp-driver/examples/async/async.c

@@ -26,9 +26,9 @@
 */
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cassandra.h"
 
@@ -41,7 +41,6 @@ void print_error(CassFuture* future) {
   fprintf(stderr, "Error: %.*s\n", (int)message_length, message);
 }
 
-
 CassCluster* create_cluster(const char* hosts) {
   CassCluster* cluster = cass_cluster_new();
   cass_cluster_set_contact_points(cluster, hosts);
@@ -90,7 +89,7 @@ void insert_into_async(CassSession* session, const char* key) {
 
   size_t i;
   for (i = 0; i < NUM_CONCURRENT_REQUESTS; ++i) {
-     char key_buffer[64];
+    char key_buffer[64];
     statement = cass_statement_new(query, 6);
 
     sprintf(key_buffer, "%s%u", key, (unsigned int)i);
@@ -135,13 +134,10 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  execute_query(session,
-                "CREATE KEYSPACE examples WITH replication = { \
+  execute_query(session, "CREATE KEYSPACE examples WITH replication = { \
                            'class': 'SimpleStrategy', 'replication_factor': '3' };");
 
-
-  execute_query(session,
-                "CREATE TABLE examples.async (key text, \
+  execute_query(session, "CREATE TABLE examples.async (key text, \
                                               bln boolean, \
                                               flt float, dbl double,\
                                               i32 int, i64 bigint, \

cpp-driver/examples/auth/auth.c

@@ -35,8 +35,7 @@ typedef struct Credentials_ {
   const char* username;
 } Credentials;
 
-void on_auth_initial(CassAuthenticator* auth,
-                       void* data) {
+void on_auth_initial(CassAuthenticator* auth, void* data) {
   /*
    * This callback is used to initiate a request to begin an authentication
    * exchange. Required resources can be acquired and initialized here.
@@ -52,7 +51,7 @@ void on_auth_initial(CassAuthenticator* auth,
    * authentication callbacks were set and is available to all
    * authentication exchanges.
    */
-  const Credentials* credentials = (const Credentials *)data;
+  const Credentials* credentials = (const Credentials*)data;
 
   size_t username_size = strlen(credentials->username);
   size_t password_size = strlen(credentials->password);
@@ -68,20 +67,14 @@ void on_auth_initial(CassAuthenticator* auth,
   memcpy(response + username_size + 2, credentials->password, password_size);
 }
 
-void on_auth_challenge(CassAuthenticator* auth,
-                       void* data,
-                       const char* token,
-                       size_t token_size) {
+void on_auth_challenge(CassAuthenticator* auth, void* data, const char* token, size_t token_size) {
   /*
    * Not used for plain text authentication, but this is to be used
    * for handling an authentication challenge initiated by the server.
    */
 }
 
-void on_auth_success(CassAuthenticator* auth,
-                     void* data,
-                     const char* token,
-                     size_t token_size ) {
+void on_auth_success(CassAuthenticator* auth, void* data, const char* token, size_t token_size) {
   /*
    * Not used for plain text authentication, but this is to be used
    * for handling the success phase of an exchange.
@@ -104,17 +97,10 @@ int main(int argc, char* argv[]) {
   char* hosts = "127.0.0.1,127.0.0.2,127.0.0.3";
 
   /* Setup authentication callbacks and credentials */
-  CassAuthenticatorCallbacks auth_callbacks = {
-    on_auth_initial,
-    on_auth_challenge,
-    on_auth_success,
-    on_auth_cleanup
-  };
-
-  Credentials credentials = {
-    "cassandra",
-    "cassandra"
-  };
+  CassAuthenticatorCallbacks auth_callbacks = { on_auth_initial, on_auth_challenge, on_auth_success,
+                                                on_auth_cleanup };
+
+  Credentials credentials = { "cassandra", "cassandra" };
 
   /* Add contact points */
   if (argc > 1) {
@@ -123,10 +109,7 @@ int main(int argc, char* argv[]) {
   cass_cluster_set_contact_points(cluster, hosts);
 
   /* Set custom authentication callbacks and credentials */
-  cass_cluster_set_authenticator_callbacks(cluster,
-                                           &auth_callbacks,
-                                           NULL,
-                                           &credentials);
+  cass_cluster_set_authenticator_callbacks(cluster, &auth_callbacks, NULL, &credentials);
 
   /* Provide the cluster object as configuration to connect the session */
   connect_future = cass_session_connect(session, cluster);
@@ -138,8 +121,7 @@ int main(int argc, char* argv[]) {
     const char* message;
     size_t message_length;
     cass_future_error_message(connect_future, &message, &message_length);
-    fprintf(stderr, "Unable to connect: '%.*s'\n", (int)message_length,
-                                                        message);
+    fprintf(stderr, "Unable to connect: '%.*s'\n", (int)message_length, message);
   }
 
   cass_future_free(connect_future);

cpp-driver/examples/basic/basic.c

@@ -26,9 +26,9 @@
 */
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cassandra.h"
 
@@ -92,7 +92,8 @@ CassError insert_into_basic(CassSession* session, const char* key, const Basic*
   CassError rc = CASS_OK;
   CassStatement* statement = NULL;
   CassFuture* future = NULL;
-  const char* query = "INSERT INTO examples.basic (key, bln, flt, dbl, i32, i64) VALUES (?, ?, ?, ?, ?, ?);";
+  const char* query =
+      "INSERT INTO examples.basic (key, bln, flt, dbl, i32, i64) VALUES (?, ?, ?, ?, ?, ?);";
 
   statement = cass_statement_new(query, 6);
 
@@ -175,13 +176,10 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  execute_query(session,
-                "CREATE KEYSPACE examples WITH replication = { \
+  execute_query(session, "CREATE KEYSPACE examples WITH replication = { \
                            'class': 'SimpleStrategy', 'replication_factor': '3' };");
 
-
-  execute_query(session,
-                "CREATE TABLE examples.basic (key text, \
+  execute_query(session, "CREATE TABLE examples.basic (key text, \
                                               bln boolean, \
                                               flt float, dbl double,\
                                               i32 int, i64 bigint, \

cpp-driver/examples/batch/batch.c

@@ -26,15 +26,15 @@
 */
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cassandra.h"
 
 struct Pair_ {
-    const char* key;
-    const char* value;
+  const char* key;
+  const char* value;
 };
 
 typedef struct Pair_ Pair;
@@ -105,7 +105,8 @@ CassError prepare_insert_into_batch(CassSession* session, const CassPrepared** p
   return rc;
 }
 
-CassError insert_into_batch_with_prepared(CassSession* session, const CassPrepared* prepared, const Pair* pairs) {
+CassError insert_into_batch_with_prepared(CassSession* session, const CassPrepared* prepared,
+                                          const Pair* pairs) {
   CassError rc = CASS_OK;
   CassFuture* future = NULL;
   CassBatch* batch = cass_batch_new(CASS_BATCH_TYPE_LOGGED);
@@ -120,13 +121,15 @@ CassError insert_into_batch_with_prepared(CassSession* session, const CassPrepar
   }
 
   {
-    CassStatement* statement = cass_statement_new("INSERT INTO examples.pairs (key, value) VALUES ('c', '3')", 0);
+    CassStatement* statement =
+        cass_statement_new("INSERT INTO examples.pairs (key, value) VALUES ('c', '3')", 0);
     cass_batch_add_statement(batch, statement);
     cass_statement_free(statement);
   }
 
   {
-    CassStatement* statement = cass_statement_new("INSERT INTO examples.pairs (key, value) VALUES (?, ?)", 2);
+    CassStatement* statement =
+        cass_statement_new("INSERT INTO examples.pairs (key, value) VALUES (?, ?)", 2);
     cass_statement_bind_string(statement, 0, "d");
     cass_statement_bind_string(statement, 1, "4");
     cass_batch_add_statement(batch, statement);
@@ -147,14 +150,13 @@ CassError insert_into_batch_with_prepared(CassSession* session, const CassPrepar
   return rc;
 }
 
-
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
   const CassPrepared* prepared = NULL;
   char* hosts = "127.0.0.1";
 
-  Pair pairs[] = { {"a", "1"}, {"b", "2"}, { NULL, NULL} };
+  Pair pairs[] = { { "a", "1" }, { "b", "2" }, { NULL, NULL } };
 
   if (argc > 1) {
     hosts = argv[1];
@@ -167,13 +169,10 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  execute_query(session,
-                "CREATE KEYSPACE examples WITH replication = { \
+  execute_query(session, "CREATE KEYSPACE examples WITH replication = { \
                            'class': 'SimpleStrategy', 'replication_factor': '3' };");
 
-
-  execute_query(session,
-                "CREATE TABLE examples.pairs (key text, \
+  execute_query(session, "CREATE TABLE examples.pairs (key text, \
                                               value text, \
                                               PRIMARY KEY (key));");