Skip to content

Commit

Permalink
change in return type for range slices query [law and order]
Browse files Browse the repository at this point in the history
  • Loading branch information
axs committed May 23, 2011
1 parent 13fd069 commit 0d7e46e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 33 deletions.
58 changes: 30 additions & 28 deletions libcassandra/cassandra.cc
View file
Expand Up @@ -199,7 +199,6 @@ void Cassandra::remove(const string &key,
thrift_client->remove(key, col_path, createTimestamp(), ConsistencyLevel::QUORUM);
}


void Cassandra::remove(const string& key,
const string& column_family,
const string& super_column_name,
Expand All @@ -220,7 +219,6 @@ void Cassandra::remove(const string& key,
remove(key, col_path);
}


void Cassandra::removeColumn(const string& key,
const string& column_family,
const string& super_column_name,
Expand Down Expand Up @@ -399,14 +397,15 @@ vector<Column> Cassandra::getSliceRange(const string& key,
}


map<string, vector<Column> > Cassandra::getRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count,
ConsistencyLevel::type level)
vector<pair<string, vector<Column> > >
Cassandra::getRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count,
ConsistencyLevel::type level)
{
map<string, vector<Column> > ret;
vector<pair<string, vector<Column> > > ret;
vector<KeySlice> key_slices;
KeyRange key_range;
key_range.start_key.assign(start);
Expand All @@ -425,31 +424,33 @@ map<string, vector<Column> > Cassandra::getRangeSlice(const ColumnParent& col_pa
it != key_slices.end();
++it)
{
ret.insert(make_pair((*it).key, getColumnList((*it).columns)));
ret.push_back(make_pair((*it).key, getColumnList((*it).columns)));
}
}
return ret;
}


map<string, vector<Column> > Cassandra::getRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count)
vector<pair<string, vector<Column> > >
Cassandra::getRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count)
{
return getRangeSlice(col_parent, pred, start, finish, row_count, ConsistencyLevel::QUORUM);
}


map<string, vector<SuperColumn> > Cassandra::getSuperRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count,
ConsistencyLevel::type level)
vector<pair<string, vector<SuperColumn> > >
Cassandra::getSuperRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count,
ConsistencyLevel::type level)
{
map<string, vector<SuperColumn> > ret;
vector<pair<string, vector<SuperColumn> > > ret;
vector<KeySlice> key_slices;
KeyRange key_range;
key_range.start_key.assign(start);
Expand All @@ -468,19 +469,20 @@ map<string, vector<SuperColumn> > Cassandra::getSuperRangeSlice(const ColumnPare
it != key_slices.end();
++it)
{
ret.insert(make_pair((*it).key, getSuperColumnList((*it).columns)));
ret.push_back(make_pair((*it).key, getSuperColumnList((*it).columns)));
}
}
return ret;
}



map<string, vector<SuperColumn> > Cassandra::getSuperRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count)
vector<pair<string, vector<SuperColumn> > >
Cassandra::getSuperRangeSlice(const ColumnParent& col_parent,
const SlicePredicate& pred,
const string& start,
const string& finish,
const int32_t row_count)
{
return getSuperRangeSlice(col_parent, pred, start, finish, row_count, ConsistencyLevel::QUORUM);
}
Expand Down
10 changes: 5 additions & 5 deletions libcassandra/cassandra.h
View file
Expand Up @@ -218,7 +218,7 @@ class Cassandra
const std::string& super_column_name,
const std::string& column_name);

/**
/**
* Remove a column, possibly inside a supercolumn
*
* @param[in] key the column key
Expand Down Expand Up @@ -351,30 +351,30 @@ class Cassandra
const org::apache::cassandra::ColumnParent& col_parent,
org::apache::cassandra::SlicePredicate& pred);

std::map<std::string, std::vector<org::apache::cassandra::Column> >
std::vector<std::pair<std::string, std::vector<org::apache::cassandra::Column> > >
getRangeSlice(const org::apache::cassandra::ColumnParent& col_parent,
const org::apache::cassandra::SlicePredicate& pred,
const std::string& start,
const std::string& finish,
const int32_t row_count,
org::apache::cassandra::ConsistencyLevel::type level);

std::map<std::string, std::vector<org::apache::cassandra::Column> >
std::vector<std::pair<std::string, std::vector<org::apache::cassandra::Column> > >
getRangeSlice(const org::apache::cassandra::ColumnParent& col_parent,
const org::apache::cassandra::SlicePredicate& pred,
const std::string& start,
const std::string& finish,
const int32_t row_count);

std::map<std::string, std::vector<org::apache::cassandra::SuperColumn> >
std::vector<std::pair<std::string, std::vector<org::apache::cassandra::SuperColumn> > >
getSuperRangeSlice(const org::apache::cassandra::ColumnParent& col_parent,
const org::apache::cassandra::SlicePredicate& pred,
const std::string& start,
const std::string& finish,
const int32_t count,
org::apache::cassandra::ConsistencyLevel::type level);

std::map<std::string, std::vector<org::apache::cassandra::SuperColumn> >
std::vector<std::pair<std::string, std::vector<org::apache::cassandra::SuperColumn> > >
getSuperRangeSlice(const org::apache::cassandra::ColumnParent& col_parent,
const org::apache::cassandra::SlicePredicate& pred,
const std::string& start,
Expand Down

0 comments on commit 0d7e46e

Please sign in to comment.