Cassandra SE:

- added option thrift_port which allows to specify which port to connect to
- not adding username/password - it turns out, there are no authentication
  schemes in stock cassandra distribution.

3 files changed, 15 insertions, 11 deletions

diff --git a/storage/cassandra/cassandra_se.cc b/storage/cassandra/cassandra_se.cc
index 044e727e1c8..c6415e6a4aa 100644
--- a/storage/cassandra/cassandra_se.cc
+++ b/storage/cassandra/cassandra_se.cc
@@ -73,7 +73,7 @@ public:
   virtual ~Cassandra_se_impl(){ delete cass; }
   
   /* Connection and DDL checks */
-  bool connect(const char *host, const char *keyspace);
+  bool connect(const char *host, int port, const char *keyspace);
   void set_column_family(const char *cfname) { column_family.assign(cfname); }
 
   bool setup_ddl_checks();
@@ -135,7 +135,7 @@ Cassandra_se_interface *get_cassandra_se()
 }
 
 
-bool Cassandra_se_impl::connect(const char *host, const char *keyspace_arg)
+bool Cassandra_se_impl::connect(const char *host, int port, const char *keyspace_arg)
 {
   bool res= true;
   
@@ -143,7 +143,7 @@ bool Cassandra_se_impl::connect(const char *host, const char *keyspace_arg)
   
   try {
     boost::shared_ptr<TTransport> socket = 
-      boost::shared_ptr<TSocket>(new TSocket(host, 9160));
+      boost::shared_ptr<TSocket>(new TSocket(host, port));
     boost::shared_ptr<TTransport> tr = 
       boost::shared_ptr<TFramedTransport>(new TFramedTransport (socket));
     boost::shared_ptr<TProtocol> p = 
@@ -680,3 +680,4 @@ bool Cassandra_se_impl::get_next_multiget_row()
 }
 
 
+
diff --git a/storage/cassandra/cassandra_se.h b/storage/cassandra/cassandra_se.h
index d2ece4d9441..598267308af 100644
--- a/storage/cassandra/cassandra_se.h
+++ b/storage/cassandra/cassandra_se.h
@@ -17,7 +17,7 @@ public:
   
   virtual ~Cassandra_se_interface(){};
   /* Init */
-  virtual bool connect(const char *host, const char *port)=0;
+  virtual bool connect(const char *host, int port, const char *keyspace)=0;
   virtual void set_column_family(const char *cfname) = 0;
    
   /* Check underlying DDL */
@@ -82,3 +82,4 @@ extern Cassandra_status_vars cassandra_counters;
 
 
 Cassandra_se_interface *get_cassandra_se();
+
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index b6983be498a..c2570ad7a3a 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -38,7 +38,8 @@ mysql_mutex_t cassandra_mutex;
 
 struct ha_table_option_struct
 {
-  const char *host;
+  const char *thrift_host;
+  int         thrift_port;
   const char *keyspace;
   const char *column_family;
 };
@@ -49,7 +50,8 @@ ha_create_table_option cassandra_table_option_list[]=
   /*
     one option that takes an arbitrary string
   */
-  HA_TOPTION_STRING("thrift_host", host),
+  HA_TOPTION_STRING("thrift_host", thrift_host),
+  HA_TOPTION_NUMBER("thrift_port", thrift_port, 9160, 1, 65535, 0),
   HA_TOPTION_STRING("keyspace", keyspace),
   HA_TOPTION_STRING("column_family", column_family),
   HA_TOPTION_END
@@ -283,14 +285,14 @@ int ha_cassandra::open(const char *name, int mode, uint test_if_locked)
   
   ha_table_option_struct *options= table->s->option_struct;
   fprintf(stderr, "ha_cass: open thrift_host=%s keyspace=%s column_family=%s\n", 
-          options->host, options->keyspace, options->column_family);
+          options->thrift_host, options->keyspace, options->column_family);
   
   DBUG_ASSERT(!se);
-  if (!options->host || !options->keyspace || !options->column_family)
+  if (!options->thrift_host || !options->keyspace || !options->column_family)
     DBUG_RETURN(HA_WRONG_CREATE_OPTION);
   se= get_cassandra_se();
   se->set_column_family(options->column_family);
-  if (se->connect(options->host, options->keyspace))
+  if (se->connect(options->thrift_host, options->thrift_port, options->keyspace))
   {
     my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), se->error_str());
     DBUG_RETURN(HA_ERR_NO_CONNECTION);
@@ -389,7 +391,7 @@ int ha_cassandra::create(const char *name, TABLE *table_arg,
 */
 #endif
   DBUG_ASSERT(!se);
-  if (!options->host  || !options->keyspace || !options->column_family)
+  if (!options->thrift_host  || !options->keyspace || !options->column_family)
   {
     my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), 
              "thrift_host, keyspace, and column_family table options must be specified");
@@ -397,7 +399,7 @@ int ha_cassandra::create(const char *name, TABLE *table_arg,
   }
   se= get_cassandra_se();
   se->set_column_family(options->column_family);
-  if (se->connect(options->host, options->keyspace))
+  if (se->connect(options->thrift_host, options->thrift_port, options->keyspace))
   {
     my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), se->error_str());
     DBUG_RETURN(HA_ERR_NO_CONNECTION);