Skip to content

Commit

Permalink
0.7 uses Clocks instead of raw timestamps
Browse files Browse the repository at this point in the history
  • Loading branch information
b committed Jun 13, 2010
1 parent ca79930 commit 73cdaf3
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 28 deletions.
1 change: 1 addition & 0 deletions lib/cassandra.rb
Expand Up @@ -24,6 +24,7 @@ class Cassandra ; end
require 'cassandra/long'
require 'cassandra/ordered_hash'
require 'cassandra/columns'
require "cassandra/#{Cassandra.VERSION}/columns"
require "cassandra/#{Cassandra.VERSION}/protocol"
require "cassandra/cassandra"
require "cassandra/#{Cassandra.VERSION}/cassandra"
Expand Down
35 changes: 35 additions & 0 deletions lib/cassandra/0.6/columns.rb
@@ -0,0 +1,35 @@
class Cassandra
# A bunch of crap, mostly related to introspecting on column types
module Columns #:nodoc:
private

def _standard_insert_mutation(column_family, column_name, value, timestamp)
CassandraThrift::Mutation.new(
:column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
:column => CassandraThrift::Column.new(
:name => column_name_class(column_family).new(column_name).to_s,
:value => value,
:timestamp => timestamp
)
)
)
end

def _super_insert_mutation(column_family, super_column_name, sub_columns, timestamp)
CassandraThrift::Mutation.new(:column_or_supercolumn =>
CassandraThrift::ColumnOrSuperColumn.new(
:super_column => CassandraThrift::SuperColumn.new(
:name => column_name_class(column_family).new(super_column_name).to_s,
:columns => sub_columns.collect { |sub_column_name, sub_column_value|
CassandraThrift::Column.new(
:name => sub_column_name_class(column_family).new(sub_column_name).to_s,
:value => sub_column_value.to_s,
:timestamp => timestamp
)
}
)
)
)
end
end
end
35 changes: 35 additions & 0 deletions lib/cassandra/0.7/columns.rb
@@ -0,0 +1,35 @@
class Cassandra
# A bunch of crap, mostly related to introspecting on column types
module Columns #:nodoc:
private

def _standard_insert_mutation(column_family, column_name, value, timestamp)
CassandraThrift::Mutation.new(
:column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
:column => CassandraThrift::Column.new(
:name => column_name_class(column_family).new(column_name).to_s,
:value => value,
:clock => CassandraThrift::Clock.new(:timestamp => timestamp)
)
)
)
end

def _super_insert_mutation(column_family, super_column_name, sub_columns, timestamp)
CassandraThrift::Mutation.new(:column_or_supercolumn =>
CassandraThrift::ColumnOrSuperColumn.new(
:super_column => CassandraThrift::SuperColumn.new(
:name => column_name_class(column_family).new(super_column_name).to_s,
:columns => sub_columns.collect { |sub_column_name, sub_column_value|
CassandraThrift::Column.new(
:name => sub_column_name_class(column_family).new(sub_column_name).to_s,
:value => sub_column_value.to_s,
:clock => CassandraThrift::Clock.new(:timestamp => timestamp)
)
}
)
)
)
end
end
end
28 changes: 0 additions & 28 deletions lib/cassandra/columns.rb
Expand Up @@ -74,33 +74,5 @@ def columns_to_hash_for_classes(columns, column_name_class, sub_column_name_clas
hash
end

def _standard_insert_mutation(column_family, column_name, value, timestamp)
CassandraThrift::Mutation.new(
:column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
:column => CassandraThrift::Column.new(
:name => column_name_class(column_family).new(column_name).to_s,
:value => value,
:timestamp => timestamp
)
)
)
end

def _super_insert_mutation(column_family, super_column_name, sub_columns, timestamp)
CassandraThrift::Mutation.new(:column_or_supercolumn =>
CassandraThrift::ColumnOrSuperColumn.new(
:super_column => CassandraThrift::SuperColumn.new(
:name => column_name_class(column_family).new(super_column_name).to_s,
:columns => sub_columns.collect { |sub_column_name, sub_column_value|
CassandraThrift::Column.new(
:name => sub_column_name_class(column_family).new(sub_column_name).to_s,
:value => sub_column_value.to_s,
:timestamp => timestamp
)
}
)
)
)
end
end
end

0 comments on commit 73cdaf3

Please sign in to comment.