Author: jbellis
Date: Fri Sep 9 16:49:35 2011
New Revision: 1167287
URL: http://svn.apache.org/viewvc?rev=1167287&view=rev
Log:
add int/int32 data type
patch by Radim Kolar; reviewed by jbellis for CASSANDRA-3031
Added:
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java.orig
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcInt32.java
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/marshal/Int32Type.java
Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt
cassandra/branches/cassandra-1.0.0/NEWS.txt
cassandra/branches/cassandra-1.0.0/doc/cql/CQL.textile
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcLong.java
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
cassandra/branches/cassandra-1.0.0/src/resources/org/apache/cassandra/cli/CliHelp.yaml
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/Util.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/TableTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java
cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1167287&r1=1167286&r2=1167287&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Fri Sep 9 16:49:35 2011
@@ -66,7 +66,7 @@
(CASSANDRA-3148)
* fix inconsistency of the CLI syntax when {} should be used instead of [{}]
(CASSANDRA-3119)
- * rename CQL type names to match expected SQL behavior (CASSANDRA-3149)
+ * rename CQL type names to match expected SQL behavior (CASSANDRA-3149, 3031)
* Arena-based allocation for memtables (CASSANDRA-2252, 3162)
Modified: cassandra/branches/cassandra-1.0.0/NEWS.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/NEWS.txt?rev=1167287&r1=1167286&r2=1167287&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/NEWS.txt (original)
+++ cassandra/branches/cassandra-1.0.0/NEWS.txt Fri Sep 9 16:49:35 2011
@@ -9,7 +9,8 @@ Upgrading
cassandra.yaml (use compaction_throughput_mb_per_sec to throttle
compaction instead)
- CQL types bytea and date were renamed to blob and timestamp,
respectively,
- to conform with SQL norms
+ to conform with SQL norms. CQL type int is now a 4-byte int, not 8
+ (which is still available as bigint).
Features
--------
Modified: cassandra/branches/cassandra-1.0.0/doc/cql/CQL.textile
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/doc/cql/CQL.textile?rev=1167287&r1=1167286&r2=1167287&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/doc/cql/CQL.textile (original)
+++ cassandra/branches/cassandra-1.0.0/doc/cql/CQL.textile Fri Sep 9 16:49:35
2011
@@ -273,6 +273,7 @@ It is possible to assign columns a type
|decimal|Variable-precision decimal|
|double|8-byte floating point|
|float|4-byte floating point|
+|int|4-byte int|
|text|UTF8 encoded string|
|timestamp|Date + Time, encoded as 8 bytes since epoch|
|uuid|Type 1, or type 4 UUID|
@@ -384,6 +385,9 @@ Versioning of the CQL language adheres t
h1. Changes
pre.
+Fri, 09 Sep 2011 11:43:00 -0500 - Jonathan Ellis
+ * add int data type
+
Wed, 07 Sep 2011 09:01:00 -0500 - Jonathan Ellis
* Updated version to 2.0; Documented row-based count()
* Updated list of supported data types
Modified:
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java?rev=1167287&r1=1167286&r2=1167287&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cli/CliClient.java
Fri Sep 9 16:49:35 2011
@@ -66,6 +66,7 @@ public class CliClient
BYTES (BytesType.instance),
INTEGER (IntegerType.instance),
LONG (LongType.instance),
+ INT (Int32Type.instance),
LEXICALUUID (LexicalUUIDType.instance),
TIMEUUID (TimeUUIDType.instance),
UTF8 (UTF8Type.instance),
