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 2015/05/08 19:00:08 UTC
[3/3] cassandra git commit: Revert "add Thrift get_multi_slice call"
Revert "add Thrift get_multi_slice call"
This reverts commit 60fb923018a6fd2dabf04a1d4500f7b29a23a6f1.
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/thrift/CassandraServer.java
test/system/test_thrift_server.py
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f070250
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f070250
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f070250
Branch: refs/heads/trunk
Commit: 3f0702509b3f12cfc159fc33a114bcf52ecf9fc9
Parents: c7db18b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 11:59:57 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 11:59:57 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
interface/cassandra.thrift | 37 +-
.../org/apache/cassandra/thrift/Cassandra.java | 3071 +++++-------------
.../apache/cassandra/thrift/ColumnSlice.java | 551 ----
.../cassandra/thrift/MultiSliceRequest.java | 1042 ------
.../cassandra/thrift/cassandraConstants.java | 2 +-
.../cassandra/thrift/CassandraServer.java | 72 -
.../cassandra/db/ColumnFamilyStoreTest.java | 20 +-
.../apache/cassandra/thrift/MultiSliceTest.java | 186 --
9 files changed, 920 insertions(+), 4063 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4639bff..675e46c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -80,7 +80,6 @@
* Move sstable RandomAccessReader to nio2, which allows using the
FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
* Remove CQL2 (CASSANDRA-5918)
- * Add Thrift get_multi_slice call (CASSANDRA-6757)
* Optimize fetching multiple cells by name (CASSANDRA-6933)
* Allow compilation in java 8 (CASSANDRA-7028)
* Make incremental repair default (CASSANDRA-7250)
@@ -99,6 +98,7 @@
* Save repair data to system table (CASSANDRA-5839)
* fix nodetool names that reference column families (CASSANDRA-8872)
+
2.1.6
* Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
* Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/cassandra.thrift
----------------------------------------------------------------------
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index 0af7e64..835fa8c 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -55,7 +55,7 @@ namespace rb CassandraThrift
# An effort should be made not to break forward-client-compatibility either
# (e.g. one should avoid removing obsolete fields from the IDL), but no
# guarantees in this respect are made by the Cassandra project.
-const string VERSION = "20.1.0"
+const string VERSION = "20.0.0"
#
@@ -571,35 +571,6 @@ struct CfSplit {
3: required i64 row_count
}
-/** The ColumnSlice is used to select a set of columns from inside a row.
- * If start or finish are unspecified they will default to the start-of
- * end-of value.
- * @param start. The start of the ColumnSlice inclusive
- * @param finish. The end of the ColumnSlice inclusive
- */
-struct ColumnSlice {
- 1: optional binary start,
- 2: optional binary finish
-}
-
-/**
- * Used to perform multiple slices on a single row key in one rpc operation
- * @param key. The row key to be multi sliced
- * @param column_parent. The column family (super columns are unsupported)
- * @param column_slices. 0 to many ColumnSlice objects each will be used to select columns
- * @param reversed. Direction of slice
- * @param count. Maximum number of columns
- * @param consistency_level. Level to perform the operation at
- */
-struct MultiSliceRequest {
- 1: optional binary key,
- 2: optional ColumnParent column_parent,
- 3: optional list<ColumnSlice> column_slices,
- 4: optional bool reversed=false,
- 5: optional i32 count=1000,
- 6: optional ConsistencyLevel consistency_level=ConsistencyLevel.ONE
-}
-
service Cassandra {
# auth methods
void login(1: required AuthenticationRequest auth_request) throws (1:AuthenticationException authnx, 2:AuthorizationException authzx),
@@ -778,11 +749,7 @@ service Cassandra {
void truncate(1:required string cfname)
throws (1: InvalidRequestException ire, 2: UnavailableException ue, 3: TimedOutException te),
- /**
- * Select multiple slices of a key in a single RPC operation
- */
- list<ColumnOrSuperColumn> get_multi_slice(1:required MultiSliceRequest request)
- throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
+
// Meta-APIs -- APIs to get information about the node or cluster,
// rather than user data. The nodeprobe program provides usage examples.