cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: Remove some dead thrift code
Date Wed, 05 Nov 2014 17:28:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 32da3c8cd -> 89257bc12


Remove some dead thrift code


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

Branch: refs/heads/cassandra-2.0
Commit: 89257bc12d38e9a701e14262766c955b71705d6a
Parents: 32da3c8
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 5 20:27:39 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 5 20:27:39 2014 +0300

----------------------------------------------------------------------
 .../cql3/statements/CreateTableStatement.java   | 11 --------
 .../db/ColumnFamilyNotDefinedException.java     | 28 --------------------
 .../apache/cassandra/db/ReadMessageTest.java    |  2 +-
 3 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/89257bc1/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index efaf36d..5160d6f 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@ -36,7 +36,6 @@ import org.apache.cassandra.exceptions.AlreadyExistsException;
 import org.apache.cassandra.io.compress.CompressionParameters;
 import org.apache.cassandra.service.ClientState;
 import org.apache.cassandra.service.MigrationManager;
-import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.transport.messages.ResultMessage;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
@@ -432,15 +431,5 @@ public class CreateTableStatement extends SchemaAlteringStatement
         {
             useCompactStorage = true;
         }
-
-        public void checkAccess(ClientState state)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        public CqlResult execute(ClientState state, List<ByteBuffer> variables)
-        {
-            throw new UnsupportedOperationException();
-        }
     }
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89257bc1/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java b/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
deleted file mode 100644
index 54a0e4e..0000000
--- a/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cassandra.db;
-
-import org.apache.cassandra.thrift.InvalidRequestException;
-
-public class ColumnFamilyNotDefinedException extends InvalidRequestException
-{
-    public ColumnFamilyNotDefinedException(String message)
-    {
-        super(message);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/89257bc1/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index 94928c0..cdd561f 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -84,7 +84,7 @@ public class ReadMessageTest extends SchemaLoader
     }
 
     @Test
-    public void testGetColumn() throws IOException, ColumnFamilyNotDefinedException
+    public void testGetColumn()
     {
         Keyspace keyspace = Keyspace.open("Keyspace1");
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1");


Mime
View raw message