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

151 Commits

Author SHA1 Message Date
Aleksey Yeschenko c6bed82702 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
 2014-05-13 17:51:34 +03:00
Anthony Cozzie 820f0eb60b Fix the InvertedIndex trigger example 
patch by Anthony Cozzie; reviewed by Aleksey Yeschenko for CASSANDRA-7211
 2014-05-13 17:46:21 +03:00
Sylvain Lebresne 7b32dbd4db Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
 2014-03-26 15:38:13 +01:00
Sylvain Lebresne d7cb970053 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-26 15:34:59 +01:00
Sylvain Lebresne 6df3163752 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-25 16:52:21 +01:00
Sylvain Lebresne b0841d8fee Revert "Add CqlRecordReader to take advantage of native CQL pagination" 
This reverts commit 3b708f9989.

Conflicts:

	CHANGES.txt
 2014-03-25 16:49:10 +01:00
Sylvain Lebresne a7c4659dbd Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-21 15:31:25 +01:00
Sylvain Lebresne 3b708f9989 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-21 15:26:41 +01:00
Jonathan Ellis 815892e8c1 merge from 2.0 2014-03-17 16:35:07 -05:00
Jonathan Ellis b4f2ff17ad Update hadoop_cql3_word_count example 
patch by Chandar Pechetty; reviewed by Alex Liu for CASSANDRA-6703
 2014-03-17 16:34:23 -05:00
Aleksey Yeschenko 6bbb13b9b0 Rename RowMutation->Mutation in preparation for Row->Partition 2013-12-22 00:37:43 +03:00
Sylvain Lebresne e50d6af12f Rename Column to Cell 2013-12-17 17:52:20 +01:00
Aleksey Yeschenko 9ebb091829 Fix the trigger example 2013-11-24 08:32:32 +03:00
Brandon Williams cb7eb8687d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	build.xml
	debian/changelog
 2013-11-20 11:54:57 -06:00
Brandon Williams 5f79f5321b update pig example scripts 
Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-6239
 2013-11-20 10:19:17 -06:00
Sylvain Lebresne b6147c1c7b License and versions for 2.0.2 release 2013-10-22 18:01:51 +02:00
Brandon Williams 3a29c74807 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-14 13:34:13 -05:00
Brandon Williams 17ae0429ca Update the pig examples to include more recent pig/cassandra features. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-4549
 2013-10-14 13:32:58 -05:00
Aleksey Yeschenko 326d5454dd Track clients' remote addresses in ClientState 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6070
 2013-09-24 17:00:17 +03:00
Vijay Parthasarathy 4f2fdc2e73 Fix trigger directory detection code 
Patch by Vijay, reviewed by jebllis for CASSANDRA-5826
 2013-08-03 11:21:07 -07:00
Brandon Williams 2130b2e2a0 Merge branch 'cassandra-1.2' into trunk 2013-07-25 10:53:09 -05:00
Brandon Williams a3dbc3ddc7 Predicate pushdown support for CqlStorage 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5790
 2013-07-25 10:52:26 -05:00
Aleksey Yeschenko d7e14829fa cosmetic trigger corrections (examples) 2013-07-23 01:39:46 +03:00
Sylvain Lebresne e0eacd2818 Version and licenses for 2.0.0-beta2 2013-07-22 16:58:14 +02:00
Jonathan Ellis 58e373c538 update hadoop dependency in wordcount examples 
patch by Philip Crotwell; reviewed by Jeremy Hanna and Alex Liu for CASSANDRA-4686
 2013-07-16 17:46:19 -05:00
Vijay Parthasarathy 829688f9eb Add trigger examples 
patch by Vijay; reviewed by jbellis for CASSANDRA-5574
 2013-07-11 21:36:30 -07:00
Brandon Williams 168482bc11 Add forgotten updates 2013-06-26 19:10:05 -05:00
Brandon Williams 33a3d2ca57 Pig: support for cq3 tables 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5234
 2013-06-26 16:52:20 -05:00
Jonathan Ellis 670954cb3e merge from 1.2 2013-06-17 17:42:26 -05:00
Jonathan Ellis f1004e9b17 update CqlRecordWriter interface 
patch by Alex Liu and jbellis for CASSANDRA-5622
 2013-06-17 17:41:58 -05:00
Jonathan Ellis a004779763 rename 2013-06-06 17:00:56 -05:00
Jonathan Ellis c1dfc8fc53 Merge branch 'cassandra-1.2' into trunk 2013-06-06 17:00:28 -05:00
Jonathan Ellis 02a7ba817c rename 2013-06-06 17:00:08 -05:00
Jonathan Ellis 90052d5a46 merge from 1.2 2013-06-06 14:18:58 -05:00
Jonathan Ellis 56e0ad1be2 Add CQL3 input/output formats 
patch by Alex Liu; reviewed by jbellis and Mike Schrag for CASSANDRA-4421
 2013-06-06 14:18:23 -05:00
Brandon Williams d78b622646 Merge branch 'cassandra-1.2' into trunk 2013-05-29 12:54:38 -05:00
Brandon Williams 6d7404bc2e Pig: disable split combination, add split size param 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5544
 2013-05-29 12:53:52 -05:00
Brandon Williams 44f178d1e0 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 2013-05-21 11:14:23 -05:00
Brandon Williams 9d0eec2171 Merge branch 'cassandra-1.1' into cassandra-1.2 
Conflicts:
	CHANGES.txt
 2013-05-21 11:10:47 -05:00
Brandon Williams 7d2ce5f957 Fix NPE in Pig's widerow mode. 
Patch by Sheetal Gorsani and Jeremy Hanna, reviewed by brandonwilliams
for CASSANDRA-5488
 2013-05-21 11:08:50 -05:00
Jonathan Ellis 2effc40edb replace Thread.sleep with Uninterruptibles.sleepUninterruptibly 
patch by Mikhail Mazursky; reviewed by jbellis for CASSANDRA-5557
 2013-05-13 11:26:23 -05:00
Brandon Williams 338fa9a307 Fix fat client. 
Patch by Carl Yeksigian, reviewed by brandonwilliams for CASSANDRA-5378
 2013-03-29 08:53:24 -05:00
Brandon Williams 6de0495e53 Fix the fat client. 
Patch by Carl Yeksigian, reviewed by brandonwilliams for CASSANDRA-5378
 2013-03-29 08:51:07 -05:00
Aleksey Yeschenko 36f632c9eb Merge branch 'cassandra-1.2' into trunk 2013-02-15 01:27:36 +03:00
Aleksey Yeschenko 0b83682b40 Add CQL3-based implementations of IAuthenticator and IAuthorizer 
Patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-4898
 2013-02-15 01:26:10 +03:00
Jonathan Ellis 63cc6b0c79 update WordCountCounters for SuperColumn refactor 2013-02-06 16:34:37 -06:00
Jonathan Ellis 22d8e8448a update WordCount for SuperColumn refactor 2013-02-06 16:31:24 -06:00
Brandon Williams 22f515b376 Allow populate_io_cache_on_flush to be set per-CF. 
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
 2013-01-31 17:37:24 -06:00
Brandon Williams 21f63a916d Allow populate_io_cache_on_flush to be set per-CF. 
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
 2013-01-31 15:12:41 -06:00
Brandon Williams 736b2a8e8b Merge branch 'cassandra-1.2' into trunk 2013-01-04 07:44:28 -06:00
Brandon Williams 4993d427b1 Update pig readme for m3p 2013-01-04 07:44:22 -06:00
Sylvain Lebresne 3a005df397 Replace supercolumns internally by composites 
patch by slebresne; reviewed by Vijay for CASSANDRA-3237
 2013-01-02 13:40:13 +01:00
Aleksey Yeschenko 2eaea5a2a4 Merge branch 'cassandra-1.2' into trunk 2012-12-17 18:41:41 +03:00
Aleksey Yeschenko 706612e300 Fix SimpleAuthorizer example; 
patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for
CASSANDRA-5072
 2012-12-17 18:35:31 +03:00
Aleksey Yeschenko 253a7f028b Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
 2012-12-08 18:39:52 +03:00
Aleksey Yeschenko bddfa9e120 Update IAuthenticator to match the new IAuthorizer; 
patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for CASSANDRA-5003
 2012-12-08 18:21:14 +03:00
Jonathan Ellis 6a5c9ed879 make index_interval configurable per columnfamily 
patch by Radim Kolar; reviewed by jbellis for CASSANDRA-3961
 2012-12-01 10:03:52 +09:00
Aleksey Yeschenko 5a3eb1a6c3 Replace IAuthority with new IAuthorizer; patch by Aleksey Yeschenko, 
reviewed by Jonathan Ellis for CASSANDRA-4874
 2012-11-27 20:30:24 +03:00
Brandon Williams f31c53049d Switch word count to M3P. Patch by brandonwilliams reviewed by yukim 
for CASSANDRA-4975
 2012-11-26 16:59:54 -06:00
Jonathan Ellis 6ca75ef9ba remove vestiges of Thrift unframed mode 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4729
 2012-09-27 15:25:07 -05:00
Brandon Williams d634f05161 Merge branch 'cassandra-1.1' into trunk 2012-09-21 15:15:17 -05:00
Brandon Williams 686fe1e145 Pass pig vars through url params in addition to env vars. 
Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for
CASSANDRA-4499
 2012-09-21 14:58:36 -05:00
Sylvain Lebresne 3a2faf9424 Finer grained exception hierarchy, and adds error codes 
patch by slebresne; reviewed by thepaul for CASSANDRA-3979
 2012-09-05 17:50:59 +02:00
Jonathan Ellis 7d857e68a4 clean up "if" style 2012-07-28 09:45:16 -05:00
Brandon Williams 6f384c54de Pig: support for Int32Type. 
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4459
 2012-07-25 12:06:49 -05:00
Brandon Williams 7f6cc5ef6c Pig: support for composite row keys, writing composites 
Patch by Dirkjan Bussink, reviewed by brandonwilliams for CASSANDRA-4144
 2012-07-13 10:38:15 -05:00
Sylvain Lebresne 3816ab87cc Add missing licences and versions for 1.1.1 release 2012-06-01 18:20:02 +02:00
Brandon Williams d484e28d19 Minor correction in pig readme/example. 
Patch by Fabian Rousseau, reviewed by brandonwilliams for CASSANDRA-4301
 2012-05-31 09:48:58 -05:00
Brandon Williams 2dc27a1756 Update pig readme 2012-05-26 10:50:00 -05:00
Brandon Williams 0529feb791 Merge from 1.0 2012-05-01 12:05:59 -05:00
Jonathan Ellis 7321adf432 add log4j properties 2012-04-11 13:24:32 -05:00
Sylvain Lebresne d69d304c4e Remove dead sliced_buffer_size_in_kb option 
patch by slebresne; reviewed by jbellis for CASSANDRA-4076
 2012-03-30 16:44:24 +02:00
Jonathan Ellis c29037290a Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-03-13 23:24:29 -05:00
Jonathan Ellis f42ec6d599 add environment variables to the simpleauth README 2012-03-13 23:21:52 -05:00
Brandon Williams 470873fcb5 Merge from 1.0 2012-02-29 14:41:29 -06:00
Brandon Williams f9454d00b4 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-02-28 09:49:03 -06:00
Brandon Williams 85934a1e27 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-02-27 10:54:55 -06:00
Brandon Williams 3a4459f0a6 Merge from 1.0 2012-02-14 14:19:47 -06:00
Brandon Williams 1d435db703 Merge from 1.0 2012-02-13 17:34:34 -06:00
Brandon Williams 3c35bf4fe3 Make pig script executable 2012-02-01 12:14:47 -06:00
T Jake Luciani fba541c0c3 Add wide row support to ColumnFamilyInputFormat 
Patch by jbellis; reviewed by tjake for CASSANDRA-3264
 2012-01-25 15:43:55 -05:00
Brandon Williams dc7db04517 Move pig to src and examples. 
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-3713.
 2012-01-24 07:37:00 -06:00
Jonathan Ellis 27b818386c update configuration checking post-#3197 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3765
 2012-01-23 16:03:48 -06:00
Jonathan Ellis ee5dbdb8d3 add test of KeyRange.filter 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2878
 2012-01-23 16:02:52 -06:00
Jonathan Ellis e31879e595 reformat 2012-01-23 16:02:44 -06:00
Jonathan Ellis 5409af4535 switch to int for count output 2012-01-23 16:02:28 -06:00
Jonathan Ellis 05786528de fix word_count build 2012-01-20 17:12:21 -06:00
Brandon Williams de333791e8 Fix flawed addToMutationMap in word count example. 
Patch by Dave Brosius, reviewed by Brandon Williams for CASSANDRA-3669
 2012-01-04 10:33:57 -06:00
Eric Evans 2ede7fc4be move FBUtils methods for bytes<->hex to separate class 
Patch by eevans; reviewed by jbellis for CASSANDRA-3299

Conflicts:

	drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
	drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1181025 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-10 15:38:37 +00:00
Sylvain Lebresne 0d9fdad0b5 Move SimpleAuthenticator and SimpleAuthority to examples/ 
patch by slebresne; reviewed by jbellis for CASSANDRA-2922


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1180076 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-07 15:29:22 +00:00
Jonathan Ellis 2816bd471f merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1153198 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-02 17:04:15 +00:00
Jonathan Ellis b803c37852 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1147869 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-18 13:32:48 +00:00
Jonathan Ellis f491265fc5 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137777 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 20:54:24 +00:00
Jonathan Ellis a3e2926485 r/m binarymemtable 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2692

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135249 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 19:46:18 +00:00
Jonathan Ellis 56997214b6 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135244 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 19:40:21 +00:00
Jonathan Ellis 00fd00db5d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134431 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 20:19:23 +00:00
Jonathan Ellis a2665b174c revert incomplete BMT-excision 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127179 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-24 17:43:32 +00:00
Jonathan Ellis 4f9b1604c7 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127165 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-24 17:34:36 +00:00
T Jake Luciani be67fda27e merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1126664 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-23 19:03:33 +00:00
Jonathan Ellis 2d95cb4957 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095492 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-20 19:50:50 +00:00