Commit Graph

602 Commits

Author SHA1 Message Date
Stefania Alborghetti b09e60f72b Introduce safer durable sstable membership management
(and simplify cleanup of compaction leftovers)

Instead of using temporary files and system tables,
this patch introduces a simple transaction log for sstable
membership edits that can be committed/aborted atomically
and simply replayed on startup.

patch by stefania; reviewed by benedict for CASSANDRA-7066
2015-07-24 14:41:51 +01:00
Joshua McKenzie 1f5c4f7ba5 Merge branch 'cassandra-2.2' into trunk 2015-07-23 13:24:53 -04:00
Joshua McKenzie 9ad133097b Add logdir and storagedir to nodetool.bat
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9696
2015-07-23 13:23:55 -04:00
Joshua McKenzie 99decd8efa Fix handling of incorrect %z cqlshlib output on Windows
Patch by jmckenzie; reviewed by aweisberg for CASSANDRA-9418
2015-07-23 13:21:10 -04:00
T Jake Luciani 107f141e09 Merge branch 'cassandra-2.2' into trunk 2015-07-17 13:03:19 -04:00
T Jake Luciani 9dc8c21980 Fix cqlsh copy methods and timestamp format issues on windows
patch by tjake; reviewed by Josh McKenzie for CASSANDRA-9795
2015-07-17 13:00:38 -04:00
Joshua McKenzie fbf52e65f1 Merge branch 'cassandra-2.2' into trunk 2015-07-13 17:54:14 -04:00
Andrew Tolbert 052222615a On Windows, wait 30 seconds on stop-server then terminate
Patch by Andrew Tolbert; reviewed by jmckenzie for CASSANDRA-9791
2015-07-13 17:53:42 -04:00
Aleksey Yeschenko 89fdaabad1 Merge branch 'cassandra-2.2' into trunk 2015-07-01 19:06:27 +03:00
Stefania Alborghetti 96e7e62642 (cqlsh) Allow setting the initial connection timeout
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for
CASSANDRA-9601
2015-07-01 19:04:56 +03:00
Aleksey Yeschenko c6f016cc97 Merge branch 'cassandra-2.2' into trunk 2015-06-30 19:35:15 +03:00
blerer 924d798a3e (cqlsh) Fix default CQL version
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-9688
2015-06-30 19:33:12 +03:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099
Initial patch, see ticket for details
2015-06-30 12:47:01 +02:00
Marcus Eriksson d6f9555ba6 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	bin/cqlsh
2015-06-26 08:21:06 +02:00
Stefania Alborghetti 5d9729bc9b Added support for DESCRIBE INDEX and DESCRIBE <objectname>
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-7814
2015-06-26 08:18:15 +02:00
Jason Brown f4449bd455 Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeProbe.java
2015-06-25 10:45:02 -07:00
Jason Brown 628394a6fa Allow JMX over SSL directly from nodetool
patch by Marcus Olsson, reviewed by jasobrown for CASSANDRA-9090
2015-06-25 10:36:42 -07:00
Robert Stupp cfab9dac19 Update cqlsh for UDFs
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7556
2015-06-23 19:19:57 +02:00
Josh McKenzie 2e92cf8996 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-12 18:18:45 -04:00
Philip Thompson c1702b0b3c Fix ipv6 parsing on Windows startup
Patch by Philip Thompson; reviewed by jmckenzie for CASSANDRA-9567
2015-06-12 18:17:13 -04:00
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
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
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Stefania Alborghetti b7adb03b41 Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969 2015-06-01 09:59:02 -05:00
Stefania Alborghetti 33d71b825f (cqlsh) Add support for native protocol 4
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9399
2015-05-22 00:47:27 +03:00
Tyler Hobbs 1689e0adc7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-05-15 11:44:38 -05:00
Tyler Hobbs 9f8c45d6d6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-15 11:41:25 -05:00
Carl Yeksigian 0b92967d30 cqlsh: Add LOGIN command to switch users
Patch by Sachin Janani and Carl Yeksigian; reviewed by Tyler Hobbs for
CASSANDRA-7212
2015-05-15 11:36:06 -05:00
Tyler Hobbs 5b61545315 Merge branch 'cassandra-2.1' into trunk 2015-05-05 14:46:06 -05:00
Tyler Hobbs 22527730d3 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-05 14:45:40 -05:00
Tyler Hobbs e6bc6385ae Merge branch 'cassandra-2.1' into trunk 2015-04-22 10:50:55 -05:00
Tyler Hobbs 93b36d4b82 Fix write meter for cqlsh COPY TO
Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for
CASSANDRA-9217
2015-04-22 10:41:41 -05:00
Tyler Hobbs 840d9a6632 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	bin/cqlsh
2015-04-21 12:24:47 -05:00
Tyler Hobbs 49c1dbdad4 Fix whitespace, unused imports and variables in cqlsh 2015-04-21 12:20:37 -05:00
Joshua McKenzie 7f29201ce2 Revert "Add date and time types" on 2.1 branch
This reverts commit 107545b392.

Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cqlsh
	pylib/cqlshlib/test/test_keyspace_init.cql
2015-04-21 08:42:31 -05:00
Jim Witschey 23e77f10a4 Update cqlsh tests for latest trunk
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9173
2015-04-14 11:39:33 -05:00
Tyler Hobbs f9693d542e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
2015-04-07 16:27:52 -05:00
Tyler Hobbs cb8cb5f99d cqlsh: quote column names in COPY FROM inserts
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-9080
2015-04-07 16:26:42 -05:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-04-01 11:11:53 -04:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1
Conflicts:
	CHANGES.txt
	NEWS.txt
2015-04-01 10:56:05 -04:00
T Jake Luciani 38a04eab6a Merge branch 'cassandra-2.0.14-build' into cassandra-2.0
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
2015-04-01 10:45:51 -04:00
T Jake Luciani 2d7909dc12 New tool added to verify all data in sstables.
Patch by Jeff Jirsa; reviewed by Branimir Lambov for CASSANDRA-5791
2015-03-31 09:53:33 -04:00
T Jake Luciani 2433068c15 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:40:38 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Tyler Hobbs dadc206c6e Merge branch 'cassandra-2.1' into trunk 2015-03-24 11:43:06 -05:00
Tyler Hobbs 9d2b2730eb Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	bin/cqlsh
2015-03-24 11:42:38 -05:00
Philip Thompson 061ea33fde cqlsh: allow configuring CSV field size limit
Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-8934
2015-03-24 11:41:12 -05:00
Tyler Hobbs 237d0bc62e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	bin/cqlsh
2015-03-20 10:30:28 -05:00