Merge pull request #4 from PerimeterX/dev-cass-3

Cassandra 3 compatibility

Author: eladamitpxi

CONTRIBUTORS

@@ -6,3 +6,4 @@ Contributors:
 * Elad Amit (eladamitpxi, amitelad7)
 * Valentin Fischer (valentinul)
 * tansinee
+* Pitsanu Swangpheaw (roongr2k7)

lib/logstash/outputs/cassandra/event_parser.rb

@@ -122,8 +122,6 @@ def convert_value_to_cassandra_type(event_data, cassandra_type)
           return ::Cassandra::Types::Inet.new(event_data)
         when 'float'
           return ::Cassandra::Types::Float.new(event_data)
-        when 'varchar'
-          return ::Cassandra::Types::Varchar.new(event_data)
         when 'text'
           return ::Cassandra::Types::Text.new(event_data)
         when 'blob'

logstash-output-cassandra.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cassandra'
-  s.version         = '0.9.2'
+  s.version         = '1.0.0'
   s.licenses        = [ 'Apache License (2.0)' ]
   s.summary         = 'Store events into Cassandra'
   s.description     = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency 'concurrent-ruby'
   s.add_runtime_dependency 'logstash-core', '>= 2.0.0', '< 3.0.0'
-  s.add_runtime_dependency 'cassandra-driver', '>= 2.0.0', '< 3.0.0'
+  s.add_runtime_dependency 'cassandra-driver', '>= 3.0.0'
   s.add_development_dependency 'cabin', ['~> 0.6']
   s.add_development_dependency 'longshoreman'
   s.add_development_dependency 'logstash-devutils'

spec/integration/outputs/cassandra_spec.rb

@@ -86,7 +86,6 @@ def assert_proper_insert(type_to_test)
       { type: 'timestamp', value: 1457606758, assert_override: Helper::get_assert_timestamp_equallity() },
       { type: 'inet', value: '192.168.99.100' },
       { type: 'float', value: '10.050000190734863' },
-      { type: 'varchar', value: 'some chars' },
       { type: 'text', value: 'some text' },
       { type: 'blob', value: 'a blob' },
       { type: 'ascii', value: 'some ascii' },

spec/integration/outputs/integration_helper.rb

@@ -5,7 +5,7 @@
 
 CONTAINER_NAME = "logstash-output-cassandra-#{rand(999).to_s}"
 CONTAINER_IMAGE = 'cassandra'
-CONTAINER_TAG = '2.2'
+CONTAINER_TAG = '3'
 
 module CassandraHelper
   def get_host_ip

spec/unit/outputs/event_parser_spec.rb

@@ -108,7 +108,6 @@
           { :name => 'timestamp', :type => ::Cassandra::Types::Timestamp, :value => 1457606758, expected: Time.at(1457606758) },
           { :name => 'inet',      :type => ::Cassandra::Types::Inet,      :value => '0.0.0.0' },
           { :name => 'float',     :type => ::Cassandra::Types::Float,     :value => '10.15' },
-          { :name => 'varchar',   :type => ::Cassandra::Types::Varchar,   :value => 'a varchar' },
           { :name => 'text',      :type => ::Cassandra::Types::Text,      :value => 'some text' },
           { :name => 'blob',      :type => ::Cassandra::Types::Blob,      :value => '12345678' },
           { :name => 'ascii',     :type => ::Cassandra::Types::Ascii,     :value => 'some ascii' },
@@ -261,7 +260,7 @@
 
   describe 'ignore_bad_values is turned on' do
     [
-        { :name => 'timestamp', :value => 'i dont have to_time',      :expected => Time::parse('1970-01-01 00:00:00 +0000') },
+        { :name => 'timestamp', :value => 'i dont have to_time',      :expected => Time::parse('1970-01-01 00:00:00 +0000').localtime },
         { :name => 'inet',      :value => 'i am not an inet address', :expected => '0.0.0.0' },
         { :name => 'float',     :value => 'i am not a float',         :expected => 0.0 },
         { :name => 'bigint',    :value => 'i am not a bigint',        :expected => 0 },