natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
This commit is contained in:
Aleksey Yeschenko 2014-11-05 20:35:08 +03:00
parent 40ba9fe2f1 89257bc12d
commit 82b91aba69
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
View File

@ -37,7 +37,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.Event;
import org.apache.cassandra.utils.ByteBufferUtil;
@ -421,15 +420,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();
}
}
}

28
src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
View File

@ -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);
}
}