Commit Graph

1049 Commits

Author SHA1 Message Date
Dave Brosius e96ce6d132 clean up dead imports 2017-01-29 21:22:18 -05:00
Stefania Alborghetti 2d56fee4f5 Merge branch 'cassandra-3.X' into trunk 2017-01-11 08:17:06 +01:00
Stefania Alborghetti 1553d864b5 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-01-11 08:16:18 +01:00
Jay Zhuang 15b52809f2 Fix tabs and typo
patch by Jay Zhuang; reviewed by Stefania Alborghetti for CASSANDRA-11431
2017-01-11 08:10:41 +01:00
Paulo Motta d98446ede1 Set javac encoding to utf-8
patch by Paulo Motta, reviewed by jasobrown for CASSANDRA-11077
2017-01-11 08:10:41 +01:00
Ben Manes c607d76413 Use Caffeine (W-TinyLFU) for on-heap caches
patch by Ben Manes; reviewed by Robert Stupp for CASSANDRA-10855
2017-01-01 11:00:42 +01:00
Sam Tunnicliffe bb20b9dd8c Ninja: fix ant javadoc target 2016-12-13 11:14:36 +00:00
Sylvain Lebresne 4881d9c308 Thrift removal
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
2016-12-13 10:27:12 +01:00
Michael Shuler ac279e2f71 Increment version to 3.0.11 and fix a CHANGES entry 2016-11-16 14:31:31 -06:00
Robert Stupp 93a06b9ea9 Merge branch 'cassandra-3.X' into trunk 2016-10-27 11:43:07 +02:00
Robert Stupp 8f0d5a295d remove net.mintern.primitive library due to license issue,
remove primitive-1.0.jar, add ASL2 licensed TimSort implementation, update snowball-stemmer license file

patch by Robert Stupp; reviewed by  for CASSANDRA-12845
2016-10-27 11:42:05 +02:00
Benjamin Lerer 4c728d2e48 Merge branch cassandra-3.X into trunk 2016-10-25 12:13:53 +02:00
Stefan Podkowinski 6497d3727f Use different build directories for Eclipse and Ant
patch by Stefan Podkowinski; reviewed by Benjamin Lerer for CASSANDRA-12466
2016-10-25 12:01:54 +02:00
Benjamin Lerer 65405b9ed5 Merge branch cassandra-3.X into trunk 2016-10-20 17:24:32 +02:00
Benjamin Lerer af1afef564 Upgrade commons-codec to 1.9
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-12790
2016-10-20 17:21:02 +02:00
Michael Shuler 83ae5f3398 Bump version to 2.1.17 2016-10-10 17:09:10 -05:00
Michael Shuler 87034cd059 Prepare 2.1.16 release 2016-10-05 17:18:52 -05:00
Sylvain Lebresne 78ff377075 Change version to 4.0 after creation of 3.X branch 2016-09-29 10:19:34 +02:00
Michael Shuler 238393520c Bump base.version to 2.2.9 2016-09-28 13:10:06 -05:00
Michal Matloka e7fb0639db Upgrade metrics-reporter-config to 3.0.3
Patch by Michał Matłoka; reviewed by tjake for CASSANDRA-12089
2016-09-28 08:12:03 -04:00
Michael Shuler e9fe96f404 Bump base.version and d/changelog to 2.2.8 2016-09-23 16:42:46 -05:00
T Jake Luciani 517b652f57 bump version to 3.10 2016-09-20 09:24:35 -04:00
nitsanw e73633cd81 Fix Cassandra Stress reporting thread model and precision
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12585
2016-09-07 10:14:20 -04:00
T Jake Luciani 1d7466425b Make jmh jar and add RW + Compaction tests
Patch by tjake; reviewed by Nitsan Wakart for CASSANDRA-12586
2016-09-06 10:13:33 -04:00
Dave Brosius 6abba68aee update jmh jars to 1.13 to quell build time RELEASE_6 warnings
patch by dbrosius reviewed by bwilliams for CASSANDRA-12536
2016-09-03 22:57:35 -04:00
Tyler Hobbs 7bdb2dddcb Fix leftover merge conflicts in build.xml 2016-08-17 17:33:28 -05:00
Tyler Hobbs 1e8533a316 Merge branch 'cassandra-3.9' into trunk 2016-08-17 17:06:57 -05:00
Tyler Hobbs b2a6309737 Merge branch 'cassandra-3.8' into cassandra-3.9 2016-08-17 17:05:47 -05:00
Tyler Hobbs 062bd0730a Merge branch 'cassandra-3.0' into cassandra-3.8 2016-08-17 17:05:15 -05:00
Tyler Hobbs 01ae2794e5 Ninja: temporarily remove test-clientutil-jar from test-all
This is a temporary measure to fix test-all until CASSANDRA-11635 can be
properly fixed and allow test-clientutil-jar to work again.
2016-08-17 17:03:30 -05:00
Michael Shuler 8b5b1854c3 Update build.xml and debian/changelog for 3.0.9 2016-08-16 18:04:08 -05:00
Michael Shuler 5d23afc15f Update build.xml and debian/changelog for 3.9 2016-08-16 17:52:19 -05:00
Tyler Hobbs a3e772b8b9 Remove clientutil jar 2016-08-11 13:51:46 -05:00
Tyler Hobbs f4c3e14fde Merge branch 'cassandra-3.0' into cassandra-3.9 2016-08-11 13:47:11 -05:00
Tyler Hobbs 2a828afdbf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-11 13:46:47 -05:00
Sylvain Lebresne 5b38d3a81e Add Sigar to classes included in clientutil.java
This is required as Sigar is now a dependency of UUIDGen.

Patch by Sylvain Lebresne; reviewed by Tyler Hobbs for CASSANDRA-11635
2016-08-11 13:41:22 -05:00
Yuki Morishita bc9af92e80 Add byteman support for testing in 2.2
patch by yukim; reviewed by Paulo Motta for CASSANDRA-12377
2016-08-08 07:53:34 -05:00
Dave Brosius f01aedcfb6 remove transitive junit dependency from hadoop-core/commons-httpclient 2016-08-06 21:24:59 -04:00
T Jake Luciani 143d16961a Merge branch 'cassandra-3.9' into trunk 2016-08-05 11:54:28 -04:00
T Jake Luciani aab33f1170 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-08-05 11:54:08 -04:00
T Jake Luciani 1cce9eb5b8 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-05 11:34:14 -04:00
Stefan Podkowinski 3cda6829cc Add JVM metrics for custom metrics reporter
patch by Stefan Podkowinski; reviewed by tjake for CASSANDRA-12312
2016-08-05 11:03:14 -04:00
Robert Stupp becd730ad3 Update OHC to v0.4.4 (failed to load Java8 implementation ohc-core-j8)
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12133
2016-08-02 10:50:24 +02:00
Sylvain Lebresne 7eb9531a4d Add theme for inclusion of the documentation on the website 2016-08-01 17:19:50 +02:00
Aleksey Yeschenko c3ded0551f Update build.xml and CHANGES.txt for 3.8 2016-07-18 16:47:52 +01:00
T Jake Luciani 7a06b39300 Merge branch 'cassandra-3.9' into trunk 2016-07-18 10:55:47 -04:00
T Jake Luciani 2aa76632d6 Netty 4.0.39-Final update post .37 fix 2016-07-18 10:53:22 -04:00
Stefania Alborghetti 2444349e36 Merge branch 'cassandra-3.9' into trunk 2016-07-06 12:58:57 +08:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37"
This reverts commit e8d7fe8a28.
2016-07-06 12:58:06 +08:00
Christopher Batey b73f581355 Add basic testing support for the Cassandra Stress tool
Patch by Christopher Batey; reviewed by Joel Knighton for CASSANDRA-11638
2016-07-04 14:48:52 +01:00
Dave Brosius 1df47bd76c add ./conf as an eclipse source path so that the hotspot_compiler file gets copied to classes, on eclipse scrub 2016-06-30 19:20:24 -04:00
T Jake Luciani ea8c430124 version 2.2.7 2016-06-28 20:10:15 -04:00
T Jake Luciani cb14186f8d version 2.1.15 2016-06-28 20:06:55 -04:00
T Jake Luciani 0134348331 update to version 3.10 2016-06-27 21:02:37 -04:00
T Jake Luciani 7d4a71f636 update to version 3.9 2016-06-27 21:01:32 -04:00
Sylvain Lebresne c7b9401bf8 Merge branch 'doc_in_tree' into trunk
* doc_in_tree:
  Modify build file to include html doc in artifacts
  Add 'report bug' section
  Fix minor errors in CQL doc
  Finish fixing the CQL doc
  Don't track auto-generated file
  Reorganize document
  Automatically generate docs for cassandra.yaml
  Fix CQL doc (incomplete)
  Add Metrics/Monitoring docs
  Add Change Data Capture documentation
  Docs for Memtable and SSTable architecture
  Add doc on compaction
  Add initial version of security section
  Fill in Replication, Tuneable Consistency sections
  Add docs for cqlsh
  Add snitch and range movements section on Operations
  Add initial in-tree documentation (very incomplete so far)
2016-06-27 20:33:21 +02:00
Sylvain Lebresne 5cefe503e0 Modify build file to include html doc in artifacts 2016-06-27 20:31:43 +02:00
Robert Stupp e8d7fe8a28 Update to Netty 4.0.37
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-12032
2016-06-21 16:47:37 +02:00
Dave Brosius a6e749089f exclude thrift-server's 'compile' dependency on junit 2016-06-18 22:52:15 -04:00
Josh McKenzie e31e216234 Add Change Data Capture
Patch by jmckenzie; reviewed by cyeksigian and blambov for CASSANDRA-8844
2016-06-16 10:01:39 -04:00
Sylvain Lebresne cad277be41 Add initial in-tree documentation (very incomplete so far)
patch by Stefania, jjirsa, rspitzer & slebresne; reviewed by slebresne for CASSANDRA-8700
2016-06-14 18:16:42 +02:00
T Jake Luciani 972157d98d bump version to 3.0.8 2016-06-14 10:48:52 -04:00
T Jake Luciani 15ec93041a bump version 2016-05-31 13:45:21 -04:00
nitsanw 89f275c658 Introduce HdrHistogram and response/service/wait separation to stress tool
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-11853
2016-05-27 11:59:55 -04:00
Robert Stupp b8f4ae0043 build: use correct netty version sources
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11869
2016-05-23 17:11:58 +02:00
Edward Capriolo fb466f99f8 Support older ant versions
Patch by Ed Capriolo; reviewed by tjake for CASSANDRA-11807
2016-05-17 13:06:52 -04:00
T Jake Luciani f580fb0ff2 Merge branch 'cassandra-3.7' into trunk 2016-05-06 09:11:06 -04:00
T Jake Luciani 886f875714 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-06 09:08:35 -04:00
T Jake Luciani 06870372d0 Update java driver
patch by Andy Tolbert; reviewed by tjake for CASSANDRA-11615
2016-05-06 09:04:31 -04:00
T Jake Luciani 7bc1f564a4 set trunk version to 3.8 2016-05-03 10:42:47 -04:00
T Jake Luciani 0095499270 Set 3.7 version number 2016-05-03 10:39:33 -04:00
T Jake Luciani cfb9b9e7df Add missing dependency to build.xml - v2 2016-05-03 09:02:59 -04:00
T Jake Luciani 151d8876b9 Add missing dependency to build.xml 2016-05-03 09:01:28 -04:00
T Jake Luciani 7c559def34 Add missing dependency to build.xml 2016-05-03 08:58:24 -04:00
T Jake Luciani 5c5c5b44c6 2.1.14 version bump 2016-04-15 10:30:21 -04:00
T Jake Luciani 220e4f62db 2.2.6 version bump 2016-04-15 10:00:04 -04:00
T Jake Luciani a0d070764a upgrade netty to 4.0.36
patch by tjake; reviewed by Jason Brown for CASSANDRA-11567
2016-04-14 10:31:53 -04:00
Tyler Hobbs fd24b7c0d6 Bump version to 3.0.6 in build.xml 2016-04-13 12:51:58 -05:00
Robert Stupp 5e933c542a Fix uptodate check for antlr files after 11372
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-11480
2016-04-03 16:17:15 +02:00
T Jake Luciani c6e6fa94d2 3.0.5 version bump 2016-04-02 07:58:13 -04:00
Benjamin Lerer 43ff27fc70 Upgrade Netty to version 4.0.34
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for CASSANDRA-11096
2016-03-30 10:13:51 +02:00
Robert Stupp ae6809d07c Merge branch 'cassandra-3.5' into trunk 2016-03-30 09:01:09 +02:00
Robert Stupp 9b1968fcb6 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-30 09:00:41 +02:00
Robert Stupp 500d6b3a2c Upgrade ohc to 0.4.3
patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-11444
2016-03-30 09:00:10 +02:00
Mike Adamson eea0a0cef9 Break the CQL grammar into separate Parser and Lexer
patch by Mike Adamson; reviewed by Aleksey Yeschenko for CASSANDRA-11372
2016-03-29 18:07:12 +01:00
Aleksey Yeschenko dc480c794e Merge branch 'cassandra-3.5' into trunk 2016-03-09 16:37:35 +00:00
Aleksey Yeschenko e33d4be66c Bump base.version 2016-03-09 16:37:07 +00:00
T Jake Luciani ac06c5bf7d bump versions for 3.0.4 2016-02-29 10:37:34 -05:00
Aleksey Yeschenko fc9c6faa23 Merge branch 'cassandra-3.0' into trunk 2016-02-23 15:30:35 +00:00
Ariel Weisberg 037d24efdf Introduce backpressure for hints
patch by Ariel Weisberg; reviewed by Benedict Elliott Smith for
CASSANDRA-10972
2016-02-23 15:28:41 +00:00
Robert Stupp 14420a958f Merge branch 'cassandra-3.0' into trunk 2016-02-18 21:40:41 +01:00
Robert Stupp 9b5df24f5a Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-18 21:40:10 +01:00
Robert Stupp 71f4406072 fix ohc and java-driver pom dependencies in build.xml
patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-10793
2016-02-18 21:38:23 +01:00
T Jake Luciani 21380fc129 3.0.3 release versions 2016-02-03 08:56:26 -05:00
Paulo Motta 02d8ebd8a4 Set javac encoding to utf-8
patch by Paulo Motta, reviewed by jasobrown for CASSANDRA-11077
2016-01-27 07:59:03 -08:00
T Jake Luciani d5b6d1b634 2.1.13 build 2016-01-26 09:12:48 -05:00
Pavel Yaskevich 72790dc8e3 Integrate SASI index into Cassandra
patch by xedin; reviewed by beobal for CASSANDRA-10661
2016-01-23 19:35:29 -08:00
Tyler Hobbs b4d67c9e5d Bump 2.2 version to 2.2.5 in build.xml 2016-01-22 12:00:32 -06:00
Tyler Hobbs a20b6ef89f Bump version in build.xml to 3.0.2 2016-01-21 13:17:01 -06:00
Tyler Hobbs 25090c1682 Bump trunk version to 3.4 in build.xml 2016-01-06 17:00:56 -06:00
Aleksey Yeschenko a0f59dce5b Merge branch 'cassandra-3.0' into trunk 2015-12-18 15:43:52 +00:00
Aleksey Yeschenko d877ba073f Eliminate the dependency on jgrapht for UDT resolution
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10653
2015-12-18 15:39:33 +00:00
T Jake Luciani cf567703db 3.0 bump version 2015-12-04 15:56:51 -05:00
Tyler Hobbs 47e133c90f Merge branch 'cassandra-3.1' into trunk 2015-12-02 15:33:33 -06:00
Tyler Hobbs 6405f6c9c7 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-12-02 15:33:04 -06:00
Tyler Hobbs d7068fd72e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-02 15:32:40 -06:00
Tyler Hobbs e491f05b71 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 15:32:16 -06:00
Tyler Hobbs b85da71961 Increase unit test timeout from 1m to 4m
The new timeout matches what we've been using in CI for some time now.
2015-12-02 15:31:10 -06:00
T Jake Luciani 16045358a4 bump 2.2 versions 2015-12-02 10:53:01 -05:00
T Jake Luciani a6619e56b1 bump 2.1 versions 2015-12-02 10:50:22 -05:00
Robert Stupp 306d882fe3 Merge branch 'cassandra-3.1' into trunk 2015-11-27 15:26:13 +01:00
Robert Stupp 918bc0116d Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-27 15:26:08 +01:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
2015-11-27 15:24:51 +01:00
Stefania 7650fc1963 Warn or fail when changing cluster topology live
patch by Stefania; reviewed by Paulo Motta for CASSANDRA-10243
2015-11-27 13:49:15 +01:00
Robert Stupp 76c4841b34 Merge branch 'cassandra-3.1' into trunk 2015-11-20 17:24:57 +01:00
Robert Stupp 32a682a5f2 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 17:24:50 +01:00
Robert Stupp 6ac831f327 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 17:24:42 +01:00
Robert Stupp 49d9e51555 Reevaluate inspections in generate-idea-files target
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9844
2015-11-20 17:24:03 +01:00
Sylvain Lebresne 3944775e77 Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 13:16:31 +01:00
Sylvain Lebresne 0c04a6bc5b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 13:15:38 +01:00
Sylvain Lebresne 3851670d78 Backport test parallelization build tasks
patch by rhatch; reviewed by aweisberg for CASSANDRA-10703
2015-11-20 13:13:54 +01:00
Sylvain Lebresne e7d9678be2 Merge branch 'cassandra-3.1' into trunk 2015-11-20 13:10:51 +01:00
Sylvain Lebresne 7a48a7dbdc Merge branch 'cassandra-3.0' into cassandra-3.1 2015-11-20 13:10:23 +01:00
Sylvain Lebresne d1ad7961ed Remove cobertura from build file
patch by rhatch; reviewed by aweisberg for CASSANDRA-10704
2015-11-20 13:08:37 +01:00
Aleksey Yeschenko b42afc424a Merge branch 'cassandra-3.1' into trunk 2015-11-18 18:05:07 +00:00
Aleksey Yeschenko 02a12fa1e9 Set base.version to 3.1 2015-11-18 18:04:13 +00:00
T Jake Luciani 96f407bce5 3.0 release versions 2015-11-06 14:38:34 -05:00
Russ Hatch c3678f6b64 Add ant target for running a list of test classes
patch by Russ Hatch; reviewed by Ariel Weisberg for CASSANDRA-10651
2015-11-05 22:55:45 +00:00
Aleksey Yeschenko 1b876bc600 Merge branch 'cassandra-3.0' into trunk 2015-11-04 17:08:43 +00:00
Aleksey Yeschenko 340df43fb7 Use CQL type names in schema metadata tables
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
2015-11-04 17:06:07 +00:00
Russ Hatch b14423c8b4 Allow jacoco report merging
patch by Russ Hatch; reviewed by Philip Thompson and Ariel Weisberg for
CASSANDRA-10616
2015-11-04 13:07:02 +00:00
Ryan McGuire e4467a0f6d Provide graphing tool w/cassandra-stress
Patch by rmcguire; reviewed by jmckenzie for CASSANDRA-7918
2015-10-21 15:40:26 -04:00
T Jake Luciani 56a06d78f2 bump versions 2015-10-16 16:03:16 -04:00
Aleksey Yeschenko 56cfc6ea35 Remove Pig support
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
2015-10-16 13:23:20 +01:00
T Jake Luciani 8444302432 bump versions for 2.2.3 2015-10-12 09:50:39 -04:00
T Jake Luciani df6b27e36c bump versions for 2.1.11 2015-10-12 09:46:49 -04:00
Branimir Lambov e77730179c Clean resource usage warnings.
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-10385
2015-10-07 13:20:18 -04:00
Tyler Hobbs 5c2912d1ce Flush system schema tables after local schema changes
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-10429
2015-10-01 14:25:54 -05:00
T Jake Luciani ae9b7e0522 bump verion 2015-10-01 09:38:36 -04:00
T Jake Luciani 78f2e7aa01 bump version 2015-10-01 09:36:24 -04:00
T Jake Luciani c95a7098cf bump release 2015-09-19 16:03:29 -04:00
blerer 0d4e0cd226 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-16 10:34:00 +02:00
blerer e7c2952d31 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-16 10:21:58 +02:00
blerer b8b4eb76c4 Add Benjamin Lerer to the developer list in build.xml 2015-09-16 10:18:18 +02:00
Michael Shuler f961e84aa6 Set test.timeout back to 60 seconds
Patch by Michael Schuler; reviewed by Tyler Hobbs for CASSANDRA-10284
2015-09-08 12:54:25 -05:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04:00
Stefania Alborghetti ce63ccc842 Faster sequential IO (CASSANDRA-8630)
Merge RandomAccessReader and NIODataInputStream class hierarchies
to share performance optimisation work across all readers.

patch by stefania; reviewed by ariel and benedict for CASSANDRA-8630
2015-09-04 12:42:35 +01:00
T Jake Luciani 3238906477 bump versions 2015-08-25 13:24:57 -04:00
T Jake Luciani 7d74563a25 bump versions 2015-08-25 09:39:15 -04:00