cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 20 Mar 2015 15:31:41 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	bin/cqlsh


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/237d0bc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/237d0bc6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/237d0bc6

Branch: refs/heads/trunk
Commit: 237d0bc62ebc6e83e900a6c5ae8e342ad8bf84c3
Parents: 61c8ff4 7110904
Author: Tyler Hobbs <tylerhobbs@apache.org>
Authored: Fri Mar 20 10:30:28 2015 -0500
Committer: Tyler Hobbs <tylerhobbs@apache.org>
Committed: Fri Mar 20 10:30:28 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                    |   1 +
 bin/cqlsh                      | 290 +++++++++++++++++++++++++++++-------
 pylib/cqlshlib/async_insert.py | 115 --------------
 pylib/cqlshlib/meter.py        |  59 --------
 4 files changed, 237 insertions(+), 228 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/237d0bc6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cd39890,a142999..1c4e9f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 +3.0
 + * Partition intra-cluster message streams by size, not type (CASSANDRA-8789)
 + * Add WriteFailureException to native protocol, notify coordinator of
 +   write failures (CASSANDRA-8592)
 + * Convert SequentialWriter to nio (CASSANDRA-8709)
 + * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 8761, 8850)
 + * Record client ip address in tracing sessions (CASSANDRA-8162)
 + * Indicate partition key columns in response metadata for prepared
 +   statements (CASSANDRA-7660)
 + * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
 + * Avoid memory allocation when searching index summary (CASSANDRA-8793)
 + * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
 + * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
 + * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
 + * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
 + * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
 + * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
 + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
 + * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
 + * Support direct buffer decompression for reads (CASSANDRA-8464)
 + * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
 + * Group sstables for anticompaction correctly (CASSANDRA-8578)
 + * Add ReadFailureException to native protocol, respond
 +   immediately when replicas encounter errors while handling
 +   a read request (CASSANDRA-7886)
 + * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
 + * Allow mixing token and partition key restrictions (CASSANDRA-7016)
 + * Support index key/value entries on map collections (CASSANDRA-8473)
 + * Modernize schema tables (CASSANDRA-8261)
 + * Support for user-defined aggregation functions (CASSANDRA-8053)
 + * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
 + * Refactor SelectStatement, return IN results in natural order instead
 +   of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
 + * Support UDTs, tuples, and collections in user-defined
 +   functions (CASSANDRA-7563)
 + * Fix aggregate fn results on empty selection, result column name,
 +   and cqlsh parsing (CASSANDRA-8229)
 + * Mark sstables as repaired after full repair (CASSANDRA-7586)
 + * Extend Descriptor to include a format value and refactor reader/writer
 +   APIs (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any partition key column (CASSANDRA-7855)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
 +   7924, 7812, 8063, 7813, 7708)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * Improve concurrency of repair (CASSANDRA-6455, 8208)
 + * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
 + * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
 + * Generalize progress reporting (CASSANDRA-8901)
 + * Resumable bootstrap streaming (CASSANDRA-8838)
 +
  2.1.4
+  * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
   * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
   * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
   * SSTableScanner enforces its bounds (CASSANDRA-8946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/237d0bc6/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index 537344a,fdf6ce1..3345b7a
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -108,7 -110,9 +110,9 @@@ except ImportError, e
  from cassandra.cluster import Cluster, PagedResult
  from cassandra.query import SimpleStatement, ordered_dict_factory
  from cassandra.policies import WhiteListRoundRobinPolicy
+ from cassandra.protocol import QueryMessage, ResultMessage
+ from cassandra.marshal import int16_pack, int32_pack, uint64_pack
 -from cassandra.metadata import protect_name, protect_names, protect_value
 +from cassandra.metadata import protect_name, protect_names, protect_value, KeyspaceMetadata,
TableMetadata, ColumnMetadata
  from cassandra.auth import PlainTextAuthProvider
  
  # cqlsh should run correctly when run out of a Cassandra source tree,


Mime
View raw message