Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix invalid 'data_type.typename' issue #17

Merged
merged 1 commit into from
May 15, 2016
Merged

Fix invalid 'data_type.typename' issue #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix invalid 'data_type.typename' issue
  • Loading branch information
Emad William Farag committed Mar 27, 2016
commit 269f7b9a06b79a1eb1e6d254f190870a51aff9cd
16 changes: 11 additions & 5 deletions cassandradump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@

args = None

def cql_type(v):
try:
return v.data_type.typename
except AttributeError:
return v.cql_type

def to_utf8(s):
return codecs.decode(s, 'utf-8')

Expand Down Expand Up @@ -55,12 +61,12 @@ def make_value_encoder(typename):
return lambda v : session.encoder.cql_encode_all_types(v) if v is None else e(v)

def make_value_encoders(tableval):
return dict((to_utf8(k), make_value_encoder(v.data_type.typename)) for k, v in tableval.columns.iteritems())
return dict((to_utf8(k), make_value_encoder(cql_type(v))) for k, v in tableval.columns.iteritems())

def make_row_encoder(tableevel):
partitions = dict(
(has_counter, list(to_utf8(k) for k, v in columns))
for has_counter, columns in itertools.groupby(tableval.columns.iteritems(), lambda (k, v): v.data_type.typename == 'counter')
for has_counter, columns in itertools.groupby(tableval.columns.iteritems(), lambda (k, v): cql_type(v) == 'counter')
)

keyspace_utf8 = to_utf8(keyspace)
Expand Down Expand Up @@ -333,9 +339,9 @@ def main():
sys.exit(1)

if args.protocol_version is not None:
if args.username is None or args.password is None:
sys.stderr.write('--username and --password must be specified\n')
sys.exit(1)
if args.username is None or args.password is None:
sys.stderr.write('--username and --password must be specified\n')
sys.exit(1)

session = setup_cluster()

Expand Down