You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/04/30 19:50:27 UTC

[01/10] git commit: switch README to asciidoc extension

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 50466aa49 -> 44a5fc1df
  refs/heads/cassandra-2.1 74e96b460 -> ece386439
  refs/heads/trunk dbf3e1c57 -> ad3424707


switch README to asciidoc extension


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8852ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8852ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8852ea7

Branch: refs/heads/cassandra-2.1
Commit: a8852ea7f2381971b59c6413fbaaa9111c8f9104
Parents: b433722
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:17:16 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:17:16 2014 -0500

----------------------------------------------------------------------
 README.asc | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 102 --------------------------------------------------------
 2 files changed, 102 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8852ea7/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
new file mode 100644
index 0000000..320fdf8
--- /dev/null
+++ b/README.asc
@@ -0,0 +1,102 @@
+
+
+Cassandra is a highly scalable, eventually consistent, distributed, structured 
+key-value store. 
+
+
+Project description
+-------------------
+
+Cassandra brings together the distributed systems technologies from Dynamo 
+and the data model from Google's BigTable. Like Dynamo, Cassandra is 
+eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
+data model richer than typical key/value systems.
+
+For more information see http://cassandra.apache.org/
+
+Requirements
+------------
+  * Java >= 1.7 (OpenJDK and Sun have been tested)
+
+Getting started
+---------------
+
+This short guide will walk you through getting a basic one node cluster up
+and running, and demonstrate some simple reads and writes.
+
+  * tar -zxvf apache-cassandra-$VERSION.tar.gz
+  * cd apache-cassandra-$VERSION
+  * sudo mkdir -p /var/log/cassandra
+  * sudo chown -R `whoami` /var/log/cassandra
+  * sudo mkdir -p /var/lib/cassandra
+  * sudo chown -R `whoami` /var/lib/cassandra
+
+Note: The sample configuration files in conf/ determine the file-system 
+locations Cassandra uses for logging and data storage. You are free to
+change these to suit your own environment and adjust the path names
+used here accordingly.
+
+Now that we're ready, let's start it up!
+
+  * bin/cassandra -f
+
+Unix: Running the startup script with the -f argument will cause
+Cassandra to remain in the foreground and log to standard out.
+
+Windows: bin\cassandra.bat runs in the foreground by default.  To
+install Cassandra as a Windows service, download Procrun from
+http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
+environment variable to the full path of prunsrv (e.g.,
+C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
+Similarly, "uninstall" will remove the service.
+
+Now let's try to read and write some data using the Cassandra Query Language:
+
+  * bin/cqlsh
+
+The command line client is interactive so if everything worked you should
+be sitting in front of a prompt...
+
+  Connected to Test Cluster at localhost:9160.
+  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
+  Use HELP for help.
+  cqlsh> 
+
+
+As the banner says, you can use 'help;' or '?' to see what CQL has to
+offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
+something slightly more interesting:
+
+  cqlsh> CREATE SCHEMA schema1 
+         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+  cqlsh> USE schema1;
+  cqlsh:Schema1> CREATE TABLE users (
+                   user_id varchar PRIMARY KEY,
+                   first varchar,
+                   last varchar,
+                   age int
+                 );
+  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
+                 VALUES ('jsmith', 'John', 'Smith', 42);
+  cqlsh:Schema1> SELECT * FROM users;
+   user_id | age | first | last
+  ---------+-----+-------+-------
+    jsmith |  42 |  john | smith
+
+  cqlsh:Schema1> 
+
+If your session looks similar to what's above, congrats, your single node
+cluster is operational! 
+
+For more on what commands are supported by CQL, see
+https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
+reasonable way to think of it is as, "SQL minus joins and subqueries."
+
+Wondering where to go from here? 
+
+  * Getting started: http://wiki.apache.org/cassandra/GettingStarted
+  * Join us in #cassandra on irc.freenode.net and ask questions
+  * Subscribe to the Users mailing list by sending a mail to
+    user-subscribe@cassandra.apache.org
+  * Planet Cassandra aggregates Cassandra articles and news:
+    http://planetcassandra.org/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8852ea7/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 320fdf8..0000000
--- a/README.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-Cassandra is a highly scalable, eventually consistent, distributed, structured 
-key-value store. 
-
-
-Project description
--------------------
-
-Cassandra brings together the distributed systems technologies from Dynamo 
-and the data model from Google's BigTable. Like Dynamo, Cassandra is 
-eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
-data model richer than typical key/value systems.
-
-For more information see http://cassandra.apache.org/
-
-Requirements
-------------
-  * Java >= 1.7 (OpenJDK and Sun have been tested)
-
-Getting started
----------------
-
-This short guide will walk you through getting a basic one node cluster up
-and running, and demonstrate some simple reads and writes.
-
-  * tar -zxvf apache-cassandra-$VERSION.tar.gz
-  * cd apache-cassandra-$VERSION
-  * sudo mkdir -p /var/log/cassandra
-  * sudo chown -R `whoami` /var/log/cassandra
-  * sudo mkdir -p /var/lib/cassandra
-  * sudo chown -R `whoami` /var/lib/cassandra
-
-Note: The sample configuration files in conf/ determine the file-system 
-locations Cassandra uses for logging and data storage. You are free to
-change these to suit your own environment and adjust the path names
-used here accordingly.
-
-Now that we're ready, let's start it up!
-
-  * bin/cassandra -f
-
-Unix: Running the startup script with the -f argument will cause
-Cassandra to remain in the foreground and log to standard out.
-
-Windows: bin\cassandra.bat runs in the foreground by default.  To
-install Cassandra as a Windows service, download Procrun from
-http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
-environment variable to the full path of prunsrv (e.g.,
-C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
-Similarly, "uninstall" will remove the service.
-
-Now let's try to read and write some data using the Cassandra Query Language:
-
-  * bin/cqlsh
-
-The command line client is interactive so if everything worked you should
-be sitting in front of a prompt...
-
-  Connected to Test Cluster at localhost:9160.
-  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
-  Use HELP for help.
-  cqlsh> 
-
-
-As the banner says, you can use 'help;' or '?' to see what CQL has to
-offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
-something slightly more interesting:
-
-  cqlsh> CREATE SCHEMA schema1 
-         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-  cqlsh> USE schema1;
-  cqlsh:Schema1> CREATE TABLE users (
-                   user_id varchar PRIMARY KEY,
-                   first varchar,
-                   last varchar,
-                   age int
-                 );
-  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
-                 VALUES ('jsmith', 'John', 'Smith', 42);
-  cqlsh:Schema1> SELECT * FROM users;
-   user_id | age | first | last
-  ---------+-----+-------+-------
-    jsmith |  42 |  john | smith
-
-  cqlsh:Schema1> 
-
-If your session looks similar to what's above, congrats, your single node
-cluster is operational! 
-
-For more on what commands are supported by CQL, see
-https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
-reasonable way to think of it is as, "SQL minus joins and subqueries."
-
-Wondering where to go from here? 
-
-  * Getting started: http://wiki.apache.org/cassandra/GettingStarted
-  * Join us in #cassandra on irc.freenode.net and ask questions
-  * Subscribe to the Users mailing list by sending a mail to
-    user-subscribe@cassandra.apache.org
-  * Planet Cassandra aggregates Cassandra articles and news:
-    http://planetcassandra.org/


[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ece38643
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece38643
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ece38643

Branch: refs/heads/cassandra-2.1
Commit: ece386439b4114472741dddd2d57843bee1be839
Parents: 74e96b4 44a5fc1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:13 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:13 2014 -0500

----------------------------------------------------------------------
 README.asc |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 102 --------------------------------------------------------
 2 files changed, 99 insertions(+), 102 deletions(-)
----------------------------------------------------------------------



[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ece38643
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece38643
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ece38643

Branch: refs/heads/trunk
Commit: ece386439b4114472741dddd2d57843bee1be839
Parents: 74e96b4 44a5fc1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:13 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:13 2014 -0500

----------------------------------------------------------------------
 README.asc |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 102 --------------------------------------------------------
 2 files changed, 99 insertions(+), 102 deletions(-)
----------------------------------------------------------------------



[07/10] git commit: formatting

Posted by jb...@apache.org.
formatting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a5fc1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a5fc1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a5fc1d

Branch: refs/heads/trunk
Commit: 44a5fc1df7a90357415638b0ad8f1a4fb14354c3
Parents: 50466aa
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:05 2014 -0500

----------------------------------------------------------------------
 README.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a5fc1d/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
index 1fd7cf7..2e0a0e6 100644
--- a/README.asc
+++ b/README.asc
@@ -39,7 +39,7 @@ Cassandra to remain in the foreground and log to standard out; it can be stopped
 
 ****
 Note for Windows users: to install Cassandra as a service, download
-Procrun from http://commons.apache.org/daemon/procrun.html, set the
+http://commons.apache.org/daemon/procrun.html[Procrun], set the
 PRUNSRV environment variable to the full path of prunsrv (e.g.,
 C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
 Similarly, "uninstall" will remove the service.


[05/10] git commit: formatting

Posted by jb...@apache.org.
formatting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a5fc1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a5fc1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a5fc1d

Branch: refs/heads/cassandra-2.1
Commit: 44a5fc1df7a90357415638b0ad8f1a4fb14354c3
Parents: 50466aa
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:05 2014 -0500

----------------------------------------------------------------------
 README.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a5fc1d/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
index 1fd7cf7..2e0a0e6 100644
--- a/README.asc
+++ b/README.asc
@@ -39,7 +39,7 @@ Cassandra to remain in the foreground and log to standard out; it can be stopped
 
 ****
 Note for Windows users: to install Cassandra as a service, download
-Procrun from http://commons.apache.org/daemon/procrun.html, set the
+http://commons.apache.org/daemon/procrun.html[Procrun], set the
 PRUNSRV environment variable to the full path of prunsrv (e.g.,
 C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
 Similarly, "uninstall" will remove the service.


[06/10] git commit: formatting

Posted by jb...@apache.org.
formatting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a5fc1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a5fc1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a5fc1d

Branch: refs/heads/cassandra-2.0
Commit: 44a5fc1df7a90357415638b0ad8f1a4fb14354c3
Parents: 50466aa
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:05 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:05 2014 -0500

----------------------------------------------------------------------
 README.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a5fc1d/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
index 1fd7cf7..2e0a0e6 100644
--- a/README.asc
+++ b/README.asc
@@ -39,7 +39,7 @@ Cassandra to remain in the foreground and log to standard out; it can be stopped
 
 ****
 Note for Windows users: to install Cassandra as a service, download
-Procrun from http://commons.apache.org/daemon/procrun.html, set the
+http://commons.apache.org/daemon/procrun.html[Procrun], set the
 PRUNSRV environment variable to the full path of prunsrv (e.g.,
 C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
 Similarly, "uninstall" will remove the service.


[04/10] git commit: wip

Posted by jb...@apache.org.
wip


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50466aa4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50466aa4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50466aa4

Branch: refs/heads/trunk
Commit: 50466aa490fc9d6324329696bcc56da9f7109d77
Parents: a8852ea
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:43:20 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:43:20 2014 -0500

----------------------------------------------------------------------
 README.asc | 109 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 53 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50466aa4/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
index 320fdf8..1fd7cf7 100644
--- a/README.asc
+++ b/README.asc
@@ -1,22 +1,18 @@
+Executive summary
+-----------------
 
+Cassandra is a partitioned row store.  Rows are organized into tables with a required primary key.
 
-Cassandra is a highly scalable, eventually consistent, distributed, structured 
-key-value store. 
+http://wiki.apache.org/cassandra/Partitioners[Partitioning] means that Cassandra can distribute your data across multiple machines in an application-transparent matter.  Cassandra will automatically repartition as machines are added and removed from the cluster.
 
+http://wiki.apache.org/cassandra/DataModel[Row store] means that like relational databases, Cassandra organizes data by rows and columns.  The Cassandra Query Language (CQL) is a close relative of SQL.
 
-Project description
--------------------
-
-Cassandra brings together the distributed systems technologies from Dynamo 
-and the data model from Google's BigTable. Like Dynamo, Cassandra is 
-eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
-data model richer than typical key/value systems.
-
-For more information see http://cassandra.apache.org/
+For more information, see http://cassandra.apache.org/[the Apache Cassandra web site].
 
 Requirements
 ------------
-  * Java >= 1.7 (OpenJDK and Sun have been tested)
+. Java >= 1.7 (OpenJDK and Oracle JVMS have been tested)
+. Python 2.7 (for cqlsh)
 
 Getting started
 ---------------
@@ -24,73 +20,74 @@ Getting started
 This short guide will walk you through getting a basic one node cluster up
 and running, and demonstrate some simple reads and writes.
 
-  * tar -zxvf apache-cassandra-$VERSION.tar.gz
-  * cd apache-cassandra-$VERSION
-  * sudo mkdir -p /var/log/cassandra
-  * sudo chown -R `whoami` /var/log/cassandra
-  * sudo mkdir -p /var/lib/cassandra
-  * sudo chown -R `whoami` /var/lib/cassandra
+First, we'll unpack our archive:
 
-Note: The sample configuration files in conf/ determine the file-system 
-locations Cassandra uses for logging and data storage. You are free to
-change these to suit your own environment and adjust the path names
-used here accordingly.
+  $ tar -zxvf apache-cassandra-$VERSION.tar.gz
+  $ cd apache-cassandra-$VERSION
 
-Now that we're ready, let's start it up!
+and create the log and data directories.  These correspond to the defaults from conf/ and may be adjusted to suit your own environment:
 
-  * bin/cassandra -f
+  $ sudo mkdir -p /var/log/cassandra
+  $ sudo chown -R `whoami` /var/log/cassandra
+  $ sudo mkdir -p /var/lib/cassandra
+  $ sudo chown -R `whoami` /var/lib/cassandra
 
-Unix: Running the startup script with the -f argument will cause
-Cassandra to remain in the foreground and log to standard out.
+Finally, we start the server.  Running the startup script with the -f argument will cause
+Cassandra to remain in the foreground and log to standard out; it can be stopped with ctrl-C.
 
-Windows: bin\cassandra.bat runs in the foreground by default.  To
-install Cassandra as a Windows service, download Procrun from
-http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
-environment variable to the full path of prunsrv (e.g.,
+  $ bin/cassandra -f
+
+****
+Note for Windows users: to install Cassandra as a service, download
+Procrun from http://commons.apache.org/daemon/procrun.html, set the
+PRUNSRV environment variable to the full path of prunsrv (e.g.,
 C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
 Similarly, "uninstall" will remove the service.
+****
 
 Now let's try to read and write some data using the Cassandra Query Language:
 
-  * bin/cqlsh
+  $ bin/cqlsh
 
 The command line client is interactive so if everything worked you should
-be sitting in front of a prompt...
-
-  Connected to Test Cluster at localhost:9160.
-  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
-  Use HELP for help.
-  cqlsh> 
+be sitting in front of a prompt:
 
+----
+Connected to Test Cluster at localhost:9160.
+[cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
+Use HELP for help.
+cqlsh> 
+----
 
 As the banner says, you can use 'help;' or '?' to see what CQL has to
 offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
 something slightly more interesting:
 
-  cqlsh> CREATE SCHEMA schema1 
-         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-  cqlsh> USE schema1;
-  cqlsh:Schema1> CREATE TABLE users (
-                   user_id varchar PRIMARY KEY,
-                   first varchar,
-                   last varchar,
-                   age int
-                 );
-  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
-                 VALUES ('jsmith', 'John', 'Smith', 42);
-  cqlsh:Schema1> SELECT * FROM users;
-   user_id | age | first | last
-  ---------+-----+-------+-------
-    jsmith |  42 |  john | smith
-
-  cqlsh:Schema1> 
+----
+cqlsh> CREATE SCHEMA schema1 
+       WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+cqlsh> USE schema1;
+cqlsh:Schema1> CREATE TABLE users (
+                 user_id varchar PRIMARY KEY,
+                 first varchar,
+                 last varchar,
+                 age int
+               );
+cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
+               VALUES ('jsmith', 'John', 'Smith', 42);
+cqlsh:Schema1> SELECT * FROM users;
+ user_id | age | first | last
+---------+-----+-------+-------
+  jsmith |  42 |  john | smith
+ cqlsh:Schema1> 
+----
 
 If your session looks similar to what's above, congrats, your single node
 cluster is operational! 
 
 For more on what commands are supported by CQL, see
-https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
-reasonable way to think of it is as, "SQL minus joins and subqueries."
+https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile[the CQL reference].  A
+reasonable way to think of it is as, "SQL minus joins and subqueries, plus collections."
 
 Wondering where to go from here? 
 


[02/10] git commit: switch README to asciidoc extension

Posted by jb...@apache.org.
switch README to asciidoc extension


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8852ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8852ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8852ea7

Branch: refs/heads/trunk
Commit: a8852ea7f2381971b59c6413fbaaa9111c8f9104
Parents: b433722
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:17:16 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:17:16 2014 -0500

----------------------------------------------------------------------
 README.asc | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 102 --------------------------------------------------------
 2 files changed, 102 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8852ea7/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
new file mode 100644
index 0000000..320fdf8
--- /dev/null
+++ b/README.asc
@@ -0,0 +1,102 @@
+
+
+Cassandra is a highly scalable, eventually consistent, distributed, structured 
+key-value store. 
+
+
+Project description
+-------------------
+
+Cassandra brings together the distributed systems technologies from Dynamo 
+and the data model from Google's BigTable. Like Dynamo, Cassandra is 
+eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
+data model richer than typical key/value systems.
+
+For more information see http://cassandra.apache.org/
+
+Requirements
+------------
+  * Java >= 1.7 (OpenJDK and Sun have been tested)
+
+Getting started
+---------------
+
+This short guide will walk you through getting a basic one node cluster up
+and running, and demonstrate some simple reads and writes.
+
+  * tar -zxvf apache-cassandra-$VERSION.tar.gz
+  * cd apache-cassandra-$VERSION
+  * sudo mkdir -p /var/log/cassandra
+  * sudo chown -R `whoami` /var/log/cassandra
+  * sudo mkdir -p /var/lib/cassandra
+  * sudo chown -R `whoami` /var/lib/cassandra
+
+Note: The sample configuration files in conf/ determine the file-system 
+locations Cassandra uses for logging and data storage. You are free to
+change these to suit your own environment and adjust the path names
+used here accordingly.
+
+Now that we're ready, let's start it up!
+
+  * bin/cassandra -f
+
+Unix: Running the startup script with the -f argument will cause
+Cassandra to remain in the foreground and log to standard out.
+
+Windows: bin\cassandra.bat runs in the foreground by default.  To
+install Cassandra as a Windows service, download Procrun from
+http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
+environment variable to the full path of prunsrv (e.g.,
+C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
+Similarly, "uninstall" will remove the service.
+
+Now let's try to read and write some data using the Cassandra Query Language:
+
+  * bin/cqlsh
+
+The command line client is interactive so if everything worked you should
+be sitting in front of a prompt...
+
+  Connected to Test Cluster at localhost:9160.
+  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
+  Use HELP for help.
+  cqlsh> 
+
+
+As the banner says, you can use 'help;' or '?' to see what CQL has to
+offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
+something slightly more interesting:
+
+  cqlsh> CREATE SCHEMA schema1 
+         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+  cqlsh> USE schema1;
+  cqlsh:Schema1> CREATE TABLE users (
+                   user_id varchar PRIMARY KEY,
+                   first varchar,
+                   last varchar,
+                   age int
+                 );
+  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
+                 VALUES ('jsmith', 'John', 'Smith', 42);
+  cqlsh:Schema1> SELECT * FROM users;
+   user_id | age | first | last
+  ---------+-----+-------+-------
+    jsmith |  42 |  john | smith
+
+  cqlsh:Schema1> 
+
+If your session looks similar to what's above, congrats, your single node
+cluster is operational! 
+
+For more on what commands are supported by CQL, see
+https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
+reasonable way to think of it is as, "SQL minus joins and subqueries."
+
+Wondering where to go from here? 
+
+  * Getting started: http://wiki.apache.org/cassandra/GettingStarted
+  * Join us in #cassandra on irc.freenode.net and ask questions
+  * Subscribe to the Users mailing list by sending a mail to
+    user-subscribe@cassandra.apache.org
+  * Planet Cassandra aggregates Cassandra articles and news:
+    http://planetcassandra.org/

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8852ea7/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 320fdf8..0000000
--- a/README.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-Cassandra is a highly scalable, eventually consistent, distributed, structured 
-key-value store. 
-
-
-Project description
--------------------
-
-Cassandra brings together the distributed systems technologies from Dynamo 
-and the data model from Google's BigTable. Like Dynamo, Cassandra is 
-eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
-data model richer than typical key/value systems.
-
-For more information see http://cassandra.apache.org/
-
-Requirements
-------------
-  * Java >= 1.7 (OpenJDK and Sun have been tested)
-
-Getting started
----------------
-
-This short guide will walk you through getting a basic one node cluster up
-and running, and demonstrate some simple reads and writes.
-
-  * tar -zxvf apache-cassandra-$VERSION.tar.gz
-  * cd apache-cassandra-$VERSION
-  * sudo mkdir -p /var/log/cassandra
-  * sudo chown -R `whoami` /var/log/cassandra
-  * sudo mkdir -p /var/lib/cassandra
-  * sudo chown -R `whoami` /var/lib/cassandra
-
-Note: The sample configuration files in conf/ determine the file-system 
-locations Cassandra uses for logging and data storage. You are free to
-change these to suit your own environment and adjust the path names
-used here accordingly.
-
-Now that we're ready, let's start it up!
-
-  * bin/cassandra -f
-
-Unix: Running the startup script with the -f argument will cause
-Cassandra to remain in the foreground and log to standard out.
-
-Windows: bin\cassandra.bat runs in the foreground by default.  To
-install Cassandra as a Windows service, download Procrun from
-http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
-environment variable to the full path of prunsrv (e.g.,
-C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
-Similarly, "uninstall" will remove the service.
-
-Now let's try to read and write some data using the Cassandra Query Language:
-
-  * bin/cqlsh
-
-The command line client is interactive so if everything worked you should
-be sitting in front of a prompt...
-
-  Connected to Test Cluster at localhost:9160.
-  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
-  Use HELP for help.
-  cqlsh> 
-
-
-As the banner says, you can use 'help;' or '?' to see what CQL has to
-offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
-something slightly more interesting:
-
-  cqlsh> CREATE SCHEMA schema1 
-         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-  cqlsh> USE schema1;
-  cqlsh:Schema1> CREATE TABLE users (
-                   user_id varchar PRIMARY KEY,
-                   first varchar,
-                   last varchar,
-                   age int
-                 );
-  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
-                 VALUES ('jsmith', 'John', 'Smith', 42);
-  cqlsh:Schema1> SELECT * FROM users;
-   user_id | age | first | last
-  ---------+-----+-------+-------
-    jsmith |  42 |  john | smith
-
-  cqlsh:Schema1> 
-
-If your session looks similar to what's above, congrats, your single node
-cluster is operational! 
-
-For more on what commands are supported by CQL, see
-https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
-reasonable way to think of it is as, "SQL minus joins and subqueries."
-
-Wondering where to go from here? 
-
-  * Getting started: http://wiki.apache.org/cassandra/GettingStarted
-  * Join us in #cassandra on irc.freenode.net and ask questions
-  * Subscribe to the Users mailing list by sending a mail to
-    user-subscribe@cassandra.apache.org
-  * Planet Cassandra aggregates Cassandra articles and news:
-    http://planetcassandra.org/


[10/10] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad342470
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad342470
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad342470

Branch: refs/heads/trunk
Commit: ad3424707fec9cecad3e5c9a18582cd9933d07ac
Parents: dbf3e1c ece3864
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:50:20 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:50:20 2014 -0500

----------------------------------------------------------------------
 README.asc |  99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 102 --------------------------------------------------------
 2 files changed, 99 insertions(+), 102 deletions(-)
----------------------------------------------------------------------



[03/10] git commit: wip

Posted by jb...@apache.org.
wip


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50466aa4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50466aa4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50466aa4

Branch: refs/heads/cassandra-2.1
Commit: 50466aa490fc9d6324329696bcc56da9f7109d77
Parents: a8852ea
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Apr 30 12:43:20 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Apr 30 12:43:20 2014 -0500

----------------------------------------------------------------------
 README.asc | 109 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 53 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/50466aa4/README.asc
----------------------------------------------------------------------
diff --git a/README.asc b/README.asc
index 320fdf8..1fd7cf7 100644
--- a/README.asc
+++ b/README.asc
@@ -1,22 +1,18 @@
+Executive summary
+-----------------
 
+Cassandra is a partitioned row store.  Rows are organized into tables with a required primary key.
 
-Cassandra is a highly scalable, eventually consistent, distributed, structured 
-key-value store. 
+http://wiki.apache.org/cassandra/Partitioners[Partitioning] means that Cassandra can distribute your data across multiple machines in an application-transparent matter.  Cassandra will automatically repartition as machines are added and removed from the cluster.
 
+http://wiki.apache.org/cassandra/DataModel[Row store] means that like relational databases, Cassandra organizes data by rows and columns.  The Cassandra Query Language (CQL) is a close relative of SQL.
 
-Project description
--------------------
-
-Cassandra brings together the distributed systems technologies from Dynamo 
-and the data model from Google's BigTable. Like Dynamo, Cassandra is 
-eventually consistent. Like BigTable, Cassandra provides a ColumnFamily-based
-data model richer than typical key/value systems.
-
-For more information see http://cassandra.apache.org/
+For more information, see http://cassandra.apache.org/[the Apache Cassandra web site].
 
 Requirements
 ------------
-  * Java >= 1.7 (OpenJDK and Sun have been tested)
+. Java >= 1.7 (OpenJDK and Oracle JVMS have been tested)
+. Python 2.7 (for cqlsh)
 
 Getting started
 ---------------
@@ -24,73 +20,74 @@ Getting started
 This short guide will walk you through getting a basic one node cluster up
 and running, and demonstrate some simple reads and writes.
 
-  * tar -zxvf apache-cassandra-$VERSION.tar.gz
-  * cd apache-cassandra-$VERSION
-  * sudo mkdir -p /var/log/cassandra
-  * sudo chown -R `whoami` /var/log/cassandra
-  * sudo mkdir -p /var/lib/cassandra
-  * sudo chown -R `whoami` /var/lib/cassandra
+First, we'll unpack our archive:
 
-Note: The sample configuration files in conf/ determine the file-system 
-locations Cassandra uses for logging and data storage. You are free to
-change these to suit your own environment and adjust the path names
-used here accordingly.
+  $ tar -zxvf apache-cassandra-$VERSION.tar.gz
+  $ cd apache-cassandra-$VERSION
 
-Now that we're ready, let's start it up!
+and create the log and data directories.  These correspond to the defaults from conf/ and may be adjusted to suit your own environment:
 
-  * bin/cassandra -f
+  $ sudo mkdir -p /var/log/cassandra
+  $ sudo chown -R `whoami` /var/log/cassandra
+  $ sudo mkdir -p /var/lib/cassandra
+  $ sudo chown -R `whoami` /var/lib/cassandra
 
-Unix: Running the startup script with the -f argument will cause
-Cassandra to remain in the foreground and log to standard out.
+Finally, we start the server.  Running the startup script with the -f argument will cause
+Cassandra to remain in the foreground and log to standard out; it can be stopped with ctrl-C.
 
-Windows: bin\cassandra.bat runs in the foreground by default.  To
-install Cassandra as a Windows service, download Procrun from
-http://commons.apache.org/daemon/procrun.html, set the PRUNSRV
-environment variable to the full path of prunsrv (e.g.,
+  $ bin/cassandra -f
+
+****
+Note for Windows users: to install Cassandra as a service, download
+Procrun from http://commons.apache.org/daemon/procrun.html, set the
+PRUNSRV environment variable to the full path of prunsrv (e.g.,
 C:\procrun\prunsrv.exe), and run "bin\cassandra.bat install".
 Similarly, "uninstall" will remove the service.
+****
 
 Now let's try to read and write some data using the Cassandra Query Language:
 
-  * bin/cqlsh
+  $ bin/cqlsh
 
 The command line client is interactive so if everything worked you should
-be sitting in front of a prompt...
-
-  Connected to Test Cluster at localhost:9160.
-  [cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
-  Use HELP for help.
-  cqlsh> 
+be sitting in front of a prompt:
 
+----
+Connected to Test Cluster at localhost:9160.
+[cqlsh 2.2.0 | Cassandra 1.2.0 | CQL spec 3.0.0 | Thrift protocol 19.35.0]
+Use HELP for help.
+cqlsh> 
+----
 
 As the banner says, you can use 'help;' or '?' to see what CQL has to
 offer, and 'quit;' or 'exit;' when you've had enough fun. But lets try
 something slightly more interesting:
 
-  cqlsh> CREATE SCHEMA schema1 
-         WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-  cqlsh> USE schema1;
-  cqlsh:Schema1> CREATE TABLE users (
-                   user_id varchar PRIMARY KEY,
-                   first varchar,
-                   last varchar,
-                   age int
-                 );
-  cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
-                 VALUES ('jsmith', 'John', 'Smith', 42);
-  cqlsh:Schema1> SELECT * FROM users;
-   user_id | age | first | last
-  ---------+-----+-------+-------
-    jsmith |  42 |  john | smith
-
-  cqlsh:Schema1> 
+----
+cqlsh> CREATE SCHEMA schema1 
+       WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
+cqlsh> USE schema1;
+cqlsh:Schema1> CREATE TABLE users (
+                 user_id varchar PRIMARY KEY,
+                 first varchar,
+                 last varchar,
+                 age int
+               );
+cqlsh:Schema1> INSERT INTO users (user_id, first, last, age) 
+               VALUES ('jsmith', 'John', 'Smith', 42);
+cqlsh:Schema1> SELECT * FROM users;
+ user_id | age | first | last
+---------+-----+-------+-------
+  jsmith |  42 |  john | smith
+ cqlsh:Schema1> 
+----
 
 If your session looks similar to what's above, congrats, your single node
 cluster is operational! 
 
 For more on what commands are supported by CQL, see
-https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile.  A
-reasonable way to think of it is as, "SQL minus joins and subqueries."
+https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile[the CQL reference].  A
+reasonable way to think of it is as, "SQL minus joins and subqueries, plus collections."
 
 Wondering where to go from here?