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

Hadoop input format now uses the specified column family to figure out the number of splits instead of the whole keyspace. Patch by johan, review by jbellis. CASSANDRA-1050 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947953 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Johan Oskarsson 2010-05-25 07:40:47 +00:00
parent 00cf048905
commit 0658589892
29 changed files with 253 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
interface/cassandra.thrift
View File

@ -473,9 +473,11 @@ service Cassandra {
returns list of token strings such that first subrange is (list[0], list[1]],
next is (list[1], list[2]], etc. */
list<string> describe_splits(1:required string start_token,
2:required string end_token,
3:required i32 keys_per_split),
list<string> describe_splits(1:required string keyspace,
2:required string cfName,
3:required string start_token,
4:required string end_token,
5:required i32 keys_per_split),
/** adds a column family. returns the new schema id. */
string system_add_column_family(1:required CfDef cf_def)

21
interface/thrift/gen-java/org/apache/cassandra/thrift/AccessLevel.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.Map;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

263
interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;
@ -211,22 +190,58 @@ public class Cassandra {
* returns list of token strings such that first subrange is (list[0], list[1]],
* next is (list[1], list[2]], etc.
*
* @param keyspace
* @param cfName
* @param start_token
* @param end_token
* @param keys_per_split
*/
public List<String> describe_splits(String start_token, String end_token, int keys_per_split) throws TException;
public List<String> describe_splits(String keyspace, String cfName, String start_token, String end_token, int keys_per_split) throws TException;
/**
* adds a column family. returns the new schema id.
*
* @param cf_def
*/
public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, TException;
/**
* drops a column family. returns the new schema id.
*
* @param keyspace
* @param column_family
*/
public String system_drop_column_family(String keyspace, String column_family) throws InvalidRequestException, TException;
/**
* renames a column family. returns the new schema id.
*
* @param keyspace
* @param old_name
* @param new_name
*/
public String system_rename_column_family(String keyspace, String old_name, String new_name) throws InvalidRequestException, TException;
/**
* adds a keyspace and any column families that are part of it. returns the new schema id.
*
* @param ks_def
*/
public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, TException;
/**
* drops a keyspace and any column families that are part of it. returns the new schema id.
*
* @param keyspace
*/
public String system_drop_keyspace(String keyspace) throws InvalidRequestException, TException;
/**
* renames a keyspace. returns the new schema id.
*
* @param old_name
* @param new_name
*/
public String system_rename_keyspace(String old_name, String new_name) throws InvalidRequestException, TException;
}
@ -964,16 +979,18 @@ public class Cassandra {
throw new TApplicationException(TApplicationException.MISSING_RESULT, "describe_keyspace failed: unknown result");
}
public List<String> describe_splits(String start_token, String end_token, int keys_per_split) throws TException
public List<String> describe_splits(String keyspace, String cfName, String start_token, String end_token, int keys_per_split) throws TException
{
send_describe_splits(start_token, end_token, keys_per_split);
send_describe_splits(keyspace, cfName, start_token, end_token, keys_per_split);
return recv_describe_splits();
}
public void send_describe_splits(String start_token, String end_token, int keys_per_split) throws TException
public void send_describe_splits(String keyspace, String cfName, String start_token, String end_token, int keys_per_split) throws TException
{
oprot_.writeMessageBegin(new TMessage("describe_splits", TMessageType.CALL, seqid_));
describe_splits_args args = new describe_splits_args();
args.keyspace = keyspace;
args.cfName = cfName;
args.start_token = start_token;
args.end_token = end_token;
args.keys_per_split = keys_per_split;
@ -1973,7 +1990,7 @@ public class Cassandra {
}
iprot.readMessageEnd();
describe_splits_result result = new describe_splits_result();
result.success = iface_.describe_splits(args.start_token, args.end_token, args.keys_per_split);
result.success = iface_.describe_splits(args.keyspace, args.cfName, args.start_token, args.end_token, args.keys_per_split);
oprot.writeMessageBegin(new TMessage("describe_splits", TMessageType.REPLY, seqid));
result.write(oprot);
oprot.writeMessageEnd();
@ -17420,19 +17437,25 @@ public class Cassandra {
public static class describe_splits_args implements TBase<describe_splits_args._Fields>, java.io.Serializable, Cloneable, Comparable<describe_splits_args> {
private static final TStruct STRUCT_DESC = new TStruct("describe_splits_args");
private static final TField START_TOKEN_FIELD_DESC = new TField("start_token", TType.STRING, (short)1);
private static final TField END_TOKEN_FIELD_DESC = new TField("end_token", TType.STRING, (short)2);
private static final TField KEYS_PER_SPLIT_FIELD_DESC = new TField("keys_per_split", TType.I32, (short)3);
private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
private static final TField CF_NAME_FIELD_DESC = new TField("cfName", TType.STRING, (short)2);
private static final TField START_TOKEN_FIELD_DESC = new TField("start_token", TType.STRING, (short)3);
private static final TField END_TOKEN_FIELD_DESC = new TField("end_token", TType.STRING, (short)4);
private static final TField KEYS_PER_SPLIT_FIELD_DESC = new TField("keys_per_split", TType.I32, (short)5);
public String keyspace;
public String cfName;
public String start_token;
public String end_token;
public int keys_per_split;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements TFieldIdEnum {
START_TOKEN((short)1, "start_token"),
END_TOKEN((short)2, "end_token"),
KEYS_PER_SPLIT((short)3, "keys_per_split");
KEYSPACE((short)1, "keyspace"),
CF_NAME((short)2, "cfName"),
START_TOKEN((short)3, "start_token"),
END_TOKEN((short)4, "end_token"),
KEYS_PER_SPLIT((short)5, "keys_per_split");
private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>();
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@ -17490,6 +17513,10 @@ public class Cassandra {
private BitSet __isset_bit_vector = new BitSet(1);
public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{
put(_Fields.KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
put(_Fields.CF_NAME, new FieldMetaData("cfName", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
put(_Fields.START_TOKEN, new FieldMetaData("start_token", TFieldRequirementType.REQUIRED,
new FieldValueMetaData(TType.STRING)));
put(_Fields.END_TOKEN, new FieldMetaData("end_token", TFieldRequirementType.REQUIRED,
@ -17506,11 +17533,15 @@ public class Cassandra {
}
public describe_splits_args(
String keyspace,
String cfName,
String start_token,
String end_token,
int keys_per_split)
{
this();
this.keyspace = keyspace;
this.cfName = cfName;
this.start_token = start_token;
this.end_token = end_token;
this.keys_per_split = keys_per_split;
@ -17523,6 +17554,12 @@ public class Cassandra {
public describe_splits_args(describe_splits_args other) {
__isset_bit_vector.clear();
__isset_bit_vector.or(other.__isset_bit_vector);
if (other.isSetKeyspace()) {
this.keyspace = other.keyspace;
}
if (other.isSetCfName()) {
this.cfName = other.cfName;
}
if (other.isSetStart_token()) {
this.start_token = other.start_token;
}
@ -17541,6 +17578,54 @@ public class Cassandra {
return new describe_splits_args(this);
}
public String getKeyspace() {
return this.keyspace;
}
public describe_splits_args setKeyspace(String keyspace) {
this.keyspace = keyspace;
return this;
}
public void unsetKeyspace() {
this.keyspace = null;
}
/** Returns true if field keyspace is set (has been asigned a value) and false otherwise */
public boolean isSetKeyspace() {
return this.keyspace != null;
}
public void setKeyspaceIsSet(boolean value) {
if (!value) {
this.keyspace = null;
}
}
public String getCfName() {
return this.cfName;
}
public describe_splits_args setCfName(String cfName) {
this.cfName = cfName;
return this;
}
public void unsetCfName() {
this.cfName = null;
}
/** Returns true if field cfName is set (has been asigned a value) and false otherwise */
public boolean isSetCfName() {
return this.cfName != null;
}
public void setCfNameIsSet(boolean value) {
if (!value) {
this.cfName = null;
}
}
public String getStart_token() {
return this.start_token;
}
@ -17614,6 +17699,22 @@ public class Cassandra {
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case KEYSPACE:
if (value == null) {
unsetKeyspace();
} else {
setKeyspace((String)value);
}
break;
case CF_NAME:
if (value == null) {
unsetCfName();
} else {
setCfName((String)value);
}
break;
case START_TOKEN:
if (value == null) {
unsetStart_token();
@ -17647,6 +17748,12 @@ public class Cassandra {
public Object getFieldValue(_Fields field) {
switch (field) {
case KEYSPACE:
return getKeyspace();
case CF_NAME:
return getCfName();
case START_TOKEN:
return getStart_token();
@ -17667,6 +17774,10 @@ public class Cassandra {
/** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
public boolean isSet(_Fields field) {
switch (field) {
case KEYSPACE:
return isSetKeyspace();
case CF_NAME:
return isSetCfName();
case START_TOKEN:
return isSetStart_token();
case END_TOKEN:
@ -17694,6 +17805,24 @@ public class Cassandra {
if (that == null)
return false;
boolean this_present_keyspace = true && this.isSetKeyspace();
boolean that_present_keyspace = true && that.isSetKeyspace();
if (this_present_keyspace || that_present_keyspace) {
if (!(this_present_keyspace && that_present_keyspace))
return false;
if (!this.keyspace.equals(that.keyspace))
return false;
}
boolean this_present_cfName = true && this.isSetCfName();
boolean that_present_cfName = true && that.isSetCfName();
if (this_present_cfName || that_present_cfName) {
if (!(this_present_cfName && that_present_cfName))
return false;
if (!this.cfName.equals(that.cfName))
return false;
}
boolean this_present_start_token = true && this.isSetStart_token();
boolean that_present_start_token = true && that.isSetStart_token();
if (this_present_start_token || that_present_start_token) {
@ -17737,6 +17866,24 @@ public class Cassandra {
int lastComparison = 0;
describe_splits_args typedOther = (describe_splits_args)other;
lastComparison = Boolean.valueOf(isSetKeyspace()).compareTo(typedOther.isSetKeyspace());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetKeyspace()) { lastComparison = TBaseHelper.compareTo(keyspace, typedOther.keyspace);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetCfName()).compareTo(typedOther.isSetCfName());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCfName()) { lastComparison = TBaseHelper.compareTo(cfName, typedOther.cfName);
if (lastComparison != 0) {
return lastComparison;
}
}
lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
@ -17777,21 +17924,35 @@ public class Cassandra {
break;
}
switch (field.id) {
case 1: // START_TOKEN
case 1: // KEYSPACE
if (field.type == TType.STRING) {
this.keyspace = iprot.readString();
} else {
TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // CF_NAME
if (field.type == TType.STRING) {
this.cfName = iprot.readString();
} else {
TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // START_TOKEN
if (field.type == TType.STRING) {
this.start_token = iprot.readString();
} else {
TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // END_TOKEN
case 4: // END_TOKEN
if (field.type == TType.STRING) {
this.end_token = iprot.readString();
} else {
TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // KEYS_PER_SPLIT
case 5: // KEYS_PER_SPLIT
if (field.type == TType.I32) {
this.keys_per_split = iprot.readI32();
setKeys_per_splitIsSet(true);
@ -17817,6 +17978,16 @@ public class Cassandra {
validate();
oprot.writeStructBegin(STRUCT_DESC);
if (this.keyspace != null) {
oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
oprot.writeString(this.keyspace);
oprot.writeFieldEnd();
}
if (this.cfName != null) {
oprot.writeFieldBegin(CF_NAME_FIELD_DESC);
oprot.writeString(this.cfName);
oprot.writeFieldEnd();
}
if (this.start_token != null) {
oprot.writeFieldBegin(START_TOKEN_FIELD_DESC);
oprot.writeString(this.start_token);
@ -17839,6 +18010,22 @@ public class Cassandra {
StringBuilder sb = new StringBuilder("describe_splits_args(");
boolean first = true;
sb.append("keyspace:");
if (this.keyspace == null) {
sb.append("null");
} else {
sb.append(this.keyspace);
}
first = false;
if (!first) sb.append(", ");
sb.append("cfName:");
if (this.cfName == null) {
sb.append("null");
} else {
sb.append(this.cfName);
}
first = false;
if (!first) sb.append(", ");
sb.append("start_token:");
if (this.start_token == null) {
sb.append("null");
@ -17864,6 +18051,12 @@ public class Cassandra {
public void validate() throws TException {
// check for required fields
if (keyspace == null) {
throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
}
if (cfName == null) {
throw new TProtocolException("Required field 'cfName' was not present! Struct: " + toString());
}
if (start_token == null) {
throw new TProtocolException("Required field 'start_token' was not present! Struct: " + toString());
}

21
interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.Map;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

21
interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
View File

@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.thrift;
/*
*
* 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.
*
*/
import java.util.List;
import java.util.ArrayList;

20
src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
View File

@ -64,6 +64,10 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
{
private static final Logger logger = LoggerFactory.getLogger(StorageService.class);
private int splitsize;
private String keyspace;
private String cfName;
private void validateConfiguration(Configuration conf)
{
@ -86,7 +90,9 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
// cannonical ranges and nodes holding replicas
List<TokenRange> masterRangeNodes = getRangeMap(ConfigHelper.getKeyspace(conf));
int splitsize = ConfigHelper.getInputSplitSize(context.getConfiguration());
splitsize = ConfigHelper.getInputSplitSize(context.getConfiguration());
keyspace = ConfigHelper.getKeyspace(context.getConfiguration());
cfName = ConfigHelper.getColumnFamily(context.getConfiguration());
// cannonical ranges, split into pieces, fetching the splits in parallel
ExecutorService executor = Executors.newCachedThreadPool();
@ -98,7 +104,7 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
for (TokenRange range : masterRangeNodes)
{
// for each range, pick a live owner and ask it to compute bite-sized splits
splitfutures.add(executor.submit(new SplitCallable(range, splitsize)));
splitfutures.add(executor.submit(new SplitCallable(range)));
}
// wait until we have all the results back
@ -132,19 +138,17 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
{
private TokenRange range;
private int splitsize;
public SplitCallable(TokenRange tr, int splitsize)
public SplitCallable(TokenRange tr)
{
this.range = tr;
this.splitsize = splitsize;
}
@Override
public List<InputSplit> call() throws Exception
{
ArrayList<InputSplit> splits = new ArrayList<InputSplit>();
List<String> tokens = getSubSplits(range, splitsize);
List<String> tokens = getSubSplits(keyspace, cfName, range, splitsize);
// turn the sub-ranges into InputSplits
String[] endpoints = range.endpoints.toArray(new String[range.endpoints.size()]);
@ -164,7 +168,7 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
}
}
private List<String> getSubSplits(TokenRange range, int splitsize) throws IOException
private List<String> getSubSplits(String keyspace, String cfName, TokenRange range, int splitsize) throws IOException
{
// TODO handle failure of range replicas & retry
TSocket socket = new TSocket(range.endpoints.get(0),
@ -182,7 +186,7 @@ public class ColumnFamilyInputFormat extends InputFormat<byte[], SortedMap<byte[
List<String> splits;
try
{
splits = client.describe_splits(range.start_token, range.end_token, splitsize);
splits = client.describe_splits(keyspace, cfName, range.start_token, range.end_token, splitsize);
}
catch (TException e)
{

13
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -1279,20 +1279,19 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
/**
* @return list of Tokens (_not_ keys!) breaking up the data this node is responsible for into pieces of roughly keysPerSplit
*/
public List<Token> getSplits(Range range, int keysPerSplit)
public List<Token> getSplits(String table, String cfName, Range range, int keysPerSplit)
{
List<Token> tokens = new ArrayList<Token>();
// we use the actual Range token for the first and last brackets of the splits to ensure correctness
tokens.add(range.left);
List<DecoratedKey> keys = new ArrayList<DecoratedKey>();
for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
Table t = Table.open(table);
ColumnFamilyStore cfs = t.getColumnFamilyStore(cfName);
for (DecoratedKey sample : cfs.allKeySamples())
{
for (DecoratedKey sample : cfs.allKeySamples())
{
if (range.contains(sample.token))
keys.add(sample);
}
if (range.contains(sample.token))
keys.add(sample);
}
FBUtilities.sortSampledKeys(keys, range);
int splits = keys.size() * SSTableReader.indexInterval() / keysPerSplit;

4
src/java/org/apache/cassandra/thrift/CassandraServer.java
View File

@ -559,10 +559,10 @@ public class CassandraServer implements Cassandra.Iface
return ranges;
}
public List<String> describe_splits(String start_token, String end_token, int keys_per_split) throws TException
public List<String> describe_splits(String keyspace, String cfName, String start_token, String end_token, int keys_per_split) throws TException
{
Token.TokenFactory tf = StorageService.getPartitioner().getTokenFactory();
List<Token> tokens = StorageService.instance.getSplits(new Range(tf.fromString(start_token), tf.fromString(end_token)), keys_per_split);
List<Token> tokens = StorageService.instance.getSplits(keyspace, cfName, new Range(tf.fromString(start_token), tf.fromString(end_token)), keys_per_split);
List<String> splits = new ArrayList<String>(tokens.size());
for (Token token : tokens)
{