Commit Graph

114 Commits

Author SHA1 Message Date
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Brandon Williams 359d3bb2a6 Pig: Refactor and deprecate CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-8599
2015-01-13 11:24:45 -06:00
Brandon Williams 0757dc72f2 fix errant CPIF references 2015-01-12 11:57:53 -06:00
Aleksey Yeschenko edf48f8173 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-07 02:25:59 +03:00
Aleksey Yeschenko e27cdf935c Revert "fix references to defunct CqlPagingInputFormat"
This reverts commit e550ea6021.
2015-01-07 02:25:09 +03:00
Dave Brosius 6124a733cb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-12-27 20:32:20 -05:00
rekhajoshm e550ea6021 fix references to defunct CqlPagingInputFormat
patch by rjoshi reviewed by dbrosius for CASSANDRA-8541
2014-12-27 20:23:01 -05:00
Brandon Williams 8fd8832a87 Fix word count
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
2014-07-18 12:35:57 -05:00
Brandon Williams 337e4a8292 Fix word count
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
2014-07-18 12:31:17 -05:00
Jonathan Ellis 83ac8a631e merge from 2.0 2014-07-11 23:50:46 -05:00
Brandon Williams 58931dd6fe Make cql3 word count executable 2014-07-11 14:20:57 -05:00
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
2014-07-03 21:35:39 +03:00
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