natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,726 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

7726 Commits

Author SHA1 Message Date
Jonathan Ellis 1ded4ff294 fix event_id ordering and remove happened_at 2012-10-23 20:58:38 -05:00
Jonathan Ellis 069de3d035 omit session, event id, and thread from trace output 2012-10-23 20:58:38 -05:00
Jonathan Ellis 36b40be64f improve tracing output, moving less-useful debug messages to trace and adding others as needed 2012-10-23 20:58:05 -05:00
Jonathan Ellis 880334b636 Revert "support custom sstable components" 
This reverts commit 5eb9e1c157.
 2012-10-23 16:11:49 -05:00
Jonathan Ellis db3c198ad0 fix BulkLoader NPE caused by #4732 
patch by jbellis; reviewed by yukim for CASSANDRA-4846
 2012-10-23 15:26:51 -05:00
Jonathan Ellis 5eb9e1c157 support custom sstable components 
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-4049
 2012-10-23 15:16:03 -05:00
Vijay Parthasarathy b8de488519 make nodetool accept -ve tokens 
patch by Vijay; reviewed by slebresne for CASSANDRA-4808
 2012-10-23 11:00:56 -07:00
Jonathan Ellis fb15aa9f63 remove vestiges of STREAM stage, take 2 
patch by jbellis; reviewed by yukim for CASSANDRA-4764
 2012-10-23 09:57:40 -05:00
Jonathan Ellis 796df645c6 Revert "remove vestiges of STREAM stage" 
This reverts commit 69ad77d8c6.
 2012-10-23 09:12:50 -05:00
Sylvain Lebresne 3b8bff78d4 Fix assertion error in cql3 select 
patch by slebresne; reviewed by jbellis for CASSANDRA-4783
 2012-10-23 10:30:48 +02:00
Yuki Morishita 8c99a37698 fix streaming to wrong directory 2012-10-22 16:46:43 -05:00
Jonathan Ellis 269c0cdac3 make TRACE verb droppable 
patch by David Alves; reviewed by jbellis for CASSANDRA-4672
 2012-10-22 16:31:52 -05:00
Jonathan Ellis 69ad77d8c6 remove vestiges of STREAM stage 
patch by jbellis; reviewed by yukim for CASSANDRA-4764
 2012-10-22 16:27:47 -05:00
Jonathan Ellis 8f3d9b8371 clean up partitioner comments 2012-10-22 16:15:08 -05:00
Yuki Morishita dd8a3c4507 Merge branch 'cassandra-1.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/thrift/CassandraServer.java
 2012-10-22 13:53:11 -05:00
Yuki Morishita 95fb613bf9 fix potential infinite loop in get_count; patch by yukim reviewed by Tyler Hobbs for CASSANDRA-4833 2012-10-22 12:16:20 -05:00
Jonathan Ellis a58b87020b fix BulkLoader recognition of CQL3 columnfamilies 
patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-4755
 2012-10-22 11:48:07 -05:00
Sylvain Lebresne f02928f887 Fix Subcolumn slice ends not respected 
patch by vijay; reviewed by thobbs & slebresne for CASSANDRA-4826
 2012-10-22 09:19:06 +02:00
Jonathan Ellis 81209f1c80 merge from 1.1 2012-10-19 18:35:41 -05:00
Jonathan Ellis 8bab6febb5 fix progress counting in wide row iterator 
patch by Piotr Koalczkowski; reviewed by jbellis for CASSANDRA-4803
 2012-10-19 18:31:54 -05:00
Jonathan Ellis f22e2c4596 missing import 2012-10-19 18:30:43 -05:00
Jonathan Ellis 533bf3f6a8 add describe_splits_ex providing improved split size estimate 
patch by Piotr Kolaczkowski; reviewed by jbellis for CASSANDRA-4803
 2012-10-19 18:07:47 -05:00
Jonathan Ellis 0bb3a064f3 fix progress counting in wide row iterator 
patch by Piotr Koalczkowski; reviewed by jbellis for CASSANDRA-4803
 2012-10-19 18:00:25 -05:00
Vijay Parthasarathy a28a2ba937 Require enabling cross-node timeouts 
patch by Vijay; reviewed by jbellis for CASSANDRA-4812
 2012-10-19 15:58:37 -07:00
Jonathan Ellis 15e3f142a1 merge from 1.1 2012-10-19 17:43:54 -05:00
Jonathan Ellis 72dcc298d3 fix indexing empty column values 
patch by jbellis for CASSANDRA-4832
 2012-10-19 17:42:53 -05:00
Brandon Williams f8129b4356 cqlsh: support moving CL to the protocol level 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4823
 2012-10-19 14:11:53 -05:00
Sylvain Lebresne 0f83510046 Fix typo in binary protocol spec 2012-10-19 08:57:53 +02:00
Eric Evans ebd11d3ada merge branch cassandra-1.1 into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java
 2012-10-18 21:48:46 -05:00
Eric Evans 487c9168fc reenable system ks r/w 
Patch by Pavel Yaskevich and eevans for CASSANDRA-4664

Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java
 2012-10-18 21:38:43 -05:00
Eric Evans e63a1ae1c0 reenable system ks r/w 
Patch by Pavel Yaskevich and eevans for CASSANDRA-4664
 2012-10-18 21:26:48 -05:00
Jonathan Ellis d55408d977 merge from 1.1 2012-10-18 17:44:53 -05:00
Jonathan Ellis 2bcbec0229 Merge branch 'cassandra-1.1' into trunk 2012-10-18 17:43:56 -05:00
Jonathan Ellis 9d7ba39cbb allow JdbcDate to compose null Date objects 
patch by Sridharan Kuppa; reviewed by jbellis for CASSANDRA-4830
 2012-10-18 17:42:10 -05:00
Jonathan Ellis 1b8c475240 fix merge 2012-10-18 17:15:23 -05:00
Jonathan Ellis db2c2999d1 merge from 1.1 2012-10-18 15:19:30 -05:00
Jonathan Ellis e400d0eca2 fix possible stackoverflow when compacting 1000s of sstables 
patch by jbellis; reviewed by yukim for CASSANDRA-4765
 2012-10-18 15:17:29 -05:00
Vijay Parthasarathy 8495560c2b Support client Thrift SSL socket 
patch by Jason Brown; reviewed by Vijay for CASSANDRA-4239
 2012-10-17 18:58:04 -07:00
Brandon Williams c9b249b2a8 Make SerializingCacheProvider the default when absent from the yaml. 
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4828
 2012-10-17 20:48:35 -05:00
Pavel Yaskevich ffbcb4b11b add a close() method to CRAR to prevent leaking file descriptors 
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4820
 2012-10-17 11:07:56 -07:00
Vijay Parthasarathy 1d489dc559 Update PureJavaCrc32 2012-10-17 10:50:50 -07:00
Sylvain Lebresne c866c805b3 Fix NTS test 2012-10-17 19:18:18 +02:00
Sylvain Lebresne eb775fe7c2 Always gossip DC and Rack information 
patch by slebresne; reviewed by driftx for CASSANDRA-4814
 2012-10-17 18:52:16 +02:00
Sylvain Lebresne 954dc5e5b7 Pack consistency level in binary protocol 
patch by slebresne; reviewed by jbellis for CASSANDRA-4824
 2012-10-17 18:32:37 +02:00
Dave Brosius f5dda349b3 Merge branch 'cassandra-1.1' into trunk 2012-10-17 00:05:26 -04:00
Dave Brosius 4d637f1f1b fix get_range_slices with startkey and endtoken specified 
patch by Nikolay (nmmm) reviewed by dbrosius for CASSANDRA-4804
 2012-10-16 23:56:26 -04:00
Yuki Morishita 61f5e50052 Merge branch 'cassandra-1.1' into trunk 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
	test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
 2012-10-16 18:07:54 -05:00
Yuki Morishita b8874ad1a8 fix wrong leveled compaction progress calculation; patch by yukim reviewed by jbellis for CASSANDRA-4807 2012-10-16 16:23:46 -05:00
Yuki Morishita 8c471240d0 LongCompactionsTest#testStandardColumnCompaction should reset CFS for clean test 2012-10-16 11:44:42 -05:00
Yuki Morishita 4376ce7021 remove assertion 2012-10-16 11:42:57 -05:00