Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: spladug/pycassa
head fork: pycassa/pycassa
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 02, 2011
@thobbs thobbs Try out the github README syntax hilighting 77d6959
@thobbs thobbs A bit more README experimentation fb67a2d
Commits on Nov 12, 2011
@thobbs thobbs Merge branch 'master' of
Commits on Jan 16, 2012
@thobbs thobbs Merge remote-tracking branch 'pycassa/master' be0cbbf
Commits on May 03, 2012
@thobbs thobbs Merge remote-tracking branch 'pycassa/master' 7081bd4
Commits on May 23, 2012
@canadianveggie canadianveggie Fix bug in system_manager.alter_column_family where default_validatio…
…n_class is ignored
Commits on May 24, 2012
@thobbs thobbs Merge pull request #146 from pulseenergy/master
Fixing bug in system_manager.alter_column_family() where default_validation_class is ignored
@zachhuff386 zachhuff386 Misssing AuthenticationException and AuthorizationException dff6dee
@gilles gilles stats logger 88d6e1c
@spladug Simplify compatibility code for struct packing. fb76e93
Commits on May 25, 2012
@thobbs thobbs Merge pull request #147 from zachhuff386/master
Missing AuthenticationException and AuthorizationException
Commits on May 26, 2012
@spladug Handle timezones more cleanly when autopacking/unpacking.
Previously, datetime objects were assumed to be in local time. Now,
naive objects are expected to be in UTC and timezone-aware objects
will be converted to UTC for storage.
Commits on May 29, 2012
@thobbs thobbs Check for utctimetuple attr instead of timetuple 373f262
@thobbs thobbs Merge branch 'merge-utc' b9110f2
@thobbs thobbs Add docstring info about batch counter increments
Fixes #129
Commits on May 31, 2012
@robingustafsson robingustafsson Added counter column support to xget 4b90354
Commits on Jun 09, 2012
@thobbs thobbs Merge pull request #152 from robingustafsson/master
Support for counter columns in xget
Commits on Jun 19, 2012
@thobbs thobbs Merge pull request #148 from formspring/master
Stats logger
@thobbs thobbs Use assert_raises from instead of numpy e3d87b9
Commits on Jun 21, 2012
@thobbs thobbs Satisfy the OCD
Fixes #154
@thobbs thobbs Undo bad sorting in pycassaShell's describe_keyspace
Affects #154
Commits on Jun 28, 2012
@rchowe rchowe Added missing colon for for loop in pycassaShell 7304fb8
@thobbs thobbs Merge pull request #157 from rchowe/master
Added missing colon in pycassaShell
Commits on Jul 02, 2012
@hannosch hannosch Add missing SkipTest import
This was raised while running tests against old C* 0.8.x versions.
Commits on Jul 17, 2012
@thobbs thobbs Merge pull request #160 from hannosch/missing_skiptest_import
Add missing SkipTest import
@hannosch hannosch ignore virtualenv directories 0203837
@hannosch hannosch Add new Cassandra 1.1.0 thrift API 5e1e1b6
@hannosch hannosch Explain the Thrift Python API generation process to new contributors. 55ad665
@hannosch hannosch Update API to latest C* 1.1.1 (19.32.0) 195a302
@hannosch hannosch update docs to point to C* 1.1 332800a
@hannosch hannosch Manually add missing TApplicationException import bcdc490
@hannosch hannosch Revert change to wrong c10 module
This reverts commit 302dacf.
@hannosch hannosch Manually add missing TApplicationException import f53253f
@hannosch hannosch Update default imports to c11 and add test for pre-1.1 CF cache settings 8c76d0d
@hannosch hannosch adjust version check - C* 1.1.0 reports 19.30.0 via `describe_version()`
but 19.20.0 via `version` as `c11.constants.VERSION` is the newer `19.32.0`
@hannosch hannosch add the new `caching` argument to CF related functions in system_manager 02a7c38
@thobbs thobbs Only keep c* 1.1 thrift definitions 21dc860
@thobbs thobbs Don't explicitly list CfDef attrs as SysMan method params 194a195
@thobbs thobbs Remove API version check on Connection init c95d873
@thobbs thobbs Remove version-specific modules from e121826
@thobbs thobbs Update tests to match API changes d39f23b
@thobbs thobbs Add Hanno Schlichting to AUTHORS c482e6b
@thobbs thobbs Update README version compat, dev docs a5b317c
@thobbs thobbs Allow arbitrary ksdef attributes to be set ccaf770
@thobbs thobbs Add documentation for xget() 1adde9c
Commits on Jul 18, 2012
@hannosch hannosch Let the pool retry TTransportException instead of the general TException
With the c11 thrift API update, all exceptions in ttypes inherit from
TException instead of Exception. This change restores the old behavior and
does not retry any of: NotFoundException, InvalidRequestException,
AuthenticationException, AuthorizationException, SchemaDisagreementException

Compared to pycassa 1.6.0 TProtocolException is no longer retried either.
@hannosch hannosch Add explicit test for NotFoundException 83c6da6
@hannosch hannosch Apply TException to TTransportException change to pool create connection 00cd392
Commits on Jul 23, 2012
@thobbs thobbs Merge pull request #164 from hannosch/c11-exception-changes
C11 exception base class changes vs. pool retry
@thobbs thobbs Use long instead of int for test comparison 64f2fb6
@thobbs thobbs Raise TypeError on bad ColFam init kwargs
Fixes #165
Commits on Jul 24, 2012
@thobbs thobbs More documentation for StatsLogger b5512d5
@thobbs thobbs Add xget() method signature to docs 1ca76c5
@thobbs thobbs Fill out missing API doc sections 2e3253a
@thobbs thobbs Bump version to 1.7.0, update changelogs e74631a
@thobbs thobbs Add column_buffer_size to ColFam docs 5423484
@thobbs thobbs Add docstring for column_buffer_size 7d6bc1f
Commits on Aug 10, 2012
@f0rk f0rk Fix debian packaging 4411387
@thobbs thobbs Update AUTHORS 2dd02da
Commits on Aug 19, 2012
@thobbs thobbs Correctly pack slice ends for xget()
Fixes #167
Commits on Aug 20, 2012
@thobbs thobbs Add buffer_size to multiget signature in api docs 92de56f
Commits on Sep 04, 2012
@thobbs thobbs Add DecimalType support
Fixes #102
@thobbs thobbs Add __version__ attr to pycassa module, use for,
Fixes #166
@thobbs thobbs Add DecimalType to API docs 69df18c
@thobbs thobbs Bump version to 1.7.1, update changelog b0f4b37
Commits on Sep 07, 2012
@thobbs thobbs Avoid cyclic deps when installing
If the pycassa module is imported in,
it will currently end up trying to import thrift. This
causes issues when installing pycassa, as thrift may not
yet be available.
Commits on Sep 21, 2012
@thobbs thobbs Introduce SASL transport support
While the TSaslClientTransport is not in mainline thrift,
it will be bundled in the connection module.

The user may now provide a transport_factory function that
will be used to create transports for new connections. As a
convenience, the pycassa.connection.make_sasl_transport_factor()
function will capture SASL parameters in a closure and return
a factory function, but the user is also free to define their
own factory function.
Commits on Sep 24, 2012
@hannosch hannosch Update to protocol 19.34.0 (C* 1.2b1) ffc3849
@thobbs thobbs Merge pull request #172 from hannosch/protocol-19.34.0
Update to protocol 19.34.0 (C* 1.2b1)
@hannosch hannosch add a travis-ci spec file ff48132
@hannosch hannosch cassandra is pre-installed on travis (currently 1.1.5) 8e72eb8
@hannosch hannosch the virtualenv is not located in the current directory 50b9284
Commits on Sep 25, 2012
@thobbs thobbs Fix single-component composite packing for inserts 7e63cd6
@thobbs thobbs Pass host, port to transport factory, update demo 4475ff2
Commits on Oct 09, 2012
@thobbs thobbs Rename sasl_host/service to just host/service b8951ec
Commits on Oct 17, 2012
@thobbs thobbs Merge pull request #173 from hannosch/travis-ci
Travis-ci CI setup
@thobbs thobbs Increase pool timeout in large tests 11ef925
@thobbs thobbs Bump version to 1.7.2, update changelog faf27ab
@thobbs thobbs Also skip range tests if using Murmur3Partitioner ce6f532
Commits on Oct 18, 2012
@hannosch hannosch Annoy thobbs with travis failure mails 3709771
@thobbs thobbs Fix composite example return value typo fa372b6
Commits on Oct 26, 2012
@thobbs thobbs Add reset() method to StatsLogger 6027b3c
@thobbs thobbs Replace test stats logger with real, threadsafe version e03e591
Commits on Nov 05, 2012
@iamaleksey iamaleksey Add socket_factory and SSL socket support c3e4c07
@hannosch hannosch avoid installing thrift 0.9.0 under Python 2.5 or earlier
it's no longer compatible with those versions
Commits on Nov 08, 2012
@thobbs thobbs Merge remote-tracking branch 'origin/sasl-support' into security
@thobbs thobbs Remove 487aa26
@thobbs thobbs Merge branch 'security' 4312053
@thobbs thobbs Add Aleksey Yeschenko to AUTHORS 0f5b020
Commits on Nov 09, 2012
@thobbs thobbs Merge branch 'master' of c4ca94c
@hannosch hannosch Require at least Python 2.6
Remove some backwards compatibility code and update docs
@thobbs thobbs Merge remote-tracking branch 'hannosch/no-python25' 711b93f
@thobbs thobbs Make the version 1.8.0-SNAPSHOT for now 54d5bc3
@hannosch hannosch try installing jna on travis-ci 43198d1
@thobbs thobbs Show Travis CI build status in README 4b8741c
Commits on Nov 10, 2012
@hannosch hannosch Regenerate thrift code using version 0.9 903dbd3
@hannosch hannosch Update to protocol 19.35.0 (C* 1.2.0-beta2) 73862c4
Commits on Nov 14, 2012
@thobbs thobbs Merge pull request #177 from hannosch/protocol-19.35.0
Protocol 19.35.0 and thrift 0.9
Commits on Dec 05, 2012
@katzj katzj Look at object parents when mapping to column families
Using self.cls.__dict__ only looks at the members of the class and
not any parents.  Better to use inspect.getmembers() for this
purpose and get the full hierarchy
@thobbs thobbs Merge pull request #181 from katzj/cfmap-objects-inherit
Look at object parents when mapping to column families
Commits on Jan 08, 2013
@umairmufti umairmufti Added support for DynamicCompositeType. 0e3c1b5
Commits on Jan 11, 2013
@thobbs thobbs Merge pull request #183 from umairmufti/develop
Added support for DynamicCompositeType.
Commits on Jan 18, 2013
@eyalr eyalr Adding stub objects for ColumnFamily, ConnectionPool, and SystemManager f5c794a
Commits on Jan 19, 2013
@thobbs thobbs Specify correct uuid variant in convert_time_to_uuid
Related to #180
@thobbs thobbs Add 900ns to timestamp when creating highest timeuuid
Fixes #180
Commits on Jan 24, 2013
@eyalr eyalr Adding unit tests for stubs that ensure the APIs and functionality li…
…ne up. Added some missing functionality to the stub objects as well, to make it more closely line up to the API.
Commits on Jan 25, 2013
@thobbs thobbs Set keyspace on conn after (potentially) logging in
Authenticators may require that users be logged in prior to
executing set_keyspace() now in order to avoid leaking info
about what keyspaces exist.
Commits on Jan 28, 2013
@thobbs thobbs Don't return closed connections to the pool 71ed5b9
Commits on Jan 31, 2013
@thobbs thobbs Merge pull request #185 from eventbrite/stubs
Adding stub objects for ColumnFamily, ConnectionPool, and SystemManager
Commits on Feb 12, 2013
@thobbs thobbs Update AUTHORS 588b58c
@thobbs thobbs Bump version to 1.8.0, update changelog 0b2ce9b
@thobbs thobbs Add contrib package to, make version 1.8.1-SNAPSHOT 9dd31f8
Commits on Feb 13, 2013
Andre Cruz Reduce critical section so as not to block unnecessarily. 003ddb6
Andre Cruz Reduce critical section even more. Use lock only to update counters. 37f2c7a
Commits on Feb 14, 2013
Andre Cruz Small re-factorization. 878fa81
Andre Cruz Another round at re-factoring this. e17705c
Andre Cruz Prevent situation in which an attempt to obtain a connection would fa…
…il without even waiting for queue.
Commits on Feb 15, 2013
@thobbs thobbs Merge pull request #189 from edevil/master
Reduce critical section protected by global lock
Commits on Feb 25, 2013
@thobbs thobbs Point download_url at tag tarballs 295e12f
Commits on Feb 26, 2013
@thobbs thobbs Remove download_url from
Github stopped providing download hosting, and it was
decided on the user ML that there's no need to set
download_url at all -- the normal pypi tarball will
Commits on Mar 12, 2013
@termie termie fix example code in Getting a ColumnFamily
the "pycassa" module is neither imported nor needed
Commits on Mar 15, 2013
@hannosch hannosch Merge pull request #192 from termie/master
fix example code in Getting a ColumnFamily
Commits on Apr 10, 2013
@david-huber david-huber adding column start and end to get for non-composite keys 5cd9191
@david-huber david-huber adding column_start and column_finish to multiget d65295d
Commits on Apr 11, 2013
@david-huber david-huber updating stubs.rst af25e70
Commits on Apr 25, 2013
@thobbs thobbs Merge pull request #195 from david-huber/master
Add column_start and column_finish support to pycassa.contrib.stubs.ColumnFamilyStub
Commits on Apr 30, 2013
Andre Cruz Added include_ttl parameter so that column TTL's are returned as well…
…. It can work alongside include_timestamp.
Commits on May 02, 2013
@david-huber david-huber adding support for column_count. ColumnFamilyStub.get needs to sort c…
…olumns before slicing them. Insert order doesn't matter, so changing the dict object used.
@david-huber david-huber updating stubs docs afd9d7e
@david-huber david-huber adding support for column_reversed 1327356
Commits on May 03, 2013
@thobbs thobbs Merge pull request #198 from david-huber/master
Adding column_count and column_reversed support to ColumnFamilyStub.get and ColumnFamityStub.multiget
Commits on May 06, 2013
@thobbs thobbs Merge pull request #197 from edevil/master
Add "include_ttl" parameter that allows column TTL's to be returned as well
Commits on May 28, 2013
@thobbs thobbs Bump version to 1.9.0, update changelog 00f111e
Commits on Jun 20, 2013
@thobbs thobbs Accurate docstring for gm_timestamp
Fixes #202
Commits on Jul 03, 2013
Andre Cruz When a connection is recycled, and the pool is full, the old connecti…
…on would be disposed twice.

This would happen because the Queue.Full exception would be raised, and so "conn"" would be the old connection that has already been disposed. This connection would again be disposed due to the Full exception.
@thobbs thobbs Merge pull request #205 from edevil/DisposeRecycled
When a connection is recycled, and the pool is full, the old connection would be disposed twice.
Commits on Jul 17, 2013
@thobbs thobbs Use temporary Travis workaround for C* 67a9fd1
Commits on Jul 19, 2013
@thobbs thobbs Handle empty strings for IntegerType values
Fixes #206
Commits on Jul 20, 2013
André Cruz Merge branch 'master', remote-tracking branch 'origin' fda2b4e
Commits on Jul 26, 2013
Andre Cruz Use a lock around all updates to shared state.
Prevent closed connections from ending up in the pool (Mutator uses "return_to_pool"). Since current_conns has already been decremented, the pool would reach a state where a new connection was always opened but could not be put in the queue since it was full.
Commits on Jul 29, 2013
André Cruz Corrected tests. 8d664ba
Commits on Jul 30, 2013
@pilate pilate Allow ranging over ring tokens
Would close #170
@thobbs thobbs Move conn transport check to ConnectionPool.put()
Connection.return_to_pool() also goes through this method
@thobbs thobbs Use with statement for pool lock acquisition da20f70
@pilate pilate Handle more than one iteration
Fix kwargs
@pilate pilate Set buffer length at correct location
Added incompatible argument exception
@pilate pilate Replacing newline 486667f
Commits on Jul 31, 2013
@thobbs thobbs Stricter check on incompatible get_range() arguments 3664309
@thobbs thobbs Add docs for start_token, end_token f26d6a9
@thobbs thobbs Fix requireOPP test decorator aead733
@thobbs thobbs Handle false-y start and finish_token 9ff9bdb
@thobbs thobbs Tests for get_range by token, minor fixes 02cac9f
@thobbs thobbs Merge branch '211-merge' d5b666b
Commits on Aug 02, 2013
Andre Cruz Make sure connection count is decremented as we are disposing connect…
…ions from pool.

Remove unused var.
Commits on Aug 05, 2013
@thobbs thobbs Merge pull request #213 from edevil/MissingDec
Make sure connection count is decremented as we are disposing connection...
Commits on Aug 16, 2013
@thobbs thobbs Bump version to 1.9.1, update changelog 30bee0c
Commits on Sep 17, 2013
@thobbs thobbs Fix docstring for start/finish_token formats
The tokens only need to be hex encoded when using
@thobbs thobbs Make master branch version 1.9.1+ d5f764f
Commits on Oct 03, 2013
@rbranson rbranson Support for atomic batches 5224ada
@thobbs thobbs Merge pull request #215 from rbranson/atomic-batches
Support for atomic batches
@thobbs thobbs Remove extra newlines 3b2a893
@thobbs thobbs Update changelog, bump version to 1.10.0 a80ac67
@thobbs thobbs Bump version to 1.10.0+ post-release e728703
Commits on Oct 17, 2013
@kurtjx kurtjx hacky pass at uuid sorting 2d543a0
Commits on Oct 18, 2013
@thobbs thobbs Preserve stacktrace on TApplicationException 803ef57
Commits on Nov 06, 2013
@bjornedstrom bjornedstrom Update interface to 19.36.1. bf680fe
Commits on Nov 29, 2013
@a13x a13x remove returns timestamp
Stub should behave as the "real" thing.
Commits on Jan 10, 2014
@thobbs thobbs Merge pull request #223 from a13x/patch-1
remove returns timestamp
@thobbs thobbs Merge pull request #219 from bjornedstrom/master
Update interface to 19.36.1.
@thobbs thobbs Remove Travic CI workaround e1017c5
@thobbs thobbs Merge branch 'travis-fix' 22f3468
@thobbs thobbs Wait for and verify C* startup in Travis edbf064
Commits on Jan 14, 2014
@thobbs thobbs Upgrade to latest c841381
@thobbs thobbs Update changelog, bump version to 1.11.0 820bbc2
@thobbs thobbs Set post-release version 92af27d
@thobbs thobbs Add LOCAL_ONE to API docs 7ffe498
@thobbs thobbs Add TimestampType alias for DateType
Cassandra 2.0 added TimestampType, which is the same as DateType except
for the sorting of pre-epoch (negative) unix timestamps.

Fixes #225
Commits on Feb 04, 2014
@kurtjx kurtjx superficial test and uuid.time approach bf5f7cd
@kurtjx kurtjx whoops, fix my superficial test so it imports stuff it needs 0fddc32
@thobbs thobbs Merge pull request #218 from kurtjx/master
hacky pass at uuid sorting
@thobbs thobbs Stubs and tests minor cleanup 6ce8d7c
Commits on Feb 06, 2014
@thobbs thobbs Add readme note about cql/native protocol e9baafb
Commits on Feb 20, 2014
@pgorla pgorla Add token map to system_manager. 2446a15
Commits on Mar 21, 2014
@decbis decbis Corrected StatsLogger example.
It suggested that the stats would be a property of the ConnectionPool.
Commits on Apr 07, 2014
@sbadia sbadia [debian] Bump to 1.11.0 and fix lintian errors
Lintian fixes:
- usused-build-dependency-on-cdbs
- *-nmu (non maintainer upload)
- latest-debian-changelog-entry-changed-to-native
- missing-license-paragraph-in-dep5-copyright
Commits on Apr 10, 2014
@thobbs thobbs Merge pull request #227 from thelastpickle/issue-1
Add token map to system_manager.
@thobbs thobbs Merge pull request #231 from sbadia/debian
[debian] Bump to 1.11.0 and fix lintian errors
@thobbs thobbs Merge pull request #230 from decbis/master
Corrected StatsLogger example.
@sbadia sbadia [debian] Add depends on libjs-underscore for pycassa-doc
Fix lintian warning « embedded-javascript-library »
for usr/share/doc/pycassa-doc/manual/_static/underscore.js
Refer to Debian Policy Manual section 4.13 (Convenience copies of code)
@sbadia sbadia [debian] wrap and sort d/control file 028111b
@sbadia sbadia [debian] Add registration into doc-base
@sbadia sbadia [debian] Add myself as uploader and update changelog 8a4b4ad
Commits on Apr 11, 2014
@thobbs thobbs Merge pull request #232 from sbadia/debian
Update for debian release
@sbadia sbadia [debian] Update d/rules and switch to non-native package
- Cleaned debian/rules by using python2 and sphinxdoc
- Added debian/watch file
- Override get-orig-source (remove .git and debian dir. from .orig tgz)
@thobbs thobbs Merge pull request #233 from sbadia/debian
[debian] Update d/rules and switch to non-native package
Commits on Apr 21, 2014
@dkong dkong Fix typos in "Composite Types" doc f64ece4
Commits on Apr 22, 2014
@thobbs thobbs Merge pull request #234 from dkong/fix_doc_typo
Fix typos in "Composite Types" doc
Commits on May 02, 2014
@thobbs thobbs Add notes about using the native protocol driver 5a8fbbd
@thobbs thobbs Fix readme, doc formatting 7441430
Commits on Aug 07, 2014
@stevemer stevemer Fix documentation typos (it's bothered me for months) 65e1196
@thobbs thobbs Merge pull request #237 from stevemer/master
Fix documentation typos (it's bothered me for months)
Dave Brueck fixed minor docstring typos 6ed9e0b
Commits on Aug 08, 2014
@thobbs thobbs Merge pull request #239 from dfb/master
fixed minor docstring typos
Commits on Jan 07, 2015
@thobbs thobbs Update changelog, bump version to 1.11.1 6ef8710
@thobbs thobbs set post-release version 3be0766