Merge pull request #8 from datastax/375

375 - Added CLs to graph query options and timestamp to graph statement

Author: mpenick

cpp-driver

@@ -361,6 +361,32 @@ DSE_EXPORT CassError
 dse_graph_options_set_graph_name_n(DseGraphOptions* options,
                                    const char* name, size_t name_length);
 
+/**
+ * Set the read consistency used by graph queries.
+ *
+ * @public @memberof DseGraphOptions
+ *
+ * @param[in] options
+ * @param[in] consistency
+ * @return CASS_OK if successful, otherwise an error occurred.
+ */
+DSE_EXPORT CassError
+dse_graph_options_set_read_consistency(DseGraphOptions* options,
+                                       CassConsistency consistency);
+
+/**
+ * Set the write consistency used by graph queries.
+ *
+ * @public @memberof DseGraphOptions
+ *
+ * @param[in] options
+ * @param[in] consistency
+ * @return CASS_OK if successful, otherwise an error occurred.
+ */
+DSE_EXPORT CassError
+dse_graph_options_set_write_consistency(DseGraphOptions* options,
+                                        CassConsistency consistency);
+
 /**
  * Set the request timeout used by graph queries. Only use this if you want
  * graph queries to wait less than the server's default timeout (defined in
@@ -438,6 +464,20 @@ DSE_EXPORT CassError
 dse_graph_statement_bind_values(DseGraphStatement* statement,
                                 const DseGraphObject* values);
 
+
+/**
+ * Sets the graph statement's timestamp.
+ *
+ * @public @memberof DseGraphStatement
+ *
+ * @param[in] statement
+ * @param[in] timestamp
+ * @return CASS_OK if successful, otherwise an error occurred.
+ */
+CASS_EXPORT CassError
+dse_graph_statement_set_timestamp(DseGraphStatement* statement,
+                                  cass_int64_t timestamp);
+
 /***********************************************************************************
  *
  * Graph Object

include/dse.h

@@ -78,6 +78,18 @@ CassError dse_graph_options_set_graph_name_n(DseGraphOptions* options,
   return CASS_OK;
 }
 
+CassError dse_graph_options_set_read_consistency(DseGraphOptions* options,
+                                                 CassConsistency consistency) {
+  options->set_graph_read_consistency(consistency);
+  return CASS_OK;
+}
+
+CassError dse_graph_options_set_write_consistency(DseGraphOptions* options,
+                                                  CassConsistency consistency) {
+  options->set_graph_write_consistency(consistency);
+  return CASS_OK;
+}
+
 CassError dse_graph_options_set_request_timeout(DseGraphOptions* options,
                                                 cass_int64_t timeout_ms) {
   if (timeout_ms < 0) return CASS_ERROR_LIB_BAD_PARAMS;
@@ -110,6 +122,11 @@ CassError dse_graph_statement_bind_values(DseGraphStatement* statement,
   return statement->bind_values(values);
 }
 
+CassError dse_graph_statement_set_timestamp(DseGraphStatement* statement,
+                                            cass_int64_t timestamp) {
+  return statement->set_timestamp(timestamp);
+}
+
 DseGraphObject* dse_graph_object_new() {
   return DseGraphObject::to(new dse::GraphObject());
 }

src/graph.cpp

@@ -16,10 +16,12 @@
 #include <string>
 #include <vector>
 
-#define DSE_GRAPH_OPTION_LANGUAGE_KEY "graph-language"
-#define DSE_GRAPH_OPTION_SOURCE_KEY   "graph-source"
-#define DSE_GRAPH_OPTION_NAME_KEY     "graph-name"
-#define DSE_GRAPH_REQUEST_TIMEOUT     "request-timeout"
+#define DSE_GRAPH_OPTION_LANGUAGE_KEY          "graph-language"
+#define DSE_GRAPH_OPTION_SOURCE_KEY            "graph-source"
+#define DSE_GRAPH_OPTION_NAME_KEY              "graph-name"
+#define DSE_GRAPH_OPTION_READ_CONSISTENCY_KEY  "graph-read-consistency"
+#define DSE_GRAPH_OPTION_WRITE_CONSISTENCY_KEY "graph-write-consistency"
+#define DSE_GRAPH_REQUEST_TIMEOUT              "request-timeout"
 
 #define DSE_GRAPH_DEFAULT_LANGUAGE "gremlin-groovy"
 #define DSE_GRAPH_DEFAULT_SOURCE   "g"
@@ -62,6 +64,20 @@ class GraphOptions {
                               reinterpret_cast<const cass_byte_t*>(graph_name.data()), graph_name.size());
   }
 
+  void set_graph_read_consistency(CassConsistency consistency) {
+    const char* name = cass_consistency_string(consistency);
+    cass_custom_payload_set_n(payload_,
+                              DSE_GRAPH_OPTION_READ_CONSISTENCY_KEY, sizeof(DSE_GRAPH_OPTION_READ_CONSISTENCY_KEY) - 1,
+                              reinterpret_cast<const cass_byte_t*>(name), strlen(name));
+  }
+
+  void set_graph_write_consistency(CassConsistency consistency) {
+    const char* name = cass_consistency_string(consistency);
+    cass_custom_payload_set_n(payload_,
+                              DSE_GRAPH_OPTION_WRITE_CONSISTENCY_KEY, sizeof(DSE_GRAPH_OPTION_WRITE_CONSISTENCY_KEY) - 1,
+                              reinterpret_cast<const cass_byte_t*>(name), strlen(name));
+  }
+
   int64_t request_timeout_ms() const { return request_timeout_ms_; }
 
   void set_request_timeout_ms(int64_t timeout_ms);
@@ -185,6 +201,10 @@ class GraphStatement {
     }
   }
 
+  CassError set_timestamp(int64_t timestamp) {
+    return cass_statement_set_timestamp(wrapped_, timestamp);
+  }
+
 private:
   std::string query_;
   CassStatement* wrapped_;

src/graph.hpp

@@ -15,6 +15,31 @@
 #define GRAPH_ENABLE_STRICT \
   "schema.config().option('graph.schema_mode').set('production')"
 
+#define GRAPH_SCHEMA \
+  "schema.propertyKey('name').Text().ifNotExists().create();" \
+  "schema.propertyKey('age').Int().ifNotExists().create();" \
+  "schema.propertyKey('lang').Text().ifNotExists().create();" \
+  "schema.propertyKey('weight').Float().ifNotExists().create();" \
+  "schema.vertexLabel('person').properties('name', 'age').ifNotExists().create();" \
+  "schema.vertexLabel('software').properties('name', 'lang').ifNotExists().create();" \
+  "schema.edgeLabel('created').properties('weight').connection('person', 'software').ifNotExists().create();" \
+  "schema.edgeLabel('created').connection('software', 'software').add();" \
+  "schema.edgeLabel('knows').properties('weight').connection('person', 'person').ifNotExists().create();"
+
+#define GRAPH_DATA \
+  "Vertex marko = graph.addVertex(label, 'person', 'name', 'marko', 'age', 29);" \
+  "Vertex vadas = graph.addVertex(label, 'person', 'name', 'vadas', 'age', 27);" \
+  "Vertex lop = graph.addVertex(label, 'software', 'name', 'lop', 'lang', 'java');" \
+  "Vertex josh = graph.addVertex(label, 'person', 'name', 'josh', 'age', 32);" \
+  "Vertex ripple = graph.addVertex(label, 'software', 'name', 'ripple', 'lang', 'java');" \
+  "Vertex peter = graph.addVertex(label, 'person', 'name', 'peter', 'age', 35);" \
+  "marko.addEdge('knows', vadas, 'weight', 0.5f);" \
+  "marko.addEdge('knows', josh, 'weight', 1.0f);" \
+  "marko.addEdge('created', lop, 'weight', 0.4f);" \
+  "josh.addEdge('created', ripple, 'weight', 1.0f);" \
+  "josh.addEdge('created', lop, 'weight', 0.4f);" \
+  "peter.addEdge('created', lop, 'weight', 0.2f);"
+
 DseIntegration::DseIntegration()
   : Integration()
   , dse_session_() {}
@@ -42,27 +67,37 @@ void DseIntegration::connect() {
 void DseIntegration::create_graph(const std::string& graph_name,
   const std::string& replication_strategy,
   const std::string& duration) {
-    // Create the graph statement using the pre-determined replication config
-    test::driver::DseGraphObject graph_object;
-    graph_object.add<std::string>("name", graph_name);
-    graph_object.add<std::string>("replication", replication_strategy);
-    graph_object.add<std::string>("duration", duration);
-    test::driver::DseGraphStatement graph_statement(GRAPH_CREATE);
-    graph_statement.bind(graph_object);
-    CHECK_FAILURE;
+  // Create the graph statement using the pre-determined replication config
+  test::driver::DseGraphObject graph_object;
+  graph_object.add<std::string>("name", graph_name);
+  graph_object.add<std::string>("replication", replication_strategy);
+  graph_object.add<std::string>("duration", duration);
+  test::driver::DseGraphStatement graph_statement(GRAPH_CREATE);
+  graph_statement.bind(graph_object);
+  CHECK_FAILURE;
 
-    // Execute the graph statement and ensure it was created
-    dse_session_.execute(graph_statement);
-    CHECK_FAILURE;
+  // Execute the graph statement and ensure it was created
+  dse_session_.execute(graph_statement);
+  CHECK_FAILURE;
 
-    // Enable testing functionality for the graph
-    test::driver::DseGraphOptions options;
-    options.set_name(graph_name);
-    dse_session_.execute(GRAPH_ALLOW_SCANS, options);
-    CHECK_FAILURE;
-    dse_session_.execute(GRAPH_ENABLE_STRICT, options);
-    CHECK_FAILURE;
-  }
+  // Enable testing functionality for the graph
+  test::driver::DseGraphOptions options;
+  options.set_name(graph_name);
+  dse_session_.execute(GRAPH_ALLOW_SCANS, options);
+  CHECK_FAILURE;
+  dse_session_.execute(GRAPH_ENABLE_STRICT, options);
+  CHECK_FAILURE;
+}
+
+void DseIntegration::populate_classic_graph(const std::string& graph_name) {
+  // Initialize the graph pre-populated data
+  test::driver::DseGraphOptions options;
+  options.set_name(graph_name);
+  dse_session_.execute(GRAPH_SCHEMA, options);
+  CHECK_FAILURE;
+  dse_session_.execute(GRAPH_DATA, options);
+  CHECK_FAILURE;
+}
 
 void DseIntegration::create_graph(const std::string& duration /*= "PT30S"*/) {
   create_graph(test_name_, replication_strategy_, duration);

tests/src/integration/dse_integration.cpp

@@ -61,7 +61,7 @@ class DseIntegration : public Integration {
    * @param duration Maximum duration to wait for a traversal to evaluate
    * @see replication_factor_
    */
-  void DseIntegration::create_graph(const std::string& graph_name,
+  void create_graph(const std::string& graph_name,
     const std::string& replication_strategy,
     const std::string& duration);
 
@@ -73,7 +73,17 @@ class DseIntegration : public Integration {
    * @see test_name_
    * @see replication_strategy_
    */
-  void DseIntegration::create_graph(const std::string& duration = "PT30S");
+  void create_graph(const std::string& duration = "PT30S");
+
+  /**
+   * Populate the graph with the classic graph structure examples used in the
+   * TinkerPop documentation.
+   *
+   * @see http://tinkerpop.apache.org/docs/3.1.0-incubating/#intro
+   *
+   * @param graph_name Name of the graph to initialize
+   */
+  void populate_classic_graph(const std::string& graph_name);
 };
 
 #endif //__DSE_INTEGRATION_HPP__